Commit Graph

1473 Commits

Author SHA1 Message Date
Sabe Jones 459af67fcd Fix #2277: make Automatic Allocation checkbox set "task activity" mode 2014-01-06 21:20:54 -06: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
Tyler Renelle bc8da096f4 chat: a few view cleanups 2014-01-05 22:17:21 -07:00
Tyler Renelle f6e6d115ac chat: add +1 (like) to messages. @snicker does views/options/social/chat-message.jade flag you for any performance issues which should be optimized with bindonce? (I'm still a bit of a bo-noob) 2014-01-05 22:12:02 -07:00
Tyler Renelle 95516f709c hall: one white star for GMs (yeah, GMs are admins). remove sleepy-eye. @sabrecat 2014-01-05 21:04:56 -07:00
Tyler Renelle 5ccd8c4b85 hall: fixed load-more, sort contribs by lvl 2014-01-05 19:58:19 -07:00
Tyler Renelle eb5a9150ab hall: use infinite-scroll to load patrons, since there are so many 2014-01-05 19:51:33 -07:00
Tyler Renelle a5db8628e2 hall: start moving admin stuff to hall-of-heroes / hall-of-patrons, so everyone can see contribs / backers 2014-01-05 19:19:34 -07:00
Tyler Renelle eeaeb5c006 Merge remote-tracking branch 'DanielHeath/develop' into develop
Conflicts:
	views/static/front.jade
2014-01-05 16:37:05 -07: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 c9e083b602 challenges: add "official habitrpg challenge" option 2014-01-03 13:36:13 -07:00
Tyler Renelle 45b543c1ed challenges: don't disable notes field when challenge-task 2014-01-03 13:14:56 -07:00
Tyler Renelle e6e922d00a add note to custom-day-start property, warning users against using it (@wc8) 2014-01-02 17:16:55 -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
Tyler Renelle 9b56899d0f #2217 add note about base-url for api routes 2014-01-01 22:47:38 -07:00
Tyler Renelle 580279eeda #2217 apiv2 update documentation 2014-01-01 22:26:59 -07:00
Tyler Renelle 548d4f5b78 #2217 swagger-ui: allow authentication for interacting with routes 2014-01-01 21:09:01 -07:00
Tyler Renelle a2b30dcb1a #2217 merge apiv2 route definitions with swagger decorations 2014-01-01 20:21:46 -07:00
Tyler Renelle 98361ea94f #2217 add note about API-docs being a WIP 2014-01-01 16:37:03 -07:00
Tyler Renelle 0edcfac46b #2217 start adding APIv2 generated documentation via swagger-node-express 2014-01-01 15:33:37 -07:00
Sabe Jones a9e57a8adf Merge branch 'develop' into sabe/attributes 2014-01-01 12:42:53 -06:00
Tyler Renelle 0f3202f964 #2200 change-password is showing for facebook-registered users for some reason 2013-12-31 20:00:15 -07:00
Daniel Heath 0ecc013a00 Allow lastpass users to autofill their credentials 2014-01-01 13:52:12 +11: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