a090fed10b
feat(analytics): "motivate yourself" 3 variants @lemoness
2015-05-04 15:31:00 -04:00
25b63cfacd
Made daniel's text in the inn based on current rest status of the user.
2015-05-04 23:37:54 +05:30
076cc76e5d
Fixed broken link
2015-05-04 21:26:45 +05:30
41a6818ea8
Revert inn text
2015-05-03 20:21:53 -05:00
0bd39120aa
Updated conditionals
2015-05-03 19:35:47 -05:00
5fe6121495
Added user to group.member if they are a member of the group and not included in the query
2015-05-03 19:35:47 -05:00
65a0ecdd6a
Added query to always include user when populating group members
2015-05-03 19:35:46 -05:00
78e8499c5f
Fixed missing space.
2015-05-04 01:12:43 +05:30
0454938303
chore(i18n): update locales
2015-05-03 21:24:53 +02:00
a45390321e
Patched translation fixes and added a few phrases to locales.
2015-05-03 23:41:42 +05:30
4450a5d7c3
Fixes #5094 Now show list based on whether or not a search query is defined. The autocomplete function from the directive is encapsulated so that it can be called and then the query can be set to null.
2015-05-03 18:14:28 +02:00
b2bad4d77f
Update todo preview in dialog
2015-05-03 17:12:08 +02:00
b408f016fd
Merge pull request #5119 from NotGonnaGitUs/develop
...
Made front page translatable
2015-05-03 09:43:43 -05:00
c52de09e57
Merge branch 'blade_negue-copyMessageTodo' of https://github.com/HabitRPG/habitrpg into copyMessageTodo
...
Conflicts:
website/views/shared/tasks/task.jade
2015-05-03 16:37:28 +02:00
de71db310a
revert popover click trigger
2015-05-03 16:34:57 +02:00
62f7eae5d5
Fixes #5132
2015-05-03 09:01:12 -05:00
e09d4f3a91
Commented out new dailies behavior
2015-05-03 08:21:29 -05:00
4d5ec83234
Removed objects not used anywhere by env.t function.
2015-05-03 14:33:46 +05:30
68aedda3bb
Merge branch 'develop' into hairlessbear-cron_dailies_fix
2015-05-02 22:10:58 -05:00
c81d321366
Checklists should reset even when resting in the inn
2015-05-02 22:10:26 -05:00
0fc068ea93
Removed objects not used by front.jade, footer.jade or login-modale.jade
2015-05-02 20:02:20 +05:30
cad47dc2c0
Fixes #5123
2015-05-02 09:28:55 -05:00
ace1d2a9e2
Update sprites with shading - @lemoness
2015-05-02 09:26:11 -05:00
21f470cd5a
Removed objects not used front.jade or shared/footer.jade
2015-05-02 17:42:38 +05:30
9e88a55d54
Removed objects not used by front.jade.
2015-05-02 17:12:46 +05:30
72f8c60ccf
chore(i18n): update locales
2015-05-02 11:43:38 +02:00
1f85b5bf67
add hack to have both mouseover and persisten click behavior
2015-05-01 22:12:00 -05:00
08e6758345
Merge pull request #5121 from SabreCat/develop
...
Conclude Spring Fling
2015-05-01 19:29:33 -05:00
74877f0653
chore(grunt): compile sprites
2015-05-01 19:22:09 -05:00
6685e93554
fix(Spring): WHO IS LESLIE
2015-05-01 19:19:23 -05:00
d50d4ad8bb
feat(Spring): Flung
2015-05-01 19:09:28 -05:00
e334ce7684
Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop
2015-05-01 12:36:07 -05:00
954f9baeec
chore(bailey) - skills rebalancing
2015-05-01 12:29:59 -05:00
124df58644
Made front page translatable.
2015-05-01 21:18:25 +05:30
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
Tyler Renelle