Blade Barringer
b408f016fd
Merge pull request #5119 from NotGonnaGitUs/develop
...
Made front page translatable
2015-05-03 09:43:43 -05:00
Blade Barringer
62f7eae5d5
Fixes #5132
2015-05-03 09:01:12 -05:00
Blade Barringer
e09d4f3a91
Commented out new dailies behavior
2015-05-03 08:21:29 -05:00
NotGonnaGitUs
4d5ec83234
Removed objects not used anywhere by env.t function.
2015-05-03 14:33:46 +05:30
Blade Barringer
68aedda3bb
Merge branch 'develop' into hairlessbear-cron_dailies_fix
2015-05-02 22:10:58 -05:00
Blade Barringer
c81d321366
Checklists should reset even when resting in the inn
2015-05-02 22:10:26 -05:00
NotGonnaGitUs
0fc068ea93
Removed objects not used by front.jade, footer.jade or login-modale.jade
2015-05-02 20:02:20 +05:30
Blade Barringer
cad47dc2c0
Fixes #5123
2015-05-02 09:28:55 -05:00
Blade Barringer
ace1d2a9e2
Update sprites with shading - @lemoness
2015-05-02 09:26:11 -05:00
NotGonnaGitUs
21f470cd5a
Removed objects not used front.jade or shared/footer.jade
2015-05-02 17:42:38 +05:30
NotGonnaGitUs
9e88a55d54
Removed objects not used by front.jade.
2015-05-02 17:12:46 +05:30
Matteo Pagliazzi
72f8c60ccf
chore(i18n): update locales
2015-05-02 11:43:38 +02:00
Sabe Jones
08e6758345
Merge pull request #5121 from SabreCat/develop
...
Conclude Spring Fling
2015-05-01 19:29:33 -05:00
Sabe Jones
74877f0653
chore(grunt): compile sprites
2015-05-01 19:22:09 -05:00
Sabe Jones
6685e93554
fix(Spring): WHO IS LESLIE
2015-05-01 19:19:23 -05:00
Sabe Jones
d50d4ad8bb
feat(Spring): Flung
2015-05-01 19:09:28 -05:00
Blade Barringer
e334ce7684
Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop
2015-05-01 12:36:07 -05:00
Blade Barringer
954f9baeec
chore(bailey) - skills rebalancing
2015-05-01 12:29:59 -05:00
NotGonnaGitUs
124df58644
Made front page translatable.
2015-05-01 21:18:25 +05:30
NotGonnaGitUs
02e7b52fbf
Adding environment variables to the static front page for translation. - Halfway done.
2015-05-01 20:14:19 +05:30
Blade Barringer
267f4f0225
Merge pull request #5117 from no1mzb/develop
...
Adjust error messages on home page to prompt user to use facebook login
2015-05-01 08:00:22 -05:00
sablecliff
8c0ecbd61e
Edit from /string/ format to "string" format so that login test passes.
2015-05-01 13:29:40 +10:00
sablecliff
2c65e4df6a
Updated the login test to match the new error message
2015-05-01 13:21:12 +10:00
sablecliff
e3570e609b
Fixes Issue #5103
...
Altered the error messages that are part of the login and forgotten password processes.
These messages now remind the the user that they may have created an account through facebook.
2015-05-01 13:01:29 +10:00
Blade Barringer
9b22ac68da
Merge pull request #5116 from HabitRPG/rebalancing-2015-03
...
Skills rebalancing
2015-04-30 21:10:31 -05:00
Sabe Jones
43936da8ef
Merge pull request #5113 from SabreCat/develop
...
Spring Fling warning
2015-04-30 17:41:23 -05:00
Sabe Jones
b6955db39c
chore(news): Spring Fling warning
2015-04-30 17:23:26 -05:00
Blade Barringer
0d18738ceb
Correct phrasing of test
2015-04-29 08:47:47 -05:00
Blade Barringer
78249122f7
Ignore casing when searching for user name in autocomplete
2015-04-29 08:21:13 -05:00
Blade Barringer
41763d3b78
Add missing semi-colons
2015-04-29 08:05:08 -05:00
Blade Barringer
39930ecc29
Add mocha to .jshintrc
2015-04-29 08:04:53 -05:00
Blade Barringer
3a12b5644c
Remove out of date comments
2015-04-29 07:57:54 -05:00
Blade Barringer
6e35c45d5f
Merge branch 'develop' of github.com:HabitRPG/habitrpg into joyclark-autocomplete_unit_tests
2015-04-29 07:50:33 -05:00
Joy Clark
df1c349ea7
Fixing #5706 filtering system messages results in errors.
2015-04-27 23:01:15 +02:00
Joy Clark
df91592438
fixing unit tests
2015-04-27 22:55:22 +02:00
Joy Clark
61c9d35215
Merge branch 'chat_match_users' into autocomplete_unit_tests
2015-04-27 22:50:30 +02:00
Matteo Pagliazzi
8dcbf75300
chore(i18n): update locales
2015-04-27 21:05:45 +02:00
hairlessbear
2d9707bd39
Added dailies[0].history check and changed array check to' empty'
2015-04-27 13:41:58 -04:00
hairlessbear
7ac2c0c0c4
Made test name more descriptive and added HP expects
2015-04-27 10:49:57 -04:00
hairlessbear
5693386b12
Fixed tests
2015-04-27 00:42:55 -04:00
hairlessbear
4b980c78a1
Made tests more descriptive
2015-04-26 22:49:05 -04:00
Blade Barringer
e8da13b9be
Merge branch 'joyclark-chat_match_users' into develop
2015-04-26 20:43:55 -05:00
Blade Barringer
a94aad7a22
Fix comment
2015-04-26 20:43:32 -05:00
Blade Barringer
dcd4be71ba
Merge pull request #5095 from hairlessbear/settings_button_name_change
...
Changed button title to match dropdown settings menu titles
2015-04-26 19:32:58 -05:00
hairlessbear
2f33fe6e38
Changed button title to match menu titles
2015-04-26 19:53:35 -04:00
hairlessbear
53ff109680
Added tests for Inn functionality
2015-04-26 19:07:11 -04:00
Joy Clark
f181787e8b
added some unit tests to test the autocomplete controller
2015-04-26 21:38:46 +02:00
Joy Clark
f214428411
Improved filter function as described in #5085 and added unit tests.
2015-04-26 17:50:53 +02:00
Alys
ffcb765b7f
change skill descriptions to new ones provided by Lemoness at https://github.com/HabitRPG/habitrpg/issues/3029#issuecomment-96103553
2015-04-26 16:58:09 +10:00
Alys
983d2eb2be
Merge remote-tracking branch 'upstream/develop' into rebalancing-2015-03
2015-04-26 16:38:17 +10:00