Commit graph

  • e21bc9869d Merge branch 'develop' of github.com:lefnire/habitrpg into develop Tyler Renelle 2013-05-21 12:57:40 +0100
  • cc097c32f7 clean up of preen_cron, which I'm re-enstating Tyler Renelle 2013-05-21 12:53:05 +0100
  • 32c2605106 Update app.json Stan Lindsey 2013-05-21 11:28:40 +0200
  • cca6fc6d0e Merge pull request #1009 from theyliveforever/translations Stan Lindsey 2013-05-21 02:25:57 -0700
  • 25b4e057e7 Update app.json theyliveforever 2013-05-20 23:05:34 -0300
  • 17e4578eb3 Update app.json Hjalmberi 2013-05-21 05:58:12 +0400
  • 99985be20a Merge pull request #1005 from LazuliKazeno/patch-1 Stan Lindsey 2013-05-20 14:26:49 -0700
  • b77a62e915 Merge pull request #1002 from MrConcept/master Philip How 2013-05-20 11:09:37 -0700
  • 105087c823 Removes +4 Gems on Reset exploit Philip How 2013-05-20 19:52:37 +0200
  • 9882e70026 add shouldCron so we can test before running cron Tyler Renelle 2013-05-20 10:56:55 +0100
  • f412a20203 habitrpg-shared: cron bug-fixes Tyler Renelle 2013-05-20 10:56:38 +0100
  • 5776bec545 Merge branch 'develop' of github.com:lefnire/habitrpg into develop Tyler Renelle 2013-05-20 10:28:49 +0100
  • ed057799a3 put coin_single_[silver|gold].png back in (thought we weren't using anymore, i was wrong) Tyler Renelle 2013-05-20 10:27:53 +0100
  • 9c173e3a08 HP potion description clarify. Stan Lindsey 2013-05-20 11:08:04 +0200
  • d870325169 Margin on Buttons for #996 & 128eb8a Slappybag 2013-05-20 09:59:36 +0100
  • 83ac2adb79 habithabitrpg-shared: cron mostly working wiht habitrpg-shared 7805a2ba26 Tyler Renelle 2013-05-20 00:53:18 +0100
  • 7805a2ba26 fix bugs, add paths method to cron. Now mostly works with the website Tyler Renelle 2013-05-20 00:51:50 +0100
  • 0b445df909 habitrpg-shared: *almost* working wth new scoring (c0cf9780fe) - need to fix for cron, API, and other misc bugs Tyler Renelle 2013-05-19 23:48:51 +0100
  • c0cf9780fe use the path-setting method to notify derby of things that model must change Tyler Renelle 2013-05-19 23:23:06 +0100
  • ad9c1940a9 re-jig all algos.coffee. add in changes I made in the recent past, put cron back in (why was this removed altogether??), fix some bugs Tyler Renelle 2013-05-19 21:43:43 +0100
  • 128eb8adb7 tavern: add submit bug / feature buttons up top, fixes #996 Tyler Renelle 2013-05-19 20:43:48 +0100
  • 6a36f4bd1d habitrpg-shared: helpers now working d42ac5d53c Tyler Renelle 2013-05-19 18:53:13 +0100
  • d42ac5d53c helpers.coffee now working with the website Tyler Renelle 2013-05-19 18:52:13 +0100
  • 7f486d8b3c ignore .idea Tyler Renelle 2013-05-19 18:06:32 +0100
  • 5d1368e794 habitrpg-shared: got items working (see 1feb209c24) Tyler Renelle 2013-05-19 18:01:50 +0100
  • 1feb209c24 Moving back to the Browserify method of concat'd JS files, which will then be exposed to the browser as a global. This was decided between @yangit and me, as we found RequireJS to be too painful to setup for our use case. This Browserify + Global works just fine for us, and it fits perfectly as require() statements in our node.js backend Tyler Renelle 2013-05-19 18:01:01 +0100
  • 6a6a75edda Merge branch 'develop' of github.com:lefnire/habitrpg into develop Tyler Renelle 2013-05-19 15:02:50 +0100
  • ae4c5723e0 chat: allow admins to remove other people's messages Tyler Renelle 2013-05-19 15:02:04 +0100
  • 9b46805452 Merge pull request #989 from Shaners/develop Tyler Renelle 2013-05-18 01:09:05 -0700
  • 5cff970947 Bacon Bacon Shane Lister 2013-05-17 16:42:26 -0700
  • 081b5be657 Merge pull request #17 from lefnire/develop Shane Lister 2013-05-17 16:36:30 -0700
  • e7558139e6 challenges: require challenge title, when user subscribe add new tag of challenge name. unsubscribe deletes tasks Tyler Renelle 2013-05-17 23:33:24 +0100
  • 9b41712ca6 challenges: fix to not apply user's active tags to new challenge tasks, but also not apply filters except to main user's list Tyler Renelle 2013-05-17 23:32:24 +0100
  • 6507795d99 challenges: prevent some task options (such as scoring, check-marking, tags, etc) for challenge edits Tyler Renelle 2013-05-17 20:59:29 +0100
  • 0a291bf892 challenges: add challenge.id to task so we can get the icon-bullhorn Tyler Renelle 2013-05-12 19:23:16 +0100
  • ae8a283d0e challenges: chevron in collapsing title Tyler Renelle 2013-05-12 18:54:45 +0100
  • 57f51048a1 challenges: basics for challenge subscription Tyler Renelle 2013-05-12 17:22:07 +0100
  • b8ef0789df challneges: semi-functional challenge creation for parties Tyler Renelle 2013-05-12 16:47:18 +0100
  • 5ea6e55e11 challenges: add assignTo option on challenge-creation Tyler Renelle 2013-05-12 13:57:17 +0100
  • d28edaf30d challenges: list taken dynamically from scope so we can push/unshift to various task lists depending on location of add-task form. be careful with this commit, not the {{}} instead of {} - seems to be required otherwise things get weird Tyler Renelle 2013-05-12 13:36:30 +0100
  • 0a37637daf challenges: fix up lists to use new list templates Tyler Renelle 2013-05-12 13:12:02 +0100
  • 836787906d bstart building challenges Tyler Renelle 2013-05-12 00:05:13 +0100
  • 9abed29386 double quote missing LazuliKazeno 2013-05-17 14:15:17 +0200
  • 92e8e5b597 done trying to futz with user-menu css for maintaining visibility when header hidden. Instead, just put it elsewhere in html if header hidden. fixes #981 Tyler Renelle 2013-05-17 12:09:43 +0100
  • 274f74e9bb Small changes LazuliKazeno 2013-05-17 14:05:10 +0300
  • 4c0fe42d4e only hide header bits with preferences.hideHeader, fixes #979 Tyler Renelle 2013-05-17 10:22:21 +0100
  • a6973e9ae2 back to websockets Tyler Renelle 2013-05-17 09:58:37 +0100
  • 9946495564 Merge branch 'develop' Tyler Renelle 2013-05-17 09:57:32 +0100
  • 3d6aec94a7 Merge pull request #6 from yangit/master Yan 2013-05-16 19:33:38 -0700
  • 6c7bb7d4ab CS all the way! yangit 2013-05-17 10:30:19 +0800
  • 636e7aa4c0 Merge branch 'develop' of github.com:lefnire/habitrpg into develop Tyler Renelle 2013-05-16 17:58:49 +0100
  • f1767191d3 Merge pull request #977 from Shaners/patch-1 Tyler Renelle 2013-05-16 09:28:42 -0700
  • 0c6a71a581 Update npcs.styl Shane Lister 2013-05-16 10:22:37 -0600
  • f6df9a610a get rid of some old unused images Tyler Renelle 2013-05-16 12:16:24 +0100
  • af8dbb9f1a Use @Shaners new NPCs sprites instead of images Tyler Renelle 2013-05-16 11:59:17 +0100
  • 85018568e4 Merge pull request #973 from Shaners/develop Tyler Renelle 2013-05-16 03:12:14 -0700
  • 2cebbb93e5 NPC Sprite Sheet and CSS Shane Lister 2013-05-15 21:44:39 -0700
  • 8bb0718cea Backer-Gear Tweaks, NPCs Shane Lister 2013-05-15 17:22:32 -0700
  • c9cfd2c30b Merge pull request #16 from lefnire/develop Shane Lister 2013-05-15 17:07:14 -0700
  • e586b8bde5 Merge pull request #5 from yangit/master Yan 2013-05-15 07:09:44 -0700
  • d3cf80ec02 readme.fix Alogos are still BROKEN. I'm deploying them here for testing. yangit 2013-05-15 22:08:35 +0800
  • a3e8ed78b3 Merge pull request #4 from yangit/master Yan 2013-05-15 07:01:59 -0700
  • 28aa7d2e4f Requred items.js from algos.coffee We do not need to pass items{} to scoring function anymore. Alogos are still BROKEN. I'm deploying them here for testing. yangit 2013-05-15 21:59:01 +0800
  • eca7b1b53b Merge branch 'develop' Tyler Renelle 2013-05-15 12:47:58 +0100
  • 149961c07d z-index fix on NPC popover dialogs Tyler Renelle 2013-05-15 12:23:18 +0100
  • 4aeb7c5635 better "level: 1" positioning, add stats to party members Tyler Renelle 2013-05-15 11:42:35 +0100
  • 5a01963c1f back to xhr-polling or a bit, will figure out why websockets having Tyler Renelle 2013-05-15 09:58:29 +0100
  • aef76ae969 pets: bug fix for users who haven't been properly converted to pets array system Tyler Renelle 2013-05-15 09:14:42 +0100
  • 1abe136d52 Merge pull request #3 from yangit/master Yan 2013-05-14 23:38:08 -0700
  • 15c2dc3497 Boilerplate added to helpers.js to be able to include it properly. Alogos are still BROKEN. I'm deploying them here for testing. yangit 2013-05-15 14:33:12 +0800
  • ffdf279ee1 Require.js example expanded. Helpers.js\moment.js included. Alogos are still BROKEN. I'm deploying them here for testing. yangit 2013-05-15 14:17:53 +0800
  • cef7931b12 Merge pull request #2 from yangit/master Yan 2013-05-14 22:32:01 -0700
  • ff8721b4a3 Require.js example. Alogos are still BROKEN. I'm deploying them here for testing. yangit 2013-05-15 13:27:17 +0800
  • 8897cc338a Stripped all derby related code. Added require.js wrapper. Alogos is still BROKEN. I'm deploying them here for testing. yangit 2013-05-15 12:51:21 +0800
  • d59f1f6925 Revert "back to xhr-polling or a bit, will figure out why websockets having" Tyler Renelle 2013-05-14 23:53:59 +0100
  • e5549d0501 back to xhr-polling or a bit, will figure out why websockets having issues soon Tyler Renelle 2013-05-14 23:42:36 +0100
  • 950be4daf2 cron: better solution to testing "due today" for tasks with repeat options, and user with custom dayStart. Still not sure if this is the ideal solution, but addresses #963 Tyler Renelle 2013-05-14 19:01:05 +0100
  • 3ae295c9a3 don't include 'disabled' shading for todos Tyler Renelle 2013-05-14 18:20:19 +0100
  • 19016cc895 fix #958 Tyler Renelle 2013-05-14 18:17:19 +0100
  • 02215aeda0 Merge branch 'master' of github.com:lefnire/habitrpg Tyler Renelle 2013-05-14 18:10:47 +0100
  • 0a0cf1d94e cron: fix repeat, for old users without default task.repeat={} Tyler Renelle 2013-05-14 18:10:24 +0100
  • 5d421bdbd4 Merge pull request #962 from Celtis/patch-1 Tyler Renelle 2013-05-14 10:05:44 -0700
  • 0b8960470a Minor grammatical fix Celtis 2013-05-14 18:51:38 +0200
  • 92b178b4a4 huge cron fixes which should solve streak, dayStart, "timezone" issues Tyler Renelle 2013-05-14 17:33:15 +0100
  • ed0bbb782e Merge pull request #960 from LazuliKazeno/translations Stan Lindsey 2013-05-14 08:37:41 -0700
  • 42056e6ed3 Merge pull request #955 from sorko/translations Stan Lindsey 2013-05-14 08:35:31 -0700
  • 2c7492709c tags: make tag-selection checkboxes for now, peopel aren't understanding combobox Tyler Renelle 2013-05-14 16:07:37 +0100
  • 96ebde3fa3 Update app.json sorko 2013-05-14 16:20:40 +0300
  • 7f1527ed01 End of french translation LazuliKazeno 2013-05-14 14:17:55 +0200
  • 213c2cbf51 Partially translated into Urdu language w13 2013-05-14 18:36:56 +0700
  • 8e80c08dfe Update app.json sorko 2013-05-14 14:24:47 +0300
  • 71389c0b22 Partially translated to Urdu w13 2013-05-14 18:21:56 +0700
  • 643606360f Partially translated to Urdu. w13 2013-05-14 18:13:21 +0700
  • dd6e090a1b Merge pull request #953 from cleave29/translations Daniel Saewitz 2013-05-14 00:45:02 -0700
  • 36f391a828 Update app.json cleave29 2013-05-14 01:42:10 -0600
  • 5628287368 Merge pull request #951 from WielebnyB/translations Daniel Saewitz 2013-05-13 16:45:06 -0700
  • bcbbe4799b Update app.json WielebnyB 2013-05-14 01:23:49 +0200
  • 4d5b87351f misspelled matt boch Tyler Renelle 2013-05-14 00:07:40 +0100
  • c7a68c5a2e Update app.json WielebnyB 2013-05-14 00:33:42 +0200
  • a8f9cc972f fix up stables / matt for smaller screens Tyler Renelle 2013-05-13 23:17:54 +0100