sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-07-30 06:30:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
25741 commits 3 branches 0 tags 1.6 GiB
Commit graph

25741 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Zachary Kain
5fb3ba67f6 circle icon for uncompleted tasks, and rollin with square edges for now 2013-03-05 15:13:59 -05:00
Zachary Kain
1a308da495 better responsive breakpoints, more robust custom grid 2013-03-05 15:01:52 -05:00
Tyler Renelle
26a26b5344 Merge branch 'develop' of github.com:lefnire/habitrpg into develop 2013-03-05 14:23:00 -05:00
Zachary Kain
efe1c9267e WIP: new 'Task Actions' UI (buttons, checkboxes, etc) 2013-03-05 14:16:10 -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
Zachary Kain
9d312ce184 clean up nbsp, replace old gcal markup with new markup, still commented out 2013-03-05 09:18:21 -05:00
Zachary Kain
2d2e7bbf54 reposition Todo options, use proper icon 2013-03-05 09:13:14 -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
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
Shane Lister
2386715d94 Merge pull request #2 from lefnire/master 
Update my copy
 2013-03-03 22:21:26 -08: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