Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,936 Commits 64 Branches 1,256 Tags
32d1ff68b40a2f33e2f268be77eacb79a16df4f1
Commit Graph

283 Commits

Author SHA1 Message Date
Tyler Renelle 1dda9254f3 bailey: notif on task icons & markdown 2013-12-31 09:15:06 -07:00
Tyler Renelle 80e593d49f new years eve: bailey 2013-12-31 08:43:29 -07:00
Tyler Renelle 928f7cfdd7 Merge remote-tracking branch 'origin/sabe/rebirth' into develop 
Conflicts:
	src/models/user.js
	views/shared/modals/index.jade
 2013-12-31 08:04:51 -07:00
Tyler Renelle 01ecc616f6 Merge branch 'checklists' into develop 2013-12-31 07:53:34 -07:00
Sabe Jones 85657f40d3 Fix placement of "Restore Streak" caption on Firefox 2013-12-30 17:25:13 -06:00
Tyler Renelle 4fcee66c3b checklists: inline by default, add help popover 2013-12-30 14:40:07 -07:00
Tyler Renelle c7dde3cde1 checklists: add CL up/down keyboard nav 2013-12-30 13:42:19 -07:00
Tyler Renelle 1110338b9b checklists: handle backspacing an empty CL item 2013-12-30 13:19:42 -07:00
Tyler Renelle ebc7cf6bcb checklists: better handling of saveTask, keypress:13, and remove-blur 2013-12-30 12:56:26 -07:00
Tyler Renelle 0fe2804c3c fix #2184 put dbl-click for task._editing on the correct element 2013-12-30 11:17:19 -07:00
Tyler Renelle 63541ad268 checklists: add inline-checklists user preference, and hide inlines when 
editing
 2013-12-30 10:33:48 -07:00
Tyler Renelle bb3bec520e checklists: tmp commit to showcase how inline checklists look on 
tasks (only for todos for comparison)
 2013-12-30 10:33:48 -07:00
Tyler Renelle 968b091ccd checklists: checklist as <li> instead of <label>, so that inline-editing 
doesn't trigger checkmark. Unfortunately means we need to replicate some
bootstrap css
 2013-12-30 10:33:48 -07:00
Tyler Renelle 1ace999cb7 Tasks: add double-click to edit, and date-picker-popup for 
due-dates. Show red dates when overdue (basic)
 2013-12-30 10:33:48 -07:00
Tyler Renelle 74c905f1e1 checklists WIP 2013-12-30 10:33:17 -07:00
Tyler Renelle ea31cc6926 Merge branch 'task-li-notes' into develop 
Conflicts:
	views/shared/tasks/task.jade
 2013-12-30 10:31:17 -07:00
Tyler Renelle 6f0046dffc Revert b4ff7d4 b20a3b7 . Temporarily remove 
todo-filter. This brings back the big performance issue of always
displaying completed-todos, but fixes #2180 #2189. See #2180 for
discussion.
 2013-12-30 10:19:57 -07:00
Sabe Jones 199a74d8a9 Fix #2181 (allocated points showing up in Class Equip Bonus) 2013-12-30 07:33:17 -06:00
Sabe Jones c3aed6fb28 RPG demystification, cont'd 2013-12-29 20:58:35 -06:00
Tyler Renelle 50d241e2c8 #2083 add list-item notes at top-level element 2013-12-29 17:34:21 -07:00
Tyler Renelle fd324fc220 classes: fix class-modal heads. Also, little class title display trick 
@sabrecat (tiny perf bonus)
 2013-12-29 12:21:56 -07:00
Sabe Jones 2f79472439 Some work on demystification of RPG elements 2013-12-29 11:04:31 -06:00
Tyler Renelle e9cb9b8a9f task-icons: larger emoji in task text than chat 2013-12-29 01:24:02 -07:00
Tyler Renelle c14e4c8fec display profile.stats.class in modal 2013-12-29 00:47:39 -07:00
Tyler Renelle 585f736305 add markdown support for task.text so we can use icons in task 
titles. @wc8 does this satisfy
https://trello.com/c/FCVdjdUd/102-task-reward-icons sufficiently? @lemoness
 2013-12-29 00:46:08 -07:00
