sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-05 03:52:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
1492 commits 3 branches 0 tags 1.6 GiB
Commit graph

1492 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tyler Renelle
ac419e7813 add default numbers for restore tool if one isn't provided: #594 2013-03-06 23:50:06 -05:00
Tyler Renelle
db805b6388 Merge pull request #592 from aaron4/patch-1 
Added space after each line of text (privacy.html)
 2013-03-06 10:11:01 -08:00
Tyler Renelle
467cbfba64 Merge pull request #593 from aaron4/patch-2 
Added space after each line of text (terms.html)
 2013-03-06 10:09:42 -08:00
Tyler Renelle
722b5c7640 Merge pull request #601 from switz/api-alg 
Add 'To next level' to user stats on API
 2013-03-06 07:19:22 -08:00
Daniel Saewitz
5a1343a3b7 Set maxHealth to 50 2013-03-06 09:11:14 -05:00
Daniel Saewitz
ef7d705059 Add to next level to user stats on API 2013-03-06 08:45:51 -05:00
Tyler Renelle
27ce1b050b try x-requested-with for CORS 2013-03-05 23:05:59 -05:00
Tyler Renelle
b6564828ce use different rewards selector for items-unlocked popover, wasn't getting it 2013-03-05 21:41:01 -05:00
Tyler Renelle
4f7cdc38e9 add help popover to difficulty 2013-03-05 18:58:15 -05:00
Tyler Renelle
9c14b29a3d rename priority multiplier to "Difficulty" -> easy, medium, 
hard (people keep getting confused) and putting it back into
"advanced" section
 2013-03-05 18:07:22 -05:00
Tyler Renelle
df220b43df Merge branch 'develop' 2013-03-05 17:05:32 -05:00
Tyler Renelle
41b1ca9f73 typo 2013-03-05 17:05:05 -05:00
Tyler Renelle
b0b591dc96 Merge branch 'develop' 2013-03-05 17:04:31 -05:00
Tyler Renelle
6a280c57ea re-applying #553 fix 2013-03-05 17:04:22 -05:00
Tyler Renelle
a8c09110f7 reverting redisign commits. @zakkain some issues here ill follow up with you on - if i forget, "add" button in responsive layout, item store issues 2013-03-05 17:02:22 -05:00
Tyler Renelle
16b9ea3b58 reverting my #553 & html cleanup fixes, merge conflicts from redesign - gotta go through and do these again 2013-03-05 17:00:44 -05:00
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
4ca62b9f28 put splash middleware back in 2013-03-05 14:09:56 -05:00
Tyler Renelle
6bfe1d076e CORS middleware 2013-03-05 14:09:53 -05:00
Tyler Renelle
57b497f1bd put splash middleware back in 2013-03-05 14:09:39 -05:00
Tyler Renelle
26a8917862 tour fix 2013-03-05 14:02:57 -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
aaron4
9ad67fa169 Added space after each line of text 
Same for this one. Added space to each line of text if line of text is following.
Also changed "Terms Of Use" to "Terms of Use".
 2013-03-05 10:42:40 -06:00
aaron4
2cf267ccf5 added space after each line of text 
With previous privacy.html, there was not a space after each line of text (if line of text following). This caused words to be combined together.
Fixed issue by adding a space after each line of text.
 2013-03-05 10:26:08 -06: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
Philip How
ce09d72708 cap deltas 2013-03-05 06:59:56 -05: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