Commit Graph

81 Commits

Author SHA1 Message Date
Marcelo Sizer 44d9ea2a15 i18n(interpolation): Add string interpolation 2014-01-30 18:25:25 -02:00
Tyler Renelle 86220f3e0e Merge pull request #2319 from HabitRPG/sabe/preferences
Finish up @wc8 suggested user preferences: tags and Advanced Options
2014-01-15 21:04:05 -08:00
Sabe Jones 5521dd0bb1 UI fixes: Firefox display and checkbox issues, task attributes appearing with auto-allocate off 2014-01-14 21:07:46 -06:00
Matteo Pagliazzi 6ca81f5b31 fix some translations in jade views @Sinza- 2014-01-14 18:32:40 +01:00
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
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 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
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
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
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 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 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 5538bcc6a9 Advanced Options default to being shown 2013-12-30 08:57:41 -06:00
Tyler Renelle 50d241e2c8 #2083 add list-item notes at top-level element 2013-12-29 17:34:21 -07:00
Tyler Renelle e9cb9b8a9f task-icons: larger emoji in task text than chat 2013-12-29 01:24:02 -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
Tyler Renelle ee3e7c2032 [#1990] Spelling updates 2013-12-16 16:28:46 -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 c85450db04 classes: add task attributes for point allocations 2013-12-13 17:50:43 -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 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 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