Tyler Renelle d966833782 #1499 ng-if to hide/show task editing (fewer watchers) 2013-12-29 00:14:55 -07:00
Tyler Renelle b20a3b7381 #1499 add list filter on tasks to not display completed todos at all 
until "completed" tab clicked
 2013-12-29 00:14:46 -07:00
Bob Steffes 5c89954b83 Update Request Feature link 
Link now goes directly to How to Submit a New Request card. Previously it was linking to the Trello board (not the card).
 2013-12-27 19:21:30 -08:00
Tyler Renelle fa2fddb516 winter: add snowball achievement 2013-12-27 09:48:58 -07:00
Sabe Jones f38b8e41af Final commit for Rebirth feature! Implement achievement and prestige icon 2013-12-25 17:56:55 -06:00
Tyler Renelle e9b0ccc057 Evil Santa => Trapper Santa 2013-12-25 08:30:55 -07:00
Tyler Renelle fc4a141d2e bosses: bailey 2013-12-25 08:24:39 -07:00
Tyler Renelle 44e89d1be7 bosses: misc small bugs 2013-12-25 00:55:38 -07:00
Tyler Renelle f8559b1762 bosses: pretty things up amongst the modals, etc. Move rewards to a 
directive so we can share it. Add dialog on quest-completion using
user.party.quest.completed flag
 2013-12-24 23:30:48 -07:00
Tyler Renelle 094989db13 quests: add collection quests, incl. polar bear pt 2, and quest arks, and achievements 2013-12-24 17:24:09 -07:00
Sabe Jones 3b94b18bb6 Implement Rebirth in controllers and API, revise modal per @wc8 feedback 2013-12-24 18:09:32 -06:00
Sabe Jones cc3632b611 Add Orb of Rebirth to shop, image to modals, tweak modal text 2013-12-24 09:57:04 -06:00
Tyler Renelle 8095397317 Quests: hurt boss via score method, refactor chat function, change all content.*.name to content.*.key for consistency 2013-12-23 01:19:18 -07:00
Tyler Renelle ecb354e2cc Quests: initial Bosses WIP - invite, accept, reject, etc 2013-12-22 17:46:54 -07:00
Tyler Renelle 067fbe861c remove math updates notif now that things have settled down a bit (most 
updates now should be subtle). @wc8 @sabrecat let me know if you think
this is premature
 2013-12-22 11:47:10 -07:00
Sabe Jones 60c622f1c1 Initial commit: unlock notification, new modals 2013-12-22 08:32:39 -06:00
Tyler Renelle 4adb66cc4f add notif on iOS for math updates 2013-12-21 18:50:18 -07:00
Tyler Renelle cdf8c2412f fix to mathUpdates on usermodel 2013-12-21 15:15:01 -07:00
Tyler Renelle 8280208fae lvl 10 classes unlock 2013-12-21 15:07:19 -07:00
Tyler Renelle db5de3ef7b some classes-math wording updates 2013-12-21 15:05:32 -07:00
Tyler Renelle 640dd04dd3 add notif re: math updates for classes (@wc8) 2013-12-21 14:55:18 -07:00
Tyler Renelle f2d58e1c8e update bailey per @lemoness , update limited-edition end date 2013-12-20 18:52:32 -07:00
Tyler Renelle 9518cd1b51 winter: add salt spell to remove snowball buff 2013-12-20 18:35:50 -07:00
Tyler Renelle 6cb90093d0 winter: bailey notif, show winter colors as limited-edition 2013-12-20 11:03:43 -07:00
Tyler Renelle 676112c1b5 winter event! npcs, snowball=>snowman, new hairs/beards. Fixes to beard/chin overlays. move Fortify Service => "Fortify Potion" Special. @sabrecat let me know what you think: http://gyazo.com/55cd424f104b8f3acb557b99d918cb4b). Sorry for mixing concerns in this commit, some rebase difficulties 2013-12-20 10:26:23 -07:00