Commit graph

1470 commits

Author SHA1 Message Date
Tyler Renelle
1cd3299388 strange fix for #553, also #539 take note 2013-03-05 16:16:08 -05:00
Tyler Renelle
9a60ed5269 some html cleanup 2013-03-05 16:06:56 -05:00
Tyler Renelle
bb82bcc62a namespacing for tasks & rewards too 2013-03-05 15:52:47 -05:00
Tyler Renelle
8132dbfe05 <task:> tabbing borked 2013-03-05 15:23:16 -05:00
Tyler Renelle
26a26b5344 Merge branch 'develop' of github.com:lefnire/habitrpg into develop 2013-03-05 14:23:00 -05:00
Tyler Renelle
57b497f1bd put splash middleware back in 2013-03-05 14:09:39 -05:00
Tyler Renelle
22c5acc303 tour fix 2013-03-05 14:02:46 -05:00
Tyler Renelle
1f94085875 CORS middleware 2013-03-05 13:12:09 -05:00
Tyler Renelle
db71cca404 Merge pull request #591 from MrConcept/notifications
Iterative Levelling
2013-03-05 05:23:45 -08:00
Philip How
7e402c5688 iterative levelling 2013-03-05 13:17:46 +00:00
Philip How
8e7c93aa0b iterative levelling 2013-03-05 13:11:13 +00:00
Tyler Renelle
8814ff62b3 Merge pull request #588 from MrConcept/notifications
Properly Cap Deltas
2013-03-05 03:56:06 -08:00
Philip How
d616579e4e cap deltas 2013-03-05 09:51:42 +00:00
Zachary Kain
ba1a8dabc8 add in Lato as main font, lots of minor layout tweaks. Continue refactoring tasks html 2013-03-04 20:36:11 -05:00
Zachary Kain
b7d46b1e20 start new task column css, add classes 2013-03-04 19:42:48 -05:00
Zachary Kain
01971fba1e improve vertical centering of task checkbox and text 2013-03-04 19:11:37 -05:00
Zachary Kain
41fc027150 add npm-debug.log to gitignore because DANG 2013-03-04 17:31:33 -05:00
Tyler Renelle
17ab9b9a22 Merge pull request #582 from MrConcept/onlies
Onlies
2013-03-04 14:07:14 -08:00
Philip How
78ba0f5214 comment logging 2013-03-04 22:04:02 +00:00
Philip How
7c10aafb1c Fixes galore 2013-03-04 22:00:12 +00:00
Tyler Renelle
87692e90b5 too many emails! 2013-03-04 16:10:36 -05:00
Tyler Renelle
8c1c5bba13 possible fix for #562 - reflists sometimes contain a null value 2013-03-04 15:20:53 -05:00
Tyler Renelle
bb5fe4520f only setup bootstrap growl notifications once. i still don't get this.
this issue is caused after browser.resetDom(), which happens on (1)
cron, (2) reset, (3) reroll. after which for some people this commit
will cause notifications to disappear altogether, while for others
reverting this commit will cause notifications to double.
2013-03-04 12:50:49 -05:00
Tyler Renelle
721803d4de don't use bootstrap tour until #578 fixed 2013-03-04 12:48:10 -05:00
Tyler Renelle
378a03b6a0 add bootstrap tour as a submodule, some cleanup 2013-03-04 12:47:33 -05:00
Tyler Renelle
34651083ec Merge pull request #570 from lefnire/priority-multiplier
Priority multiplier
2013-03-04 08:38:14 -08:00
Tyler Renelle
9517455a79 migrate "multiplier" setup to "priority" setup, with ! !! !!! instead
of 1 2 3. multipliers are now 1x 1.5x 2x
2013-03-04 11:37:46 -05:00
Tyler Renelle
bd19e09fcf possible fix for #324 - shuffle some function placement to be sure
definition precedes function call. put re-rendering
functionality (setupSortable, setupTour, etc) into app.on('render')
2013-03-04 11:17:17 -05:00
Tyler Renelle
233f8ea595 data-target on modal instead of hrefd 2013-03-04 00:41:59 -05:00
Tyler Renelle
1bd067f32f add multiplier "new feature" alert 2013-03-03 22:06:34 -05:00
Tyler Renelle
d925c43c7b multipy GP with priority-multiplier, too 2013-03-03 22:01:59 -05:00
Tyler Renelle
7f03a30fd5 remove "advanced" section, clean up the task-edit form a bit 2013-03-03 21:38:21 -05:00
Tyler Renelle
2e26df743f Merge branch 'develop' into priority-multiplier 2013-03-03 21:25:13 -05:00
Tyler Renelle
35cea7fcbb notification on "onlies" mechanic 2013-03-03 20:59:14 -05:00
Tyler Renelle
ec2889a366 Merge branch 'develop' of github.com:lefnire/habitrpg into develop 2013-03-03 20:30:46 -05:00
Tyler Renelle
7dc2bd6663 Merge pull request #569 from switz/api
@lefnire => Move deprecated API back to deprecated
2013-03-03 16:39:49 -08:00
Daniel Saewitz
30a3e46f20 Move deprecated api back into new 2013-03-03 19:37:54 -05:00
Daniel Saewitz
4919cd22b5 Move deprecated API back to deprecated 2013-03-03 19:30:53 -05:00
Tyler Renelle
e86c994076 Merge pull request #568 from MrConcept/notifications
onlies now reset their value every day
2013-03-03 16:23:45 -08:00
Philip How
120e058346 onlies now reset their value every day 2013-03-04 00:18:04 +00:00
Tyler Renelle
c33c6c3480 add multiplier functionality to task scoring 2013-03-03 18:18:49 -05:00
Tyler Renelle
1a335cc68a add priority-multiplier to html & tasks.coffee (note, requires merge
of @IvanGaravito /derby#hotfix-model_at_for_each_blocks
2013-03-03 17:54:14 -05:00
Tyler Renelle
6189fee74e algorightms notification (to warn people to restore their exp) 2013-03-03 16:14:16 -05:00
Tyler Renelle
4b77daff0a redirect deprecated task-scoring to new API, some cleanup to score function to use switz auth 2013-03-03 12:44:50 -05:00
Tyler Renelle
264119b755 remove ical link from new API. shouldn't even be in old API, really -
it's just a link... don't know why I did that. but alas, people
already have subscriptions on that link so if it aint broke
2013-03-03 12:22:56 -05:00
Tyler Renelle
afaf358005 update to chest favicon 2013-03-03 12:15:25 -05:00
Tyler Renelle
69c8d78352 purchase tokens accessControl bug fix 2013-03-03 11:34:09 -05:00
Tyler Renelle
cc4d1b2508 fix double-alerts bug 2013-03-03 01:41:52 -05:00
Tyler Renelle
34f5f2dc54 custom dayStart 2013-03-03 01:21:10 -05:00
Tyler Renelle
0f0ca21f82 fix default dailies repeat schema 2013-03-02 23:57:10 -05:00