Commit graph

  • 704a056c47 Merge remote-tracking branch 'switz/api-authentication' into develop Tyler Renelle 2013-07-12 16:36:12 -0400
  • 2bb5ad43e0 require items, algos, helpers locally instead of via index.js Tyler Renelle 2013-07-12 16:32:28 -0400
  • 50918ffea8 added cron update on each transaction. yangit 2013-07-12 00:36:06 +0800
  • 7af9553aef remove tour (and sortable, stickyheader, tooltips) from mobile devices #995 Tyler Renelle 2013-07-06 17:18:18 -0400
  • a9dd42cda5 fix sort API yangit 2013-07-06 20:03:05 +0800
  • 49d0214056 added sort API, removed debug code. yangit 2013-07-06 16:03:51 +0800
  • c4140f476f Moar fixes to my own code, for consistency Andre Casey 2013-07-02 02:25:00 -0700
  • 0e40b996b7 Merge branch 'develop' of https://github.com/onduhray/habitrpg into develop Andre Casey 2013-07-02 02:21:40 -0700
  • ae0ee8e03d Fixed my own inconsistency with spacing of eggs and potions. oops. Andre Casey 2013-07-02 02:21:14 -0700
  • c6da393e71 Revert "Fix for Tavern Chat and extremely long posts" Andre Casey 2013-07-02 02:06:24 -0700
  • 03a73bab72 Fix for Tavern Chat and extremely long posts Andre Casey 2013-07-02 01:56:44 -0700
  • 201fb6617b moved item labels slightly closer to artwork, for better readability. Andre Casey 2013-07-02 01:44:53 -0700
  • 7db812b116 Inventory Layout Fixes - fixed CSS alignment issues with long names breaking flow - gave eggs and potions more wiggle room - centered text beneath newly centered artworks Andre Casey 2013-07-02 01:44:07 -0700
  • 6d27b898a2 Adjust CSS to show full egg and potion artwork, and center the artwork above the label Andre Casey 2013-07-02 01:37:35 -0700
  • 66f63a5123 recompiled (run make) for browsers. yangit 2013-06-26 10:25:43 +0700
  • 68e8819c21 Merge remote-tracking branch 'remotes/upstream/master' yangit 2013-06-26 09:56:29 +0700
  • 014f2df5c7 remove buying rewards for health (you can buy for money only) yangit 2013-06-26 09:52:40 +0700
  • 3461d794a1 chat: bad fix for the duplicates messages, but safer than before Tyler Renelle 2013-06-21 12:19:33 -0400
  • 7bb95795c7 Merge branch 'develop' Tyler Renelle 2013-06-20 20:39:13 -0400
  • 6bf0305ea4 fixed the empty helpers issue. it was circular dependencies - algos dep'd helpers, helpers dep'd algos. Since one came first, it didn't have the other - so it was an empty object. maybe this top-level index.js combinging ./script/* files isn't such a good idea, because I think manual requires from within a file will resolve circular dependencies @yangit Tyler Renelle 2013-06-18 21:40:43 -0400
  • 6998fb70f3 export all scripts into top-level index.js, so that coffeeify includes can import these properly. Hopefully this fixes the empty helpers bug. @yangit I'll merge this into master once I'm sure it works Tyler Renelle 2013-06-18 18:21:27 -0400
  • 1c5d61a617 fix to maxGear achievement Tyler Renelle 2013-06-18 15:14:01 -0400
  • 7370331b8c fix max gear achievement for backer gear Tyler Renelle 2013-06-16 15:38:53 -0400
  • 0529f26323 shorter day-period preen_cron Tyler Renelle 2013-06-18 14:52:39 -0400
  • da8a67e0fa transform user structure FROM user.tasks{} + user.habitIds[] TO user.habits[] + user.todos[] etc. yangit 2013-06-17 19:41:52 +0800
  • a549d1d550 Add, edit, delete task\habit\reward. yangit 2013-06-17 18:24:24 +0800
  • 302721456d fix up some db indexes Tyler Renelle 2013-06-15 19:14:49 -0400
  • d4d7c32fa8 simpler empty parties preen Tyler Renelle 2013-06-15 18:20:52 -0400
  • b7d5c0808b delete the "migrate" script for now. can dig up this commit later, the mongoskin async integration wasn't working for our purposes Tyler Renelle 2013-06-15 18:17:08 -0400
  • d25c9d24c0 groups-preennig typo Tyler Renelle 2013-06-15 17:31:31 -0400
  • 013cc7e5b7 migrations: try adding a coffeescript method, which uses mongoskin to run the migrations. Looks like it's not quite there, collection.toArray() pulls all objects into memory which is too big to run the migrations - might have to stick to mongo scripts Tyler Renelle 2013-06-15 16:47:50 -0400
  • 989d5839c4 more accurate "active users": 7417 Tyler Renelle 2013-06-15 13:52:10 -0400
  • 00e2841b78 history preen cleanup Tyler Renelle 2013-06-15 13:32:50 -0400
  • 4f948d401b Move exp progress button to right of numbers, css rollover was covering it before Tyler Renelle 2013-06-15 13:21:41 -0400
  • cc0206e54e preen-cron: some history-preening cleanup & coments Tyler Renelle 2013-06-15 12:52:21 -0400
  • 5d05c815bd Merge branch 'preen-history' into develop Tyler Renelle 2013-06-15 12:44:42 -0400
  • c797ea5999 charts: fix exp & todos charts Tyler Renelle 2013-06-15 12:35:55 -0400
  • d5d8a9ef69 charts: fix exp & todos charts Tyler Renelle 2013-06-15 12:35:55 -0400
  • 22d4bb27ac preen-cron: fix up history cron, should be fully functional now Tyler Renelle 2013-06-15 12:01:03 -0400
  • 6b307cd52c preen-script - we can't use load() because we don't know mongo shell pwd() at server run-time Tyler Renelle 2013-06-14 19:19:08 -0400
  • 42be939b12 preen-script: start implementing history-preening Tyler Renelle 2013-06-14 19:05:26 -0400
  • 9361b015f6 preen-script: also remove empty parties Tyler Renelle 2013-06-14 17:01:50 -0400
  • 67b2174c3d finish metrics script. current total: unregistered: 180931 registered: 52101 active: 4182 (@Slappybag) Tyler Renelle 2013-06-14 16:56:42 -0400
  • 6d05651b66 Merge branch 'develop' of github.com:lefnire/habitrpg into develop Tyler Renelle 2013-06-14 16:17:50 -0400
  • 8c27f96d08 start with metrics mongo script - still need to add "active users" Tyler Renelle 2013-06-14 16:17:41 -0400
  • 20196a9383 preen-cron: remove the date, it's not a migration but a cron script Tyler Renelle 2013-06-14 16:09:55 -0400
  • 38b4e3322e preen-script: some cleanup and better checking of lastCron Tyler Renelle 2013-06-14 16:09:26 -0400
  • 6ab64e2df1 add migration script for moving facebook auth'd users to local auth (seems people hate facebook) Tyler Renelle 2013-06-14 15:56:27 -0400
  • cfe1b6eccb Merge pull request #1173 from MoofinSeeker/master Tyler Renelle 2013-06-14 12:41:39 -0700
  • 360a8f7d9e apiv2: same as before - user.get('tasks'), not model.get('tasks') Tyler Renelle 2013-06-14 13:03:37 -0400
  • 69ca37d3b0 user.set('tasks...'), not model.set('tasks...') @yangit Tyler Renelle 2013-06-14 13:01:33 -0400
  • 236a81d392 add some api yangit 2013-06-14 23:44:13 +0800
  • f6750ffc16 fix for confirmation window when buying rewards w\o money. yangit 2013-06-14 15:07:18 +0800
  • 268e377dc2 apiv2: model.ref('_user') before passing back to derby functions, much of our derby code requires _user Tyler Renelle 2013-06-13 12:00:33 -0400
  • afb13c3113 APIv2 init yangit 2013-06-13 23:25:10 +0800
  • 8855766829 Update terms.html MoofinSeeker 2013-06-13 00:53:14 +0200
  • dfff22c52b Merge pull request #1172 from MoofinSeeker/master Tyler Renelle 2013-06-12 15:43:00 -0700
  • 3a8f6086ad Update privacy.html MoofinSeeker 2013-06-13 00:34:59 +0200
  • dfc0556965 survey rewards: add individual migration for missing users Tyler Renelle 2013-06-12 14:22:43 -0400
  • 1a3300869e Merge pull request #1168 from onduhray/develop Tyler Renelle 2013-06-12 08:09:57 -0700
  • 5117a376e9 More fixes to inventory spacing. This time for long names of eggs and potions. Andre Casey 2013-06-12 02:03:40 -0700
  • 46ff7287c2 Merge branch 'develop' Tyler Renelle 2013-06-11 17:41:47 -0400
  • f080745f9a Merge pull request #1089 from zeroos/develop Tyler Renelle 2013-06-11 14:41:02 -0700
  • ab57243315 Merge branch 'master' of github.com:lefnire/habitrpg Tyler Renelle 2013-06-11 17:18:10 -0400
  • 4f8de8ce19 Merge pull request #1119 from ilefotiv/translations Tyler Renelle 2013-06-11 14:17:23 -0700
  • 1d2f62be2b Merge pull request #1150 from onduhray/develop Tyler Renelle 2013-06-11 14:16:32 -0700
  • c5acd0a83d Merge pull request #1161 from tullrich/master Tyler Renelle 2013-06-11 14:12:09 -0700
  • 3af13e69af fix rounding discrepancy between header hp meter and profile hp Tim Ullrich 2013-06-10 23:31:12 -0500
  • d8fe775f8e task-deletion: confirm deletion no matterion what, don't dock HP if it's a red task they're deleting (http://community.habitrpg.com/node/350) Tyler Renelle 2013-06-08 12:43:10 -0400
  • 7c79ff5c7b Merge pull request #1143 from GreatWizard/translations Stan Lindsey 2013-06-07 13:36:39 -0700
  • 7c680af368 Fixes #1028: weird inventory item spacing for eggs and potions. Andre Casey 2013-06-07 08:04:25 -0700
  • 8aee73c79a Slight rewording Stan Lindsey 2013-06-07 13:13:11 +0200
  • b259547a12 Added "no" translation Slappybag 2013-06-07 12:10:03 +0100
  • 903587b776 Reworded 500.html to better represent the most likely cause of display - (server restart) Slappybag 2013-06-07 11:50:24 +0100
  • 45115f9778 Invalid Characters Guillaume G 2013-06-06 19:46:43 +0200
  • 0b9a6bfaeb Merge branch 'develop' of github.com:lefnire/habitrpg into develop Michał Barciś 2013-06-05 23:38:35 +0200
  • 205bf24e02 fixes 1116 Stan Lindsey 2013-06-05 23:31:56 +0200
  • ea5b9d17de Merge pull request #1135 from tcsantini/translations Stan Lindsey 2013-06-05 14:08:14 -0700
  • ad686b9bf0 Merge pull request #1114 from wildcate/translations Stan Lindsey 2013-06-05 13:52:39 -0700
  • 6cc412313c pets: only remove hatching potion & egg on successful user.push('pets') Tyler Renelle 2013-06-05 16:28:43 -0400
  • a4de2e5ec5 don't show drop notification unless it went through to the database. oohhh this is glorious!! @Shaners @Slappybag @lemoness , you're gonna love this one. Tyler Renelle 2013-06-05 16:20:03 -0400
  • ef39dd8a0f groups: can assign new leader Tyler Renelle 2013-06-05 14:45:05 -0400
  • 6480be63eb groups: highlight leader in member list Tyler Renelle 2013-06-05 14:44:59 -0400
  • d944dc1687 groups: can't ban self. rename to "boot" (since i ahven't implemented full-ban) Tyler Renelle 2013-06-05 14:18:09 -0400
  • a7c8c843cd groups: balance deduction cleanup Tyler Renelle 2013-06-05 14:14:00 -0400
  • fcf02d33d9 groups: add "ban" feature for group leaders. unfortunately not updating dom, so require a refresh for now Tyler Renelle 2013-06-05 11:55:09 -0400
  • 385704aad7 add optional confirm dialog to removeAt() Tyler Renelle 2013-06-05 11:50:30 -0400
  • 6f1ac0c79e groups: confirm dialog for leaving group, only delete group on 0-members if party (since they paid for guild) Tyler Renelle 2013-06-05 08:25:11 -0400
  • dd6cf67580 Adds more of the Portuguese translation. santini 2013-06-04 22:30:08 -0300
  • ac83126772 grammar Tyler Renelle 2013-06-04 13:10:55 -0400
  • 06a2989d3b Revert "change to require('./index.js') as per 002d4f9541" Tyler Renelle 2013-06-04 12:51:33 -0400
  • 6ca82b2443 change to require('./index.js') as per 002d4f9541 Tyler Renelle 2013-06-04 12:41:50 -0400
  • 0e7ca304a4 Merge branch 'develop' of github.com:lefnire/habitrpg Tyler Renelle 2013-06-04 12:18:15 -0400
  • fe5e0f1464 Merge pull request #1061 from MagicMicky/develop Tyler Renelle 2013-06-04 09:18:03 -0700
  • a5a57a244b fix survey migration Tyler Renelle 2013-06-04 10:32:33 -0400
  • 7fe86ac924 fixes #1130 Tyler Renelle 2013-06-03 22:38:03 -0400
  • 59f4c88940 groups: guild bank is in gems, not balance Tyler Renelle 2013-06-03 21:28:03 -0400
  • 985b7676d8 groups: subscriptions setup as callback after public members information fetched. otherwise we hit client/server snapshots different, and we get the field permissions error Tyler Renelle 2013-06-03 20:52:56 -0400
  • 9ec6455f2a groups: some ridiculous workarounds on the model.push/unshift bug Tyler Renelle 2013-06-03 20:46:56 -0400
  • d13db1623f fix survey gem inc Tyler Renelle 2013-06-03 20:22:51 -0400