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
bf4ecf244c organized push notifications api test 2015-05-10 16:36:10 -05:00
Blade Barringer
95a90723c8 Merge branch 'develop' into negue-WIP-Push-notifications 2015-05-10 16:27:58 -05:00
Negue
1cc07129f1 Merge branch 'develop' into pushNotifications2 
Conflicts:
	test/api.mocha.coffee
 2015-05-10 22:01:41 +02:00
Blade Barringer
8badc7d1a9 Add coupon api tests 2015-05-10 14:54:45 -05:00
Blade Barringer
109ca1b67c Correct bullet list position; fixes #5181 2015-05-10 14:16:11 -05:00
Blade Barringer
c123ca6a42 Correct casing of translatable string 2015-05-10 09:13:05 -05:00
GihHubSphinx
6c5d9f3a6c Tried to make line translatable 
Tried to make the "Only group leader can create challenges" line in the
guild creation dialog translatable
 2015-05-10 08:59:43 -05:00
Alys
5123bdb4c4 Merge pull request #5080 from joyclark/develop 
Fixing the grid view for mounts so that the animals are aligned correctly.
 2015-05-10 19:01:56 +10:00
Alys
1dec4ba7a6 allow MP gained for Habits and Dailies to be increased when a critical hit occurs (crits are triggered in addPoints) 2015-05-10 18:17:17 +10:00
Blade Barringer
49595adad9 Merge branch 'develop' into crookedneighbor-separate_mocha_tests 2015-05-08 21:41:34 -05:00
Blade Barringer
71c65c7a73 change coupon route in angular router to promo 2015-05-08 21:24:57 -05:00
Blade Barringer
1bfc82c636 Merge branch 'develop' into NotGonnaGitUs-develop 2015-05-08 21:02:09 -05:00
Blade Barringer
5c00bde701 remove changelog 2015-05-08 20:46:54 -05:00
agentx999
84979b137d Update spells.json 
modified Backstab, Brutal Smash, Burst of Flames, and Pickpocket descriptions
 2015-05-08 18:32:18 -07:00
Negue
1858a98bad add test for push notification api call 2015-05-08 23:46:41 +02:00
Negue
90edb7719f Merge branch 'develop' into pushNotifications2 2015-05-08 23:21:18 +02:00
Tyler Renelle
382add82c3 feat(tutorial): put tut back in, we just need to replace it in near future 2015-05-08 12:58:43 -04:00
NotGonnaGitUs
09a713dbde Changed menu title to "promo codes" instead of "coupons". 2015-05-08 19:36:14 +05:30
Blade Barringer
4ccfaa974f Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop 2015-05-08 08:45:24 -05:00
Blade Barringer
8569f7b749 Merge branch 'joyclark-autocomplete-click-behavior' into develop 2015-05-08 08:45:06 -05:00
Blade Barringer
efa193b262 Refactor test 2015-05-08 08:44:50 -05:00
Blade Barringer
81da53be6d Merge pull request #5165 from git-afsantos/patch-1 
fix(stats) removed extraneous class bonus
 2015-05-08 07:45:54 -05:00
NotGonnaGitUs
ef0b96e5e4 Changed promo code text. 2015-05-08 10:33:26 +05:30
Blade Barringer
bb42acacdb Change format of testing commands in readme 2015-05-07 21:52:56 -05:00
Blade Barringer
d1d319f57e Clarify matter in readme 2015-05-07 21:50:22 -05:00
Blade Barringer
17c248e970 Add readme. Adjust api-helper.coffee 2015-05-07 21:33:59 -05:00
Blade Barringer
2ca5956cee Adjust namespace of api tests 2015-05-07 21:22:30 -05:00
Blade Barringer
9525c5c528 move guild tests into api groups test 2015-05-07 21:16:53 -05:00
Blade Barringer
ece37c01db Merge branch 'develop' into separate_mocha_tests 2015-05-07 21:11:30 -05:00
Blade Barringer
c41fe9929f Add todo 2015-05-07 18:19:05 -05:00
git-afsantos
38056a4837 fix(stats) removed extraneous class bonus 
Even leveled users below level 100 were showing an extra 0.5 stat class bonus. This was due to the level bonus being a float, instead of an integer. Used `Math.ceil` to fix the level bonus, thus removing the extraneous 0.5 class bonus.
 2015-05-08 00:05:44 +01:00
Blade Barringer
30546ccf12 remove extraneous comment 2015-05-07 17:51:51 -05:00
Blade Barringer
9884ed71f8 Merge branch 'develop' into TheHollidayInn-join-button-fix 2015-05-07 17:50:57 -05:00
Blade Barringer
3dc7567c53 Clean up test code 2015-05-07 17:49:46 -05:00
Blade Barringer
180279f2f6 clean up cruft from api tests 2015-05-07 17:37:07 -05:00
TheHollidayInn
47121fa70d Update tests to use get url, added not member tests, and updated logic to prevent users from being added to public guilds 2015-05-07 15:59:21 -05:00
negue
e628dba5e8 Merge pull request #5087 from negue/copyMessageTodo 
copy chat messages as todo
 2015-05-07 22:21:42 +02:00
Tyler Renelle
4f7c9cd445 feat(guide): temporarily remove current tutorial, add simple ? to expand help 2015-05-07 14:31:53 -04:00
Blade Barringer
cb9738251f Add isUserInvited to if statement 2015-05-07 13:26:22 -05:00
Matteo Pagliazzi
25fe1d34d6 fix(groups): you should not be able to join a group you are not invited to 2015-05-07 18:56:41 +02:00
Matteo Pagliazzi
a60f7f68af empty commit to rebuild heroku 2015-05-07 18:12:20 +02:00
Blade Barringer
c1051a9035 Separate api tess into separate files 2015-05-07 08:13:43 -05:00
Sabe Jones
1890aacaab Merge pull request #5160 from SabreCat/develop 
May Backgrounds
 2015-05-06 20:03:43 -05:00
Sabe Jones
040e6e0a41 chore(grunt):compile sprites 2015-05-06 19:53:08 -05:00
Sabe Jones
2a375a120c feat(backgrounds): prettify news 2015-05-06 19:48:47 -05:00
Sabe Jones
00db42b6c0 feat(backgrounds): May BGs 2015-05-06 19:41:54 -05:00
Matteo Pagliazzi
7d08358791 fix(registration) do not re-enable registrations if the first one is successfull 2015-05-06 16:23:15 +02:00
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