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

422 commits

Author SHA1 Message Date
Marcelo Sizer
1ec534a650 Fix typo 2014-01-11 14:36:18 -02:00
Marcelo Sizer
d978eb8702 Fix challenge completed not displaying text when someone wins a challenge. 2014-01-11 14:33:48 -02:00
Tyler Renelle
36d32d6b16 update forum & lfg links 2014-01-09 20:48:36 -07:00
Sabe Jones
27e9dfa0d5 Finish up @wc8 suggested user preferences: tags and Advanced Options start collapsed 2014-01-08 22:19:38 -06:00
Tyler Renelle
24b2094f35 Merge pull request #2300 from HabitRPG/sabe/tweak 
More UI demystification
 2014-01-08 14:34:09 -08:00
Sabe Jones
0a959b5f92 More UI demystification 2014-01-07 22:56:18 -06:00
Tyler Renelle
f742d3202a Merge pull request #2296 from SyntaxPickax/develop 
Fixed UI issues when editing checklists
 2014-01-07 20:22:52 -08:00
Brandon McPhail
07d4fc1184 Fixed UI issues when editing checklists 2014-01-07 11:55:41 -08:00
Tyler Renelle
bc451c20bf Merge remote-tracking branch 'colegleason/task-due' into develop 
Conflicts:
	views/shared/tasks/task.jade
 2014-01-07 10:53:27 -07:00
Tyler Renelle
bf594dadd1 Merge pull request #2287 from HabitRPG/sabe/tweak 
Add 1px margin to task badges so they don't run into each other/icons
 2014-01-07 09:50:17 -08:00
Tyler Renelle
154abcefbb #2010 Add party stats back in. Depends on habirpg-shared#939ce14 to wrap members 2014-01-07 10:46:51 -07:00
snicker
ec236f36d8 Emoji (and markdown =0) support in tags. May want to reduce this to *just* emoji at some point via another directive. Fixes #2164 2014-01-07 07:37:54 -08:00
Sabe Jones
d6e6daa3dc Add 1px margin to task badges so they don't run into each other and icons 2014-01-07 07:20:43 -06:00
Cole Gleason
3150b7b31b use correct granularity when checking if a task is overdue 2014-01-07 00:44:27 -06:00
Tyler Renelle
295815d1a3 typo fix 2014-01-06 21:54:01 -07:00
Tyler Renelle
44280c4a0e Merge pull request #2272 from Sinza-/envt/tasks 
Replace hard-coded strings for env.t on folder views/shared/tasks/
 2014-01-06 20:44:33 -08:00
Tyler Renelle
ac1bcd4791 winter: disable gold in restore-values during the WWE event 2014-01-06 18:44:53 -07:00
Tyler Renelle
b3dd1e0a68 bailey: WWE pt 4 (class gear) 2014-01-06 17:44:17 -07:00
Marcelo Sizer
73e9730fe7 Fix replacing typo 2014-01-06 17:47:16 -02:00
Marcelo Sizer
255acd79d2 Replace hard-coded strings for env.t on views/shared/tasks/ folder 2014-01-06 17:36:33 -02:00
Tyler Renelle
e23b42f300 #2186 hide task attrs unless allocationMode == 'taskbased' 2014-01-05 15:16:55 -07:00
Tyler Renelle
a6f096d730 #2186 hide task attributes if auto-allocate not enabled 2014-01-05 15:08:10 -07:00
Tyler Renelle
8c319b6079 Merge pull request #2186 from HabitRPG/sabe/tweak3 
Advanced Options default to being shown
 2014-01-05 14:06:42 -08:00
Sabe Jones
7904b8e4db Clear up some confusion caused by AngularJS number filter 2014-01-05 09:32:20 -06:00
Matteo Pagliazzi
7cfca80e2f remove unnecessary text tags 2014-01-05 13:23:45 +01:00
Matteo Pagliazzi
ce64affa92 fix gems styling 2014-01-05 12:59:00 +01:00
Tyler Renelle
3a5eda1e98 Merge remote-tracking branch 'origin/sabe/attributes' into develop 
Conflicts:
	views/shared/footer.jade
 2014-01-04 16:02:22 -07:00
