Commit Graph

3944 Commits

Author SHA1 Message Date
Tyler Renelle 98361ea94f #2217 add note about API-docs being a WIP 2014-01-01 16:37:03 -07:00
Tyler Renelle f676dba159 #2217 more progress documenting API 2014-01-01 16:23:06 -07:00
Tyler Renelle 0edcfac46b #2217 start adding APIv2 generated documentation via swagger-node-express 2014-01-01 15:33:37 -07:00
Tyler Renelle 0f3202f964 #2200 change-password is showing for facebook-registered users for some reason 2013-12-31 20:00:15 -07: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 f6dec231f5 fix #2064 - user.stats.buffs.int in UserSchema (woops, @sabrecat we were
looking in the wrong place!)
2013-12-31 13:36:52 -07:00
Tyler Renelle d75d96fc4a Merge pull request #2203 from HabitRPG/sabe/tweak
Extend notification time, fix MP alerts
2013-12-31 08:54:58 -08:00
Tyler Renelle 3aa2470b33 Merge pull request #2201 from aughr/seed_working
Fix seed file
2013-12-31 08:53:03 -08:00
Sabe Jones be38029015 Extend notification time, fix MP alerts 2013-12-31 10:29:48 -06:00
Tyler Renelle bde22636cf checklsits: package & bower use habitrpg-shared#develop 2013-12-31 09:15:25 -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
Andrew Bloomgarden dc77360d66 Fix seed file
It needs to configure nconf so it can start and disconnect from mongo so it can
end.
2013-12-30 23:44:24 -08:00
Tyler Renelle 3aa64a2923 Merge pull request #2194 from katfang/develop
Minor Text Update to Class Tour
2013-12-30 15:48:03 -08:00
Sabe Jones 85657f40d3 Fix placement of "Restore Streak" caption on Firefox 2013-12-30 17:25:13 -06:00
katfang 7205221b86 Minor Text Update to Class Tour
Spells now happen at level 11 rather than 6.

Reflects change from https://github.com/HabitRPG/habitrpg/issues/2096
2013-12-30 17:26:44 -05: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
Tyler Renelle 39396afba8 Merge pull request #2177 from HabitRPG/sabe/tweak
RPG demystification, cont'd
2013-12-30 08:42:19 -08:00
Tyler Renelle 96b3c2b7f5 Merge pull request #2185 from HabitRPG/sabe/tweak2
Remove extraneous techy characters from chat notifications
2013-12-30 08:32:58 -08:00
Sabe Jones 9a32cfd7e1 Remove extraneous techy characters from boss fight and spellcasting chat notifications 2013-12-30 08:46:40 -06:00
Sabe Jones 2aa1e91b8a Merge pull request #2175 from HabitRPG/sabe/tweak2
Put ignores in .nodemonignore as well
2013-12-30 05:40:06 -08:00
Sabe Jones 199a74d8a9 Fix #2181 (allocated points showing up in Class Equip Bonus) 2013-12-30 07:33:17 -06:00
Matteo Pagliazzi c7e93f7793 remove console.log 2013-12-30 12:28:30 +01:00
Matteo Pagliazzi 34319bdcd3 improved multiple files translations 2013-12-30 12:23:23 +01:00
Matteo Pagliazzi cb07bc9229 allow multiple files for translations 2013-12-30 12:16:42 +01:00
Sabe Jones c3aed6fb28 RPG demystification, cont'd 2013-12-29 20:58:35 -06:00
Sabe Jones 9cdf567872 Put ignores in .nodemonignore as well 2013-12-29 19:22:37 -06:00
Tyler Renelle 6299415d6e Merge pull request #2173 from HabitRPG/sabe/tweak2
Add .idea and .git to nodemon ignore list
2013-12-29 17:19:50 -08:00
Sabe Jones 1036f0549e Add .idea and .git to nodemon ignore list, to reduce unnecessary server bounces during dev 2013-12-29 19:11:32 -06:00
Tyler Renelle 50d241e2c8 #2083 add list-item notes at top-level element 2013-12-29 17:34:21 -07:00
Tyler Renelle 61dfb8d129 Merge pull request #2086 from HabitRPG/sabe/tweak2
Remove sliding effect on avatar mouseover
2013-12-29 16:19:09 -08:00
Tyler Renelle 2f4fd2faca fix #2163 add stats.maxMP in GET /api/v2/user. @russtaylor let me know
if you need it in other locations
2013-12-29 17:13:39 -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
Tyler Renelle be4e29faba Merge pull request #2162 from HabitRPG/sabe/tweak3
Some work on demystification of RPG elements
2013-12-29 11:12:52 -08:00