02e7b52fbf
Adding environment variables to the static front page for translation. - Halfway done.
2015-05-01 20:14:19 +05:30
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
c3b09d8cce
test 2nd argument for openModal
2015-05-01 13:55:33 +02:00
8c0ecbd61e
Edit from /string/ format to "string" format so that login test passes.
2015-05-01 13:29:40 +10:00
2c65e4df6a
Updated the login test to match the new error message
2015-05-01 13:21:12 +10:00
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
9b22ac68da
Merge pull request #5116 from HabitRPG/rebalancing-2015-03
...
Skills rebalancing
2015-04-30 21:10:31 -05:00
43936da8ef
Merge pull request #5113 from SabreCat/develop
...
Spring Fling warning
2015-04-30 17:41:23 -05:00
b6955db39c
chore(news): Spring Fling warning
2015-04-30 17:23:26 -05:00
fbc1a9ae86
Add two unit tests for copyToDo PR
2015-04-30 08:53:14 -05:00
e4b21ac325
Merge branch 'develop' of github.com:HabitRPG/habitrpg into negue-copyMessageTodo
2015-04-29 17:19:24 -05:00
0d18738ceb
Correct phrasing of test
2015-04-29 08:47:47 -05:00
78249122f7
Ignore casing when searching for user name in autocomplete
2015-04-29 08:21:13 -05:00
41763d3b78
Add missing semi-colons
2015-04-29 08:05:08 -05:00
39930ecc29
Add mocha to .jshintrc
2015-04-29 08:04:53 -05:00
3a12b5644c
Remove out of date comments
2015-04-29 07:57:54 -05:00
6e35c45d5f
Merge branch 'develop' of github.com:HabitRPG/habitrpg into joyclark-autocomplete_unit_tests
2015-04-29 07:50:33 -05:00
02781d1f33
remove markModified in addPushDevice
2015-04-28 19:55:01 +02:00
df1c349ea7
Fixing #5706 filtering system messages results in errors.
2015-04-27 23:01:15 +02:00
df91592438
fixing unit tests
2015-04-27 22:55:22 +02:00
61c9d35215
Merge branch 'chat_match_users' into autocomplete_unit_tests
2015-04-27 22:50:30 +02:00
8dcbf75300
chore(i18n): update locales
2015-04-27 21:05:45 +02:00
189423b0db
markdown preview - code "inherit white-space" / hide links for 'system'
2015-04-27 19:47:42 +02:00
2d9707bd39
Added dailies[0].history check and changed array check to' empty'
2015-04-27 13:41:58 -04:00
75579a7c36
add previewMarkdown / click as popover-trigger / misc changes
2015-04-27 19:23:56 +02:00
b23e901780
Merge branch 'develop' into pushNotifications2
2015-04-27 17:20:25 +02:00
7ac2c0c0c4
Made test name more descriptive and added HP expects
2015-04-27 10:49:57 -04:00
5693386b12
Fixed tests
2015-04-27 00:42:55 -04:00
4b980c78a1
Made tests more descriptive
2015-04-26 22:49:05 -04:00
e8da13b9be
Merge branch 'joyclark-chat_match_users' into develop
2015-04-26 20:43:55 -05:00
a94aad7a22
Fix comment
2015-04-26 20:43:32 -05:00
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
2f33fe6e38
Changed button title to match menu titles
2015-04-26 19:53:35 -04:00
53ff109680
Added tests for Inn functionality
2015-04-26 19:07:11 -04:00
f181787e8b
added some unit tests to test the autocomplete controller
2015-04-26 21:38:46 +02:00
f214428411
Improved filter function as described in #5085 and added unit tests.
2015-04-26 17:50:53 +02:00
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
983d2eb2be
Merge remote-tracking branch 'upstream/develop' into rebalancing-2015-03
2015-04-26 16:38:17 +10:00
c324ea3e03
Merge branch 'hairlessbear-hide_challenge_achievement' into develop
2015-04-25 22:15:37 -05:00
5cde0495a8
Add parenthesis back in so boolean will render correctly
2015-04-25 22:15:04 -05:00
7494cb1438
Make gem popover consistent with gold and silver. Closes #5088
2015-04-25 21:53:00 -05:00
831af01db6
Made fixes suggested by crookedneighbor
2015-04-25 22:38:16 -04:00
4d8310296b
Added another one-time binding
2015-04-25 22:14:16 -04:00
2d748e22e6
Removed unnecessary one-time bindings
2015-04-25 22:05:19 -04:00
4f340940ed
Added another one time binding
2015-04-25 21:10:14 -04:00
732ad1ef07
Fixed broken indentation
2015-04-25 20:24:50 -04:00
0b71c16966
Changed a bunch of ng-show to ng-if and added one-time bindings
2015-04-25 20:17:23 -04:00
afdfa9e58e
Changed a bunch of ng-show to ng-if and added one-time bindings
2015-04-25 20:07:09 -04:00
ba2bdf6094
Merge pull request #5066 from hairlessbear/hide_challenge_achievement
...
Fixed challenges achievement always displaying
2015-04-25 18:57:53 -05:00
708ef0882b
Changed ng-show to ng-if and added one-time bindings
2015-04-25 19:32:41 -04:00
NotGonnaGitUs