Commit graph

344 commits

Author SHA1 Message Date
Tyler Renelle
90176444e9 feat(bailey) notif about STWC updates + scroll-purchase deadlines (@colegleason) 2014-01-16 12:47:55 -07:00
Tyler Renelle
518f200a8f fix(#2375) merge in @SabreCat's stats.jade changes "More elegant
show/hide setup for attribute bonuses"
2014-01-15 22:15:26 -07: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
Tyler Renelle
003e214080 #2384 add alert on paypal taking a long time to clear 2014-01-15 19:45:07 -07:00
Tyler Renelle
b52ea3f495 Merge pull request #2403 from HabitRPG/sabe/fix
Misc UI fixes
2014-01-15 16:24:03 -08:00
Tyler Renelle
e66fdd80ef feat(perfect-day achievement) 2014-01-15 16:24:23 -07:00
Matteo Pagliazzi
2e12ffefc6 revert previous change 2014-01-15 16:56:40 +01:00
Matteo Pagliazzi
178086ef30 fix some translation strings 2014-01-15 16:54:37 +01: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
Tyler Renelle
128d68f544 show warning that completed to-dos are cleared after 3 days 2014-01-14 17:29:05 -07:00
Matteo Pagliazzi
6b5366b246 Merge pull request #2364 from Sinza-/develop
Replace hard-coded strings for env.t on views/shared/profiles folder.
2014-01-14 11:21:31 -08:00
Marcelo Sizer
6cc7d73683 Replace old stats.jade file 2014-01-14 17:06:16 -02:00
Marcelo Sizer
1b1c646e24 Replace old code 2014-01-14 16:22:14 -02:00
Marcelo Sizer
e7307681d3 Replace old code 2014-01-14 16:19:37 -02:00
Marcelo Sizer
20277e623e Add @paglias suggested fixes 2014-01-14 16:16:40 -02:00
Marcelo Sizer
f40b8c6e64 Fix indentation 2014-01-14 16:01:53 -02:00
Marcelo Sizer
556118c1f0 Add @paglias suggested fixes 2014-01-14 15:57:55 -02:00
Matteo Pagliazzi
4e2005732c translate some views 2014-01-14 18:50:06 +01:00
Matteo Pagliazzi
6ca81f5b31 fix some translations in jade views @Sinza- 2014-01-14 18:32:40 +01:00
Marcelo Sizer
8a8d3f17ca Fix typo 2014-01-11 16:16:02 -02:00
Marcelo Sizer
8188f173bc Replace hard-coded strings for env.t on views/shared/profiles folder. 2014-01-11 16:11:45 -02:00
Tyler Renelle
5583f5fb23 Merge pull request #2363 from Sinza-/develop
Fix challenge completed not displaying text when someone wins a challenge.
2014-01-11 10:11:33 -08: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
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