sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-05 03:52:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
9202 commits 3 branches 0 tags 1.6 GiB
Commit graph

9202 commits

This branch
This branch
All branches
Author SHA1 Message Date
Matteo Pagliazzi
a91b544830 typo 2015-05-06 16:18:14 +02:00
Matteo Pagliazzi
8066589268 disable registration while request in progress 2015-05-06 15:43:30 +02:00
TheHollidayInn
bcb7b75380 Fixed conditional and spacing 2015-05-05 20:13:53 -05:00
Blade Barringer
84a4c36c7e Merge branch 'NotGonnaGitUs-RestingatInnText' into develop 2015-05-05 19:45:42 -05:00
Blade Barringer
d482fdcea5 Refactor tavern view 2015-05-05 19:45:05 -05:00
Matteo Pagliazzi
a1fb1468ba chore(i18n): update locales 2015-05-05 19:52:20 +02:00
Matteo Pagliazzi
d2198c7572 remove invite friends from settings page 2015-05-05 19:52:06 +02:00
Matteo Pagliazzi
ca90de7a55 Merge pull request #5144 from NotGonnaGitUs/FrontPageLinkFix 
Fixed broken business link
 2015-05-05 17:34:53 +02:00
TheHollidayInn
c1684414c3 Added registerManyUsers to reduce function calls 2015-05-05 09:19:43 -05:00
TheHollidayInn
8a4b43905d Added tests 2015-05-04 19:12:44 -05:00
Tyler Renelle
a090fed10b feat(analytics): "motivate yourself" 3 variants @lemoness 2015-05-04 15:31:00 -04:00
NotGonnaGitUs
25b63cfacd Made daniel's text in the inn based on current rest status of the user. 2015-05-04 23:37:54 +05:30
NotGonnaGitUs
076cc76e5d Fixed broken link 2015-05-04 21:26:45 +05:30
Blade Barringer
41a6818ea8 Revert inn text 2015-05-03 20:21:53 -05:00
TheHollidayInn
0bd39120aa Updated conditionals 2015-05-03 19:35:47 -05:00
TheHollidayInn
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
TheHollidayInn
65a0ecdd6a Added query to always include user when populating group members 2015-05-03 19:35:46 -05:00
NotGonnaGitUs
78e8499c5f Fixed missing space. 2015-05-04 01:12:43 +05:30
Matteo Pagliazzi
0454938303 chore(i18n): update locales 2015-05-03 21:24:53 +02:00
NotGonnaGitUs
a45390321e Patched translation fixes and added a few phrases to locales. 2015-05-03 23:41:42 +05:30
Joy Clark
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
Negue
b2bad4d77f Update todo preview in dialog 2015-05-03 17:12:08 +02:00
Blade Barringer
b408f016fd Merge pull request #5119 from NotGonnaGitUs/develop 
Made front page translatable
 2015-05-03 09:43:43 -05:00
Negue
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
Negue
de71db310a revert popover click trigger 2015-05-03 16:34:57 +02: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
Blade Barringer
1f85b5bf67 add hack to have both mouseover and persisten click behavior 2015-05-01 22:12:00 -05: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
Negue
c3b09d8cce test 2nd argument for openModal 2015-05-01 13:55:33 +02: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