sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-01 23:40:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
14187 commits 3 branches 0 tags 1.6 GiB
Commit graph

1088 commits

Author SHA1 Message Date
Matteo Pagliazzi
d1f9e9e7ca v3: update footer with links to developer resources 2016-05-18 16:06:05 +02:00
Blade Barringer
7ac67315e6 Merge branch 'develop' into api-v3 2016-05-17 15:50:31 -05:00
Matteo Pagliazzi
a757df9f5b v3: fix notifications 2016-05-17 19:12:39 +02:00
Alys
1cf2c89171 adjust locales text, key names, and files for Rebirth, Reset, and Fortify / ReRoll for consistency with existing strings (#7321) 2016-05-17 15:48:58 +02:00
Sabe Jones
beb4a0d8bb feat(content): May 2016 pet quest (#7310) 2016-05-16 15:18:51 -05:00
Matteo Pagliazzi
0be5d1da9c v3: misc fixes 2016-05-15 15:10:41 +02:00
Blade Barringer
c534f31593 Merge pull request #7226 from Alys/api-v3-pubChalsMinPrize-rename 
[API v3] rename and reword pubChalsMinPrize to reflect that it's only for the Tavern
 2016-05-14 10:19:43 -05:00
Blade Barringer
3e57620666 fix: Set gems sent notification as translatable string 2016-05-14 06:54:44 -05:00
Alys
2e078f4776 allows players to send gems to each other; other minor related changes - fixes https://github.com/HabitRPG/habitrpg/issues/7227 2016-05-14 05:58:40 -04:00
Alys
fd13c7aa60 rename and reword pubChalsMinPrize to reflect that it's only for Tavern challenges 2016-05-14 16:40:40 +10:00
Sabe Jones
0eb7bc537d fix(contact): add clear subscription trouble email 2016-05-11 18:43:59 +00:00
Matteo Pagliazzi
998c679e96 Merge branch 'api-v3' into api-v3-client 2016-05-11 16:01:54 +02:00
Matteo Pagliazzi
a947afa5c6 Merge branch 'develop' into api-v3 2016-05-11 14:36:58 +02:00
Sabe Jones
7f11e766c3 Sabrecat/glasses chairs (#7182) 
* feat(customization): new chairs, eyeglass sprites

* feat(avatar): finish glasses implementation

* fix(test): include glasses in base equipment
 2016-05-10 16:07:46 -05:00
Keith Holliday
a92359e119 Moved markPMSRead to common.ops. Added tests 2016-05-10 15:15:55 -05:00
Matteo Pagliazzi
b3a78fba97 v3 payments: fix tests 2016-05-10 18:14:28 +02:00
Sphinx
7bfd9b0fd9 shieldSpecialSpring2015RogueNotes typo (#7144) 2016-05-05 19:55:02 +10:00
Sabe Jones
d5b3bbfaad Sabrecat/armoire 201605 (#7142) 
* feat(content): May BGs and Armoire

* chore(news): Bailey 20160503
 2016-05-03 15:20:00 -05:00
Matteo Pagliazzi
0c38caa2f9 Merge branch 'api-v3' into sabrecat/v3-payments 2016-04-30 16:51:51 +02:00
Matteo Pagliazzi
f69a566178 Merge branch 'develop' into api-v3 2016-04-30 16:49:44 +02:00
Victor Pudeyev
a567476bb7 V3 payments 7 stripe (#7124) 
* payments api: cancelSubscription

* some more tests for amazon payments

* promisifying amazon payments

* somehow payment stub is not working

* cleaning up tests

* renaming tests in api/v3/integration/payments

* improvements

* cleanup, lint

* fixes as per comments

* moment.zone() is back in.

* basic controller for stripe payments

* authWithUrl is in

* stripe cleanup

* making tests pass

* stripe bug fixes

* 400 error is right

* cleanup of sinon spy for fakeSend

* paypal payments

* lint of paypal

* require -> import
 2016-04-30 16:42:10 +02:00
Alys
590e185ecd fix spelling mistake: reseting to resetting 2016-04-29 18:44:49 -04:00
Victor Pudeyev
fa21577c46 V3 payments 6 (#7104) 
* payments api: cancelSubscription

* some more tests for amazon payments

* promisifying amazon payments

* somehow payment stub is not working

* cleaning up tests

* renaming tests in api/v3/integration/payments

* improvements

* cleanup, lint

* fixes as per comments

* moment.zone() is back in.
 2016-04-27 21:26:32 +02:00
Sabe Jones
974896ce7b feat(events): April Mystery and Floral Potions (#7107) 
* feat(events): April Mystery and Floral Potions
Also reorganizes the spritesmith folders for mounts so that head, body, and icon sprites are in separate folders.
 2016-04-25 14:17:31 -05:00
Matteo Pagliazzi
6ba1afe479 Merge branch 'api-v3' into api-v3-unlock-fix 2016-04-22 12:33:39 +02:00
Victor Piousbox
54a94db2de working on amazon payments 2016-04-21 03:52:29 +00:00
Victor Piousbox
3cba6d934b resolving conflicts 2016-04-20 22:04:31 +00:00
Keith Holliday
9e3d8ba4ac Separated out buy functions into buyGear, buyArmoire, and buyPotion (#7065) 2016-04-19 16:50:04 +02:00
Matteo Pagliazzi
f44dbbbd71 Merge branch 'develop' into api-v3 2016-04-19 12:16:22 +02:00
Alys
5d040ac442 change habitrpg.com to habitica.com in new profile edit message 2016-04-19 10:39:04 +10:00
MathWhiz
ed49a377e1 add community guidelines info to profile editing (#7086) 
* add community guidelines info to profile editing

* Update profile.jade
 2016-04-19 10:15:21 +10:00
MathWhiz
f1788080da Add list of Featured third-party Apps (#7046) 
* add list of featured third-party apps

* Add comma

* add descriptions

* add description to other

* add table

* add description to other

Conflicts:
	common/locales/en/settings.json
	website/views/options/settings.jade

* Update settings.json

* Sort extensions by name
 2016-04-19 08:21:07 +10:00
Sabe Jones
62f44771af fix(stable): rename Bumblebees throughout code 2016-04-18 21:02:24 +00:00
Matteo Pagliazzi
dea693f799 v3: start to fix unlocking 2016-04-16 20:51:16 +02:00
Victor Piousbox
ab156c0e4d resolving conflicts 2016-04-15 16:55:37 +00:00
Victor Piousbox
d27bbbe994 some locales work 2016-04-15 16:46:50 +00:00
Victor Piousbox
261a5a66b1 working on promisifying amazonPayments 2016-04-15 16:46:50 +00:00
Blade Barringer
1a64886f7d Merge branch 'develop' into api-v3 2016-04-15 08:04:46 -05:00
Victor Piousbox
74fc45524b working on promisifying amazonPayments 2016-04-14 22:49:24 +00:00
Matteo Pagliazzi
11b5c1b405 v3: several fixes to class system, move /logout outside of api 2016-04-14 20:05:30 +02:00
Sabe Jones
7bb6f968b4 feat(content): Pet Quest 2016-04 (#7071) 
Also renames the Be-Wilder special pet/mount rewards to "Magical Bee" from "Bumblebee".
 2016-04-13 12:15:38 -05:00
Keith Holliday
3970064fe5 Ported reset. Added unit tests. Added reset route. Added integration tests 2016-04-12 11:19:36 -05:00
Keith Holliday
42ef779b46 Ported addPushDevice. Added unit tests. Added addPushDevice route. Added integration tests 2016-04-10 09:47:14 -05:00
Victor Piousbox
1f4a0680ea shared-code-private-messages 2016-04-09 16:56:03 +00:00
Blade Barringer
8ba150074a chore(i18n): update locales 2016-04-09 09:27:04 -05:00
Matteo Pagliazzi
81fa689a11 Merge pull request #7042 from TheHollidayInn/api-v3-ops-reroll 
Ported reroll. Added unit tests. Added reroll route. Added integration tests
 2016-04-09 15:14:04 +02:00
Blade Barringer
60f99a29ed Merge branch 'api-v3' of github.com:HabitRPG/habitrpg into api-v3 2016-04-08 21:31:53 -05:00
Blade Barringer
8a42a3a51e Merge branch 'develop' into api-v3 2016-04-08 21:31:41 -05:00
Keith Holliday
1685b7285f Ported reroll. Added unit tests. Added reroll route. Added integration tests 2016-04-08 15:56:11 -05:00
Victor Piousbox
9704c47293 Merge branch 'api-v3' into shared-code-webhooks 2016-04-07 21:23:38 +00:00
Victor Piousbox
4c0f9ed1c8 resolving conflicts 2016-04-07 21:23:16 +00:00
Keith Holliday
fec9ce3dbe Ported rebirth. Add unit tests. Added rebirth route. Added integration tests 2016-04-07 15:02:55 -05:00
Matteo Pagliazzi
81d665513c Merge branch 'api-v3-ops-revive' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-ops-revive 2016-04-06 23:24:14 +02:00
Keith Holliday
621bf9609e Ported revive. Added unit tests. Add revive route. Added integration tests 2016-04-06 15:59:42 -05:00
Keith Holliday
2bd710a882 Ported unlock. Add unit tests. Create unlock route. Add integration tests 2016-04-06 15:53:32 -05:00
Keith Holliday
05b41bb41c Ported sell function. Add unit tests. Create sell route. Add integration tests 2016-04-06 08:27:18 -05:00
Sabe Jones
1f6eef0082 Sabrecat/armoire 201604 
* WIP(content): add sprites

* feat(content): Armoire and Backgrounds 2016-04
 2016-04-05 15:30:01 -05:00
Victor Piousbox
14b0ec8b03 shared-code-webhooks 2016-04-04 16:31:48 +00:00
Matteo Pagliazzi
c86898c7e4 Merge branch 'api-v3-ops-release-mounts' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-ops-release-mounts 2016-04-04 11:49:06 +02:00
Matteo Pagliazzi
66959c23f5 Merge branch 'api-v3-ops-release-both' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-ops-release-both 2016-04-04 11:46:46 +02:00
Keith Holliday
c916c74775 Ported release both, added unit tests, add release both route with integration tests 2016-04-03 14:44:00 -05:00
Keith Holliday
487a26ec43 Ported release pets, added unit tests, added route with integration tests 2016-04-03 14:37:20 -05:00
Keith Holliday
24b7b4c838 Ported release mounts, add unit tests, added release mounts route with integration tests 2016-04-03 14:34:43 -05:00
Matteo Pagliazzi
de74fae0b4 v3: port coupons 2016-04-02 16:37:55 +02:00
Matteo Pagliazzi
aae94bf1b4 Merge branch 'api-v3-open-mystery-item' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-open-mystery-item3 2016-04-01 16:39:52 +02:00
Matteo Pagliazzi
82afc1971d Merge branch 'api-v3-ops-read-card' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-ops-read-card 2016-04-01 16:30:48 +02:00
Matteo Pagliazzi
7e093f1622 Merge branch 'api-v3-hourglass-purchase' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-hourglass-purchase2 2016-04-01 16:28:20 +02:00
Matteo Pagliazzi
519b3a1e4f Merge pull request #6988 from TheHollidayInn/api-v3-ops-purchase 
Ported purchase, add unit tests, created new user purchase route, and added tests
 2016-04-01 16:20:33 +02:00
Keith Holliday
6d9617e345 Ported read card, added unit tests, added read card route and integration tests 2016-04-01 09:17:40 -05:00
Keith Holliday
3fe88fd8d0 Ported open mystery item, added unit tests, added route, and integration tests 2016-04-01 08:23:40 -05:00
Keith Holliday
ad0bc58028 Ported purchase, add unit tests, created new user purchase route, and added tests 2016-04-01 08:14:15 -05:00
Keith Holliday
dd12443166 Ported Hourglass Purchase, add unit tests. Created new hourglass purchase route and tests 2016-04-01 08:11:26 -05:00
Matteo Pagliazzi
c5f17b4011 Merge branch 'develop' into api-v3 2016-04-01 11:50:41 +02:00
Sabe Jones
41b3ee1df0 fix(world-boss): Correct generic Tavern text 2016-03-31 23:45:34 -05:00
Sabe Jones
f51653b7a5 WIP(world-boss): partial build 2016-03-31 17:29:21 -04:00
Matteo Pagliazzi
3089658cc7 Merge branch 'develop' into api-v3 2016-03-30 23:40:00 +02:00
Matteo Pagliazzi
d0383766e3 Merge pull request #6985 from HabitRPG/api-v3-update-user 
[Api v3] update user
 2016-03-30 23:16:28 +02:00
Matteo Pagliazzi
bf93275693 v3: port updateUser 2016-03-30 16:18:22 +02:00
Blade Barringer
a9d227b490 Merge branch 'develop' into wheelchair 2016-03-28 21:12:52 -05:00
Blade Barringer
02a60d90d8 Merge branch 'develop' into api-v3 2016-03-28 16:02:04 -05:00
Blade Barringer
6552f04b0c chore(i18n): update locales 2016-03-28 09:58:32 -05:00
Matteo Pagliazzi
d89d1e50dd Merge branch 'develop' into api-v3 2016-03-25 15:58:04 +01:00
Matteo Pagliazzi
15e8f881fe Merge branch 'api-v3-send-private-message' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-send-private-message 2016-03-25 15:56:28 +01:00
Keith Holliday
19a63e8128 Ported sendGift route and renamed it to transferGems. Refactored user.sendMessage logic. 2016-03-25 08:33:54 -05:00
Keith Holliday
95ea73d440 Fixed route namespace and added translation strings 2016-03-25 08:33:54 -05:00
Keith Holliday
e9a9079c46 Ported sendPrivateMessage route and added initial tests 2016-03-25 08:33:54 -05:00
Keith Holliday
7f65707ee4 Ported user delete route and added initial tests 2016-03-25 08:32:49 -05:00
Blade Barringer
cd6adf2421 fix: correct wheelchair spelling 2016-03-24 21:31:20 -05:00
Matteo Pagliazzi
0a65e6a6f1 v3: port hatch, equip and feed ops 2016-03-24 18:59:09 +01:00
Nick Bunn
0f9cf57613 feat: Add wheelchair to avatar customization 2016-03-24 07:57:13 -05:00
Sabe Jones
f7027b5cf3 feat(event): subscriber items 2016-03 2016-03-23 15:36:24 -04:00
Blade Barringer
9b9722a7b4 chore(i18n): update locales 2016-03-22 17:40:42 -05:00
Bleu
521195ab95 fix: Unify html in translation strings 
Closes #6859
 2016-03-22 17:34:29 -05:00
Blade Barringer
92ac703ecc chore(i18n): update locales 2016-03-22 08:31:14 -05:00
Matteo Pagliazzi
0bde9e2df2 Merge branch 'develop' into api-v3 2016-03-21 23:03:28 +01:00
Matteo Pagliazzi
d8dab49b79 Merge pull request #6898 from HabitRPG/api-v3-buy-ops 
[v3] Port several shared ops and their linked fns
 2016-03-21 23:00:43 +01:00
Victor Piousbox
b555930e9e invalid login credentials fixes 2016-03-21 21:27:11 +00:00
Victor Piousbox
6d972ea9af resolving conflicts 2016-03-20 02:53:58 +00:00
Victor Piousbox
d2c1c2cec6 cleanup and moving text strings to a locale object 2016-03-19 17:37:08 +00:00
Matteo Pagliazzi
ff72706cae wip(shared): port buy ops and linked fns 2016-03-19 16:04:27 +01:00
Kaitlin Hipkin
9f0704aa94 modal explaining new class gear is now class-agnostic 2016-03-18 23:23:12 -04:00
Sabe Jones
8447259016 Merge pull request #6921 from HabitRPG/sabrecat/spring-2016 
Spring Fling 2016
 2016-03-18 16:08:46 -05:00
Sabe Jones
b5f91a657f feat(event): Spring Fling complete 2016-03-18 16:56:16 -04:00
Blade Barringer
cd6ab23106 Merge pull request #6900 from doyler/develop 
Note about weekly progress update (fixes #6884)
 2016-03-18 07:37:32 -05:00
Victor Piousbox
4655e5061a api-v3 password reset 2016-03-17 14:47:22 -07:00
Sabe Jones
4effa79e17 WIP(event): Spring Fling partial 2016-03-17 13:04:12 -04:00
Blade Barringer
c7310b97ec Revert "Revert inventory equipment/gear sorting due to inability to de/equip and maybe performance issues." 
This reverts commit 9d50201180.
 2016-03-17 08:09:18 -05:00
Alys
9d50201180 Revert inventory equipment/gear sorting due to inability to de/equip and maybe performance issues. 
This reverts commits 1c811dbc82, 146810a3e9, 9508ed45df, a6fb945120.
 2016-03-17 21:47:29 +10:00
Blade Barringer
3f16cd4fbf refactor: Adjust stat allocation modal 2016-03-16 22:07:00 -05:00
Josh Holland
952d9ec929 Quick allocation of attribute points from level-up modal 
Resolves #6720.
 2016-03-16 22:06:54 -05:00
Blade Barringer
a150dbc9ca chore(i18n): update locales 2016-03-16 20:32:15 -05:00
doyler
51f3008a20 Note about weekly progress update (fixes #6884) 2016-03-16 22:11:01 +01:00
Blade Barringer
be0bcad24b chore(i18n): update locales 2016-03-15 19:51:47 -05:00
Blade Barringer
1c811dbc82 refactor: Extract orderBy equipment button into mixin 2016-03-15 19:41:24 -05:00
Matt Harrington
a6fb945120 inventory sorting 
Add inventory sorting buttons based on name, attribute, and set (armoire):
-  Each gear[klass] has its own sorting buttons and sorting state including costume classes
-  The attributes sort descending when selected, then by sum of all attributes
-  There is no default sort
-  The armoire also sorts by set which sorts by item[set] descending, it does not sort within a set (ex "1 of 3" vs "2 of 3")
-  Name sorts by .text() ascending
 2016-03-15 19:41:11 -05:00
Sabe Jones
beb86ea4bd Merge branch 'khipkin/party-badges' into develop 
Conflicts:
	common/dist/sprites/spritesmith-main-10.png
	common/dist/sprites/spritesmith-main-11.png
	common/dist/sprites/spritesmith-main-5.css
	common/dist/sprites/spritesmith-main-5.png
	common/dist/sprites/spritesmith-main-6.png
	common/dist/sprites/spritesmith-main-7.png
	common/dist/sprites/spritesmith-main-8.png
	common/dist/sprites/spritesmith-main-9.png
 2016-03-15 14:57:38 -04:00
Matteo Pagliazzi
219ec01ce9 port shared.ops.allocate 2016-03-15 18:41:23 +01:00
Victor Piousbox
0b25720232 cleanup 2016-03-13 14:01:53 -07:00
Victor Piousbox
c14f0c4247 update username, password 2016-03-13 10:42:59 -07:00
Matteo Pagliazzi
c02082a200 Merge branch 'develop' into api-v3 2016-03-12 16:00:24 +01:00
Sabe Jones
d28219e90d fix(content): Pfeffernusse typo, again 2016-03-10 17:35:36 -06:00
Matteo Pagliazzi
fbdbd8e006 Merge branch 'develop' into api-v3 2016-03-10 18:30:09 +01:00
Sabe Jones
2a5011b648 fix(content): don't be clever with quest names 2016-03-09 16:57:43 -06:00
Sabe Jones
d153df7805 feat(content): snail pet quest WIP 2016-03-09 15:34:57 -05:00
Kaitlin Hipkin
167eb8973a add strings for new partyUp and partyOn achievs 2016-03-08 20:45:33 -05:00
Blade Barringer
3fa9d17ad4 Merge branch 'develop' into api-v3 2016-03-08 19:25:50 -06:00
Alys
612d455fe1 Merge pull request #6782 from andrewcham/issue6779 
update community guidelines - fixes #6779
 2016-03-06 17:42:08 +10:00
Matteo Pagliazzi
b5e1cd33e2 Merge branch 'develop' into api-v3 2016-03-05 19:29:02 +01:00
Matteo Pagliazzi
6830a4464a Merge branch 'api-v3-email-3' of https://github.com/piousbox/habitrpg into piousbox-api-v3-email-3 2016-03-05 19:24:11 +01:00
Blade Barringer
a007effddd chore(i18n): update locales 2016-03-05 07:46:08 -06:00
Victor Piousbox
7dfdbb8b05 /user/update-email endpoint 2016-03-04 21:27:16 +00:00
Matteo Pagliazzi
80f791c86b add tests, move CustomError to common, fix casting 2016-03-03 00:16:28 +01:00
Matteo Pagliazzi
8920b05f9e Merge branch 'develop' of github.com:HabitRPG/habitrpg into api-v3 2016-03-02 12:59:51 +01:00
Sabe Jones
ea6abbfabc feat(content): Armoire and BGs 2016-03 2016-03-01 15:59:25 -05:00
Matteo Pagliazzi
9114d74357 Merge branch 'develop' into api-v3 2016-03-01 09:44:57 +01:00
Nick Bunn
251dd3cb8e Changed submenu from Hall of Heroes to Hall of Contributors 2016-02-29 20:23:05 -06:00
Matteo Pagliazzi
0c700cc36d Merge branch 'develop' into api-v3 2016-02-29 16:39:31 +01:00
Matteo Pagliazzi
3512233966 add meta/models controller to get public models paths 2016-02-29 01:04:19 +01:00
Nick Bunn
075ed9f172 updated menu names for better description 2016-02-28 16:10:26 -06:00
Alys
6cd861dcdc Merge pull request #6742 from murraybd/develop 
Display attribute info in Character Build
 2016-02-28 19:39:20 +10:00
Andrew Cham
bf64c6503d #6779 Update community guidelines 2016-02-27 02:47:58 -08:00
Matteo Pagliazzi
bb461f0c5a Merge branch 'develop' into api-v3 2016-02-26 10:08:24 +01:00
Sabe Jones
5c1d379f41 feat(subscription): mystery items 201602 2016-02-23 17:00:55 -05:00
Matteo Pagliazzi
2b8846b803 Merge pull request #6748 from TheHollidayInn/api-v3-unsubscribe 
Added unsubscribe route and initial tests
 2016-02-22 18:03:05 +01:00
Matteo Pagliazzi
9ef4b6409e Merge branch 'develop' into api-v3 and move new relic to new location 2016-02-22 11:43:35 +01:00
Keith Holliday
34b03934cc Added unsubscribe route and initial tests 2016-02-21 10:05:51 -06:00
Brian Murray
7822e2aaec end sureRest sentence with a period 2016-02-19 19:15:32 -08:00
Matteo Pagliazzi
2547676783 add hall controller, missing tests 2016-02-18 14:55:52 +01:00
Blade Barringer
d0ac43592f chore(i18n): update locales 2016-02-14 21:13:40 -06:00
Matteo Pagliazzi
28c6c27b78 Merge branch 'develop' into api-v3 2016-02-14 13:03:29 +01:00