Commit Graph

1564 Commits

Author SHA1 Message Date
Matteo Pagliazzi 52decb7ede fix(translations): @lefnire now everything is ok 2014-01-20 17:51:43 +01:00
Matteo Pagliazzi fba739535b fix(translations): correct some variables 2014-01-20 17:25:14 +01:00
Matteo Pagliazzi d000c70679 fix(translations): revert some views 2014-01-20 17:08:27 +01:00
Matteo Pagliazzi f85117a422 Merge pull request #2486 from luveluen/develop
jade->json
2014-01-20 07:56:54 -08:00
Luveluen ffff867ba3 Update stable.jade 2014-01-20 16:20:06 +01:00
Luveluen 462f11e48c Update inventory.jade 2014-01-20 16:08:37 +01:00
Luveluen c37512baa6 Update index.jade 2014-01-20 14:41:51 +01:00
Luveluen 68041f206c Update settings.jade 2014-01-19 22:02:55 +01:00
Luveluen 87d528ce50 Update profile.jade
fullname -> fullName
2014-01-19 21:46:57 +01:00
Luveluen bfebb61520 Update profile.jade 2014-01-19 21:40:41 +01:00
Paul Sainsbury 66582b2d05 Added FAQ and Tutorials links, linking the Vimeo Tutorial and Wiki FAQ 2014-01-19 22:24:54 +02:00
Luveluen 46e29e8999 Update settings.jade 2014-01-19 21:16:52 +01:00
Luveluen 4e5323ea2f Update settings.jade 2014-01-19 21:10:18 +01:00
Luveluen b48c584f43 Update settings.jade 2014-01-19 21:05:41 +01:00
Luveluen 1f0d91e9c6 Update profile.jade 2014-01-19 21:04:03 +01:00
Luveluen b9bafc304e Update settings.jade 2014-01-19 21:03:01 +01:00
Luveluen 00cb57deb6 Update settings.jade 2014-01-19 21:00:11 +01:00
Luveluen d87a3caae7 Update profile.jade 2014-01-19 20:50:31 +01:00
Luveluen f748d89fdc Update profile.jade 2014-01-19 20:11:03 +01:00
Luveluen e8647c7cbc Update profile.jade 2014-01-19 20:05:48 +01:00
Luveluen 745fdeb34f Update profile.jade 2014-01-19 19:59:35 +01:00
Luveluen 21de0b7e74 Update settings.jade 2014-01-19 19:58:04 +01:00
Luveluen 805299a34c Update profile.jade 2014-01-19 19:55:52 +01:00
Luveluen b8e18594e9 Update index.jade 2014-01-19 19:50:26 +01:00
Luveluen 6dd0e48887 Update settings.jade 2014-01-19 18:56:39 +01:00
Luveluen 6f19cdaf6c Update profile.jade 2014-01-19 18:27:48 +01:00
Luveluen 47085de1e1 Update index.jade 2014-01-19 17:29:53 +01:00
Tyler Renelle a1df41ad81 fix(spells): <ESC> to cancel spell-casting 2014-01-18 14:15:45 -07:00
Sabe Jones c1fa5a79ab Fix #2438
Bosses damage you for party members' misses, not your own undone Dailies, while you're in the Inn.
2014-01-16 21:09:15 -06:00
Tyler Renelle e6dc715de6 Merge pull request #2396 from aughr/andrew/consolidate_tests
Convert API tests to normal JS
2014-01-16 15:19:21 -08:00
Tyler Renelle 90176444e9 feat(bailey) notif about STWC updates + scroll-purchase deadlines (@colegleason) 2014-01-16 12:47:55 -07:00
Tyler Renelle 41233c7b16 feat(challenges) markdown in challenge-descriptions 2014-01-16 12:28:28 -07:00
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