Commit graph

4132 commits

Author SHA1 Message Date
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
1a2db28648 Merge pull request #2395 from HabitRPG/sabe/tweak2
Tweak to boss victory text
2014-01-15 15:42:45 -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
Matteo Pagliazzi
263a752abf add mocha tests to travis, remove makefile 2014-01-15 20:11:29 +01: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
Tyler Renelle
951872d116 Merge pull request #2406 from HabitRPG/sabe/tweak3
Create drop notification Growl style
2014-01-14 21:12:44 -08:00
Sabe Jones
6e821fa681 Create drop notification Growl style 2014-01-14 22:02:22 -06: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
6536b855c9 instead of clearing completed on cron, simply hide them from the angular
apps (which only use batch-update API route) @colegleason
2014-01-14 18:03:16 -07:00
Tyler Renelle
128d68f544 show warning that completed to-dos are cleared after 3 days 2014-01-14 17:29:05 -07:00
Tyler Renelle
506d22e935 add migration for tasks.created 2014-01-14 17:28:50 -07:00
Tyler Renelle
b96ce1d07f add created (creation-date) to TaskSchema 2014-01-14 16:46:16 -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
9916665331 Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop 2014-01-14 18:33:12 +01:00
Matteo Pagliazzi
6ca81f5b31 fix some translations in jade views @Sinza- 2014-01-14 18:32:40 +01:00
Tyler Renelle
3701003baf add GET /api/v2/groups/{gid}/chat route (query) 2014-01-14 09:21:51 -07:00
Tyler Renelle
23d4cba3d3 start moving some directives to habitrpg-shared so mobile can use them,
starting with markdown directive
2014-01-13 22:15:32 -07:00
Tyler Renelle
daeb846ffb profile.jade use some jade magic to compactify the code 2014-01-13 22:15:32 -07:00
Sabe Jones
13ebcd6528 Tweak to boss victory text 2014-01-13 22:33:01 -06:00
Dušan Juretić
74495bb690 Fix tag creation test 2014-01-13 23:20:33 -03:00
Dušan Juretić
f7f9bb1131 Fix memberServices test 2014-01-13 23:09:11 -03: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
Tyler Renelle
4884d342b6 Merge pull request #2350 from bobbyroberts99/patch-1
Fix link to wiki LFG board
2014-01-10 09:24:27 -08: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
Tyler Renelle
af0b1d0550 CDS: set min/max on preferences.dayStart 2014-01-09 11:22:25 -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
9cd947627c correct missing gems 2014-01-08 18:35:45 -07:00