Marcelo Sizer
8188f173bc
Replace hard-coded strings for env.t on views/shared/profiles folder.
2014-01-11 16:11:45 -02: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
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