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
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
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
