Commit Graph

9132 Commits

Author SHA1 Message Date
NotGonnaGitUs fef2c834c9 Used this of parent in hopes of getting correct challenge id 2015-05-04 18:27:43 +05:30
NotGonnaGitUs 168d72fb0a Removed a function call in hopes of correct updation of challenge variable 2015-05-04 18:16:02 +05:30
NotGonnaGitUs 079df668ce Changed test to fix reference errors. 2015-05-04 17:59:12 +05:30
NotGonnaGitUs b360acd072 Fixed callback error in challenge creation test. 2015-05-04 17:49:07 +05:30
NotGonnaGitUs f46a7eb1ba Changed creation test to use variables so that deletion test can run. 2015-05-04 17:19:54 +05:30
NotGonnaGitUs 8c562e8e18 Added test for challenge deletion. 2015-05-04 17:06:34 +05:30
NotGonnaGitUs 13415ecf03 Modified test to exclude finding challenge later and find user again. 2015-05-04 16:49:04 +05:30
NotGonnaGitUs fafb102530 Is it async causing test to fail? Trying to make waterfall work. 2015-05-04 16:36:20 +05:30
NotGonnaGitUs d69f217d24 Fixed typo. 2015-05-04 16:25:23 +05:30
NotGonnaGitUs bb121df881 Fixed indentation error. 2015-05-04 16:17:56 +05:30
NotGonnaGitUs 8fae71d7ef Updated test to see if it works 2015-05-04 16:07:16 +05:30
NotGonnaGitUs 19c2ae415f Trying out new test to check user balance after creating a challenge with prize. 2015-05-04 15:35:45 +05:30
NotGonnaGitUs 4085ed5b15 Comment commit to test travis-ci 2015-05-04 03:56:28 +05:30
NotGonnaGitUs c18fbb79ed Separated the deletion of the challenge to its own function in the async.waterfall 2015-05-04 03:43:30 +05:30
NotGonnaGitUs 46cb0240c3 Gems are now refunded to challenge leader on deletion. Needs better description in "broken" field. 2015-05-04 02:33:59 +05:30
Matteo Pagliazzi 0454938303 chore(i18n): update locales 2015-05-03 21:24:53 +02:00
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