Commit graph

10481 commits

Author SHA1 Message Date
Sabe Jones
12b0361d45 WIP(warning-modal): Low health warning 2015-08-18 16:05:48 -04:00
Sabe Jones
120550666d refactor(avatar): DRY out paperdolls 2015-08-18 13:07:27 -04:00
Blade Barringer
be87f69cd4 Actually save copy message modal spec 2015-08-18 08:10:38 -05:00
Blade Barringer
fe22f76e30 Move copy message modal controller spec to own file 2015-08-18 08:06:46 -05:00
Blade Barringer
3f48364a4a Move autocomplete controller to own file 2015-08-18 08:05:56 -05:00
Blade Barringer
a032c80aaf Move chat controller to own spec file 2015-08-18 08:05:35 -05:00
Blade Barringer
a749e2d9f7 Move party controller to own spec 2015-08-18 08:04:17 -05:00
Alys
aea8c3e5f6 Merge pull request #5806 from Gbear605/develop
Update information about max levels for buffs.
2015-08-18 09:02:03 +10:00
Garrison Taylor
94a31985b7 Update information about max levels for buffs. 2015-08-17 11:34:30 -05:00
Blade Barringer
f9e337ed40 Merge pull request #5796 from GitHubSphinx/Sphinx-i18n-db1
Change 2 locale strings to exclude html character codes not shown on the front page
2015-08-16 07:31:09 -05:00
GihHubSphinx
a1f8035515 Change 2 strings to exclude html character codes
exclude mldr and rsquo character codes not shown correctly on the front
page
2015-08-16 14:17:26 +05:00
GihHubSphinx
0a0d41510e Revert "Enable html rendering for 2 locale strings"
This reverts commit a2108bbb51.
2015-08-16 14:08:58 +05:00
Alys
8e667b1019 delete an outdated favicon.ico file - partial fix for https://github.com/HabitRPG/habitrpg/issues/5464 2015-08-16 14:35:38 +10:00
GihHubSphinx
a2108bbb51 Enable html rendering for 2 locale strings
Strings dreimQuote and teamSample3 on the front page contain symbol
codes `…` and `’` which are not shown correctly

Closes #5571
2015-08-16 00:50:43 +05:00
Matteo Pagliazzi
7d59e1e039 start server using just node, not nodemon 2015-08-15 18:23:29 +02:00
Alys
8c186f3068 add close button audio menu on mobile web view - fixes https://github.com/HabitRPG/habitrpg/issues/5359 2015-08-15 15:21:17 +10:00
Blade Barringer
25d52bccc5 Use new newUser specHelper syntax 2015-08-15 00:08:41 -05:00
Blade Barringer
53133c6439 Adjust newUser spec helper 2015-08-14 23:55:36 -05:00
Blade Barringer
426acf44c8 Wrap task analytics in if statement 2015-08-14 23:43:47 -05:00
Blade Barringer
c10a0ad31a Add habits 2015-08-14 23:43:32 -05:00
Blade Barringer
a040acf739 Compile sprites 2015-08-14 23:26:50 -05:00
Blade Barringer
f6dbea008a Merge pull request #5792 from Alys/deleteDefaultDaily
remove unused default tasks
2015-08-14 23:23:54 -05:00
Alys
7f0889f405 remove commented-out default task code and unused default task locale strings - fixes https://github.com/HabitRPG/habitrpg/issues/5631#issuecomment-130619901 (comment by GitHubSphinx) 2015-08-15 13:23:42 +10:00
Blade Barringer
9e47bc3f4c Merge branch 'GitHubSphinx-Sphinx-i18n-db1' into develop 2015-08-14 20:11:37 -05:00
Blade Barringer
2821e25451 Reinstate the string interpolation 2015-08-14 18:04:04 -05:00
Blade Barringer
f0e3360c35 chore(i18n): update locales 2015-08-14 17:52:37 -05:00
Blade Barringer
28dda9ae9e Fix string interpolation 2015-08-14 17:49:51 -05:00
Blade Barringer
80a6b2dcf9 Merge branch 'develop' into card_tweaks 2015-08-14 17:29:17 -05:00
Matteo Pagliazzi
a58c3d1e8b Merge pull request #5789 from HabitRPG/paglias/loading-times
Stringify into window.env only what is used on the client
2015-08-14 22:14:54 +02:00
Matteo Pagliazzi
b31966b1ee use assign in place of merge, make sure references to tavern and mods are not lost 2015-08-14 22:02:19 +02:00
Matteo Pagliazzi
2e1b046701 add TODO comments, send mods to client as they are used there 2015-08-14 21:05:04 +02:00
Matteo Pagliazzi
f896fdf16f use only client vars on index.jade 2015-08-14 20:58:57 +02:00
Matteo Pagliazzi
3cda8b0b56 remove newrelic javascript from client 2015-08-14 20:40:51 +02:00
Matteo Pagliazzi
1840c3907b fix avatar export page 2015-08-14 15:37:04 +02:00
Matteo Pagliazzi
dc4c6fa6e7 add TODO commit about logging errors catched when party invite code is invalid 2015-08-14 15:21:17 +02:00
Blade Barringer
59d4d9706a Remove quotes from card strings 2015-08-14 08:13:25 -05:00
Blade Barringer
80ba33bf7c Fix issue where card strings required quotes 2015-08-14 08:13:05 -05:00
Matteo Pagliazzi
289d288f38 fix typo 2015-08-14 15:02:46 +02:00
Matteo Pagliazzi
d3c78bb890 revert dataexport controller changes 2015-08-14 15:02:16 +02:00
Matteo Pagliazzi
e1620bad2b stringify into window.env only what we really need, save a lot of KBs 2015-08-14 14:53:17 +02:00
Blade Barringer
998e336818 Remove extraneous white space 2015-08-14 07:40:07 -05:00
Blade Barringer
6be339fc77 Fix bug where armoire notes would not display correctly 2015-08-14 06:59:23 -05:00
Blade Barringer
576688c15b Clean up content file 2015-08-14 06:41:10 -05:00
Matteo Pagliazzi
34dd4494ec in locals middleware require tavern and mods only once 2015-08-14 13:10:53 +02:00
Matteo Pagliazzi
fbeeb18923 Merge pull request #5788 from HabitRPG/paglias/loading-times
Refactor middlewares
2015-08-14 12:53:02 +02:00
Matteo Pagliazzi
ca457df36a fix typo catatories -> categories 2015-08-14 12:23:10 +02:00
Matteo Pagliazzi
491652d712 fix several typypos and a missing dep 2015-08-14 12:00:09 +02:00
Matteo Pagliazzi
47f6f2febe refactor middlewares in their own folder, move buildFiles to libs/buildFiles 2015-08-14 11:50:09 +02:00
Matteo Pagliazzi
078ea4768a upgrade jade version 2015-08-14 10:58:19 +02:00
Sabe Jones
ab91a6fba9 Merge pull request #5781 from HabitRPG/sabrecat/greeting-cards
Greeting and Thank-You Cards
2015-08-13 22:35:25 -05:00