Commit Graph

1532 Commits

Author SHA1 Message Date
Andrew Bloomgarden 77801e458e Change static module name to habitrpgStatic.
The way the tests are written now, the habitrpg module definition in static.js
was clobbering the one in app.js. In other words, most of the tests weren't
testing what they thought they were testing.
2014-01-15 21:33:57 -08: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 cdcf130b6f Merge pull request #2360 from colegleason/qr-code
Made QR code valid JSON. Fixes #2354
2014-01-15 15:45:24 -08:00
Tyler Renelle 0ce10ef339 Merge pull request #2352 from colegleason/quest-scroll
Allow users to purchase quest scrolls even if they haven't finished the previous quest
2014-01-15 15:39:59 -08:00
Tyler Renelle e66fdd80ef feat(perfect-day achievement) 2014-01-15 16:24:23 -07:00
Tyler Renelle 9db6dd9233 Merge pull request #2412 from Aiseant/patch-1
Update tavern.jade
2014-01-15 09:43:03 -08: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
Aiseant e9715f36b8 Update tavern.jade
Add infos about resting while on Boss quest
2014-01-15 11:37:02 +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
Tyler Renelle daeb846ffb profile.jade use some jade magic to compactify the code 2014-01-13 22:15:32 -07: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
Cole Gleason 7baf0ee7a1 Made QR code valid JSON. Fixes #2354 2014-01-11 04:19:18 -06:00
Cole Gleason 58803773d2 Allow users to purchase quest scrolls even if they haven't finished the previous quest 2014-01-10 15:43:44 -06:00
Bob Steffes fcf1788357 Update Tavern.jade
I changed the name of wiki forum so it didn't display as "LFG Board board" which broke the link.
2014-01-10 08:48:14 -08:00
Tyler Renelle 36d32d6b16 update forum & lfg links 2014-01-09 20:48:36 -07:00
snicker 8f3e47079c fixes #2316, challenge icon getting wackified 2014-01-09 16:26:07 -08:00
Sabe Jones 27e9dfa0d5 Finish up @wc8 suggested user preferences: tags and Advanced Options start collapsed 2014-01-08 22:19:38 -06:00
Sabe Jones 111651da1e Fix tier labels no longer providing info on click 2014-01-08 18:49:53 -06:00
Brandon McPhail 77278bcffc Fixed issue where only the first markdown link in a message would open in a new tab. Now all do. 2014-01-08 15:33:36 -08:00
Tyler Renelle 24b2094f35 Merge pull request #2300 from HabitRPG/sabe/tweak
More UI demystification
2014-01-08 14:34:09 -08:00
Tyler Renelle 11dbda6f8c Merge pull request #2298 from HabitRPG/sabe/preferences
New user preference: open new tasks in edit mode
2014-01-08 14:29:57 -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
Tyler Renelle 5501969262 Merge pull request #2255 from colegleason/leave-guild-challenges
When a user leaves a group, remove them from all group challenges
2014-01-07 19:57:39 -08:00
Sabe Jones 089ea05cf4 Readability tweak: sentence case for options not on buttons 2014-01-07 20:20:05 -06:00
Sabe Jones 9c545add5e New user preference: open new tasks in edit mode 2014-01-07 20:14:57 -06:00
Brandon McPhail 07d4fc1184 Fixed UI issues when editing checklists 2014-01-07 11:55:41 -08:00
Tyler Renelle 833d597bfe fix #2284 remove unecessary chat-message scrollbars 2014-01-07 11:27:29 -07: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