Tyler Renelle
c6ab84721f fix #2205 hide checklist button from challenges 2014-01-04 10:58:12 -07:00
Tyler Renelle
45b543c1ed challenges: don't disable notes field when challenge-task 2014-01-03 13:14:56 -07:00
Tyler Renelle
eda45d9240 Merge pull request #2174 from Sinza-/develop 
Replace hard-coded strings with env.t on views/static folder and en/app.json
 2014-01-01 22:33:13 -08:00
Sabe Jones
a9e57a8adf Merge branch 'develop' into sabe/attributes 2014-01-01 12:42:53 -06:00
Tyler Renelle
dfe6d9ff88 tasks: dbl-click saves a task when previously in edit-mode. @sabrecat 
@wc8 it used to be it just closes the edit dialog, but I find myself
wanting to dblclick to save each time. Let me know if you think this is
a bad idea
 2013-12-31 18:11:20 -07:00
Tyler Renelle
962d509405 checklists #2198 don't collapse when in edit mode (that what you mean @sabrecat?) 2013-12-31 14:05:39 -07:00
Tyler Renelle
09eddd3eb2 checklists #2198 click badge to collapse checklist @sabrecat 2013-12-31 14:03:16 -07:00
Tyler Renelle
77c6777506 checklists: collapse individually 2013-12-31 13:50:14 -07:00
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
9c5f1c2150 Add debug button to hand out levels one at a time 2013-12-30 22:56:01 -06:00
Marcelo Sizer
ff5a42e3df Replace hard coded strings for env.t on views/shared/ folder. 2013-12-31 00:15:53 -02: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
Sabe Jones
a854109fcd Get attributes layout up-to-date with develop changes 2013-12-30 11:38:27 -06: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
5538bcc6a9 Advanced Options default to being shown 2013-12-30 08:57:41 -06: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
Tyler Renelle
6e3bb61f6e temporarily disable stats in party-member modals 2013-12-19 18:23:55 -07:00
Tyler Renelle
9fc5784320 classes: add streaks buff for mages 2013-12-18 10:39:23 -07:00
Tyler Renelle
75acffa073 show stealth buff in stats 2013-12-18 10:23:22 -07:00
Tyler Renelle
06ee34c09b fix #2040 - $rootScope.moment = window.moment. Fixes to applying spell 2013-12-17 23:08:41 -07:00
Sabe Jones
c43d784834 Add mention of Health refill to Fortify 2013-12-17 22:14:15 -06:00
Tyler Renelle
d03a996946 classes: very simple "buffs applied" icon next to level, add chat message 
for party / member casts (@wc8 @sabrecat)
 2013-12-17 19:16:31 -07:00
Tyler Renelle
e0623e6add classes: remove extra note about inventory 2013-12-17 17:18:59 -07:00
Tyler Renelle
87f4a1d204 #2017 add ability to opt out of classes entirely (@wc8) 2013-12-17 16:44:46 -07:00
Tyler Renelle
3b02717271 #2008 #2020 fixes to justin popovers so they don't go funky with sticky.js 2013-12-17 13:47:44 -07:00
Tyler Renelle
d2a460769d #2008 #2020 use jquery.sticky instead of bootstrap affix 2013-12-17 13:41:13 -07:00
Tyler Renelle
51c6914b56 tmp 2013-12-17 09:42:00 -07:00
Tyler Renelle
2b7730b6e3 fix #2007 resotore MPfix restore mp 2013-12-17 09:17:41 -07:00
Tyler Renelle
e9ed847a4e classes: updating class-selection description to include note about gear being 
transfered to inventory. It's in the tour, but most people seem to be
missing it... @sabrecat thoughts on this?
 2013-12-16 23:52:39 -07:00
Tyler Renelle
2e098ce87b classes: bailey 2013-12-16 23:33:05 -07:00
Tyler Renelle
ee3e7c2032 [#1990] Spelling updates 2013-12-16 16:28:46 -07:00
Tyler Renelle
3fe74e7708 cleaner stats page 2013-12-16 14:29:44 -07:00
Tyler Renelle
2175d7733d classes: better stats breakdown, including buffs 2013-12-16 14:18:31 -07:00
Tyler Renelle
302340bee2 [#1997] classes: add MP to restore dialog (@wc8 you might find this useful) 2013-12-16 13:38:23 -07:00
Tyler Renelle
5251b4ce3c classes: add just guide for classes unlock 2013-12-16 13:33:05 -07:00
Tyler Renelle
a1590f7f3e classes: update some classes wording 2013-12-16 13:03:33 -07:00
Tyler Renelle
5f689960b6 [#1994] fixes to MP bar 2013-12-16 11:08:39 -07:00
Tyler Renelle
259f9033c4 APIv2: add paths /api/v2/* and /api/v1/*. v1 has limited deprecated routes (only the things I know currently work), and we'll notify 3rd-partyists to migrate to apiv2 once it's documented and tested 2013-12-15 17:54:34 -07:00
Tyler Renelle
774775de7a fixes: appliedTags, add moment to rootScope (repeat i18n issues). Also, 
discard the sync-queue if errors were detected. Previously, if an op
triggered server error, the op is still in the queue and will keep
trying. Thus, in-browser user is corrupt - they'll need to logout /
clear localStorage. This *should* fix that, while still allowing the
sync-queue to build up when offline (status appears to == 0 in those
cases). @paglias just FYI - should be good, but wanna loop you in just
in case.
 2013-12-15 12:11:25 -07:00
Tyler Renelle
bc0034f022 apiv2 handle notifications circular-dependency. migration 
fixes. Rest=>Sleep fixes
 2013-12-15 10:57:53 -07:00
Tyler Renelle
ae4ca337c8 Merge pull request #1949 from bobbyroberts99/develop 
Reposition Markdown formatting link
 2013-12-14 21:21:45 -08:00
Sabe Jones
68b2c8b6bc Add explicit cancel button to Fortify modal 2013-12-14 19:23:40 -06:00
Bob Steffes
182a34ed7e Update footer FAQ to wiki 2013-12-14 10:59:45 -08:00
Tyler Renelle
dc348d5601 [#1969] add in @Fandekasp's shirts, had to do separate commit for handling of 
user.preferences.shirt
 2013-12-14 00:35:03 -07:00
Tyler Renelle
c85450db04 classes: add task attributes for point allocations 2013-12-13 17:50:43 -07:00
Tyler Renelle
d2121a8587 fix(classes) misc fixes 2013-12-13 17:08:25 -07:00
Tyler Renelle
9d9b8120cd classes: migrate priority from !,!!,!!! to Number (prep for passive stats) 2013-12-12 20:59:20 -07:00
Tyler Renelle
478be61113 fix(classes) misc class fixes (not @snicker, ng-if on item store since 
we dynamically swap it sometimes)
 2013-12-12 20:03:32 -07:00
Tyler Renelle
dc63eff41d [#1977] move sleep & clear-completed to user.ops 2013-12-12 16:59:53 -07:00
Thibaut Girka
6604a36a9a Fix syntax error in jade file 2013-12-12 18:56:43 +01:00
Tyler Renelle
ee1cd3c05d [#1977] APIv2 WIP - start of a framework where operations are shared 
between client & server. If the op is called on the client, it updates
the user & then POSTs to the server with op of the same name. If called
on server, it updates the user and user.save()s
 2013-12-11 21:42:57 -07:00
Tyler Renelle
108d852d12 remove reroll from tasks/lists.jade 2013-12-08 19:04:18 -07:00
Tyler Renelle
76565384d3 Merge branch 'classes' into develop 
Conflicts:
	public/js/controllers/tasksCtrl.js
	views/shared/modals/settings.jade
 2013-12-08 18:17:53 -07:00
Tyler Renelle
c524972aa2 Merge pull request #1952 from HabitRPG/sabe/tweak 
Tweaks from Sabe
 2013-12-08 08:50:37 -08:00
Tyler Renelle
4d3a359d6b fixes to sabe/tweak #1952 @SabreCat (put gems inline with fortify 
button, remove reroll from store)
 2013-12-08 09:46:30 -07:00
Tyler Renelle
f8f8a1334b Merge branch 'develop' into classes 
Conflicts:
	views/options/inventory/stable.jade
 2013-12-07 20:23:26 -07:00
Tyler Renelle
680f0e974e mounts: bailey notif 2013-12-07 11:56:34 -07:00
Tyler Renelle
c51cdd0849 classes: proper handling of items on class-switch, un-equipping items, 
etc. Paves way for item-loss on death. See habitrpg-shared#acae9c3
 2013-12-06 15:41:58 -07:00
Tyler Renelle
8216828514 classes #943 reroll sets you on your new class's item track. Handling of two-handed staves 2013-12-06 10:51:23 -07:00
Tyler Renelle
b9845aec4a classes: fixes to buying special-gear & regular gear habitrpg-shared#ee4777d 2013-12-05 15:48:50 -07:00
Tyler Renelle
ad0c953d0a classes: misc spell-casting fixes, support party spells 2013-12-05 11:05:47 -07:00
Tyler Renelle
5fd378ebed classes: fixes to beard / chin overlap 2013-12-05 11:05:36 -07:00
Tyler Renelle
80e97a71ed classes: misc fixes 2013-12-05 09:52:41 -07:00
Tyler Renelle
2563ec5763 classes: beards & mustaches! 2013-12-05 03:31:02 -07:00
Tyler Renelle
dde0655900 classes: fixes to class-selection & reroll, remove show/hide gear since 
we're using costumes
 2013-12-04 23:53:55 -07:00
Tyler Renelle
5fea978e6b costumes: add costume support in inventory 2013-12-04 22:50:20 -07:00
Tyler Renelle
decaa2867b classes: misc fixes. start a running migration file (add to, or add notes as we go along) 2013-12-04 17:50:40 -07:00
Tyler Renelle
88c64a6f80 classes & grunt-spritesmith: NPCs habitrpg-shared#85164c9 2013-12-04 16:52:06 -07:00
Tyler Renelle
8803df46c0 classes & grunt-spritesmith: death, paws, gems-cleanup 2013-12-04 16:02:08 -07:00
Tyler Renelle
55d0a0a94d classes: fix customizations based on habitrpg-shared#9821a88 2013-12-04 15:09:56 -07:00
Tyler Renelle
350e3681d7 classes: grunt-spritesmith fixes 2013-12-03 18:51:19 -07:00
Tyler Renelle
19b6eb73e0 Merge branch 'develop' into classes 
Conflicts:
	public/css/index.styl
	src/models/user.js
	views/options/profile.jade
	views/shared/header/avatar.jade
	views/shared/tasks/lists.jade
	views/shared/tasks/task.jade
 2013-12-02 18:24:33 -07:00
Sabe Jones
dab22ec051 Small formatting fix to Advanced Options 2013-12-02 11:10:58 -06:00
Sabe Jones
37f7a923ea Fix #1934 (make Reset and Restore options more distinct) 2013-12-02 10:20:38 -06:00
Sabe Jones
45b87288f0 Change "reroll" to "Fortify" in Gems popover text 2013-12-01 15:03:03 -06:00
Sabe Jones
af80548a34 Partial fix to #1938 (New name and location for Re-Roll) 2013-12-01 11:58:03 -06:00
Tyler Renelle
91c141140d classes: armory WIP 2013-11-30 16:33:21 -07:00