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
9318 commits 3 branches 0 tags 1.6 GiB
Commit graph

9318 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
NotGonnaGitUs
ddd2ef0d12 Merge pull request #1 from NotGonnaGitUs/GemsRefundTests 
Test for prize challenge creation and refund
 2015-05-04 19:27:21 +05:30
NotGonnaGitUs
9a3c383bc7 Changed Quests comment and did done() inside the last function 2015-05-04 19:08:45 +05:30
NotGonnaGitUs
fc61a9c39f Fixed whitespace error 2015-05-04 19:00:07 +05:30
NotGonnaGitUs
32bcec013f Combined both tests because I can't figure out how to pass challenge._id to next test 2015-05-04 18:52:14 +05:30
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
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
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
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