7c516b7cbb
Release Mergeback ( #8644 )
...
* Remove email addresses from translatable strings (#8448 )
* Fix User > Profile showing {getProgressDisplay()}
* Remove bad nextRewardAt check
* 1st iteration of issue #8385 - more pending
* #8385 config and jade fixes, tests pending
* #8385 fixing lint errors
* Fix faqs string and test
* Fix faq.jade and add workaround for faq.js
* Fixing accidental checking for faq.js
* fix emails in faq.js
* fetch emails once in auth.js
* Fixing community manager email in auth.js
(cherry picked from commit 842fbe42a8b2225f05e530f514e46f#8606 )
This is to help translators add good glossary entries now for keeping the current wiki pages consistent with future additions to the website's seasonal shop.
(cherry picked from commit 4846bc57691d7b733759#8597 )
* feat(bgs): new default background
* feat(bgs): backfill migration
* fix(migration): extraneous imports, bad paths
* fix(bgs): address comments
* fix(test): assert equality
(cherry picked from commit 03088f1d9f831b122ce2be1754ab07565d50dd99d4198f8913ea1848999196ce948e1ac4463f991b#8632 )
* feat(event): April Fools 2017
* feat(event): NPCs and Bailey
* fix(event): tweak NPCs, add challenge link
* chore(sprites): compile
* 3.83.2
* v3.83.3 Fooling Fix (#8633 )
* fix(fooling): add logic to party and member modals
* 3.83.3
* v3.83.4 Export fooling (#8634 )
* fix(fooling): allow export
* 3.83.4
* v3.83.5 End Fooling (#8638 )
* chore(event): no more foolin
* chore(sprites): compile
* 3.83.5
* fix(merge-conflict): prefer develop
for config.json.example
* fix(merge-conflict): fewer istanbul deps
2017-04-03 16:34:37 -05:00
c23062f87e
chore(npm): update shrinkwrap
2017-03-31 16:44:10 +00:00
ec98541df6
fix text problems in Community Guidelines and broken email links; also add press kit link ( #8623 )
2017-03-31 18:07:18 +02:00
4fed13afdd
add note to encourage reporting of begging for gems ( #8605 )
...
Also changes the email addresses in config.json.example to the real addresses so that we can use local install screenshots to tell if the correct address variable has been used.
2017-03-31 18:06:22 +02:00
866b28ec15
chore(news): Bailey
...
(cherry picked from commit ea7c07e21d
2017-03-30 19:04:41 +00:00
c4463f991b
stripe webhook: fix handling of automatic requests
2017-03-30 00:14:51 +02:00
96ce948e1a
rebuild shrinkwrap
2017-03-29 16:10:32 +02:00
ea18489991
3.83.0
2017-03-29 03:33:13 +00:00
5eb1b6684e
3.82.0
2017-03-29 03:33:09 +00:00
a2f77eeba2
3.81.0
2017-03-29 03:32:29 +00:00
d4198f8913
chore(i18n): update locales
2017-03-29 03:28:07 +00:00
565d50dd99
chore(public-docs): Community Guidelines update
...
Also Bailey announcement
2017-03-29 03:21:44 +00:00
be1754ab07
chore(i18n): update locales
2017-03-28 22:05:20 +00:00
831b122ce2
chore(sprites): compile
2017-03-28 21:53:12 +00:00
03088f1d9f
New default background ( #8597 )
...
* feat(bgs): new default background
* feat(bgs): backfill migration
* fix(migration): extraneous imports, bad paths
* fix(bgs): address comments
* fix(test): assert equality
2017-03-28 16:49:24 -05:00
1d7b733759
stripe webhook for unpaid subs: add 3 days of remaining time
2017-03-28 21:51:55 +02:00
d170f0b1bd
Fixed injection minification issue ( #8608 )
2017-03-28 13:12:51 -06:00
4846bc5769
add recent Grand Gala seasonal special equipment names ( #8606 )
...
This is to help translators add good glossary entries now for keeping the current wiki pages consistent with future additions to the website's seasonal shop.
2017-03-28 11:32:42 -05:00
30f514e46f
Merge branch 'stripe-webhook' into develop
2017-03-28 16:11:13 +00:00
6aad018eb2
Mocha 3 and Coverage ( #8601 )
...
* upgrade mocha to v3
* shrinkwrap
* import changes from PR #8487
* fix bin
* upgrade istanbul
* use correct mocha bin
2017-03-28 13:50:34 +02:00
daf9421f4f
old client: guilds: show invite button and completely hide box for party info
2017-03-28 11:24:01 +02:00
b2225f05e5
chore(i18n): update locales
2017-03-27 18:19:45 +02:00
842fbe42a8
Remove email addresses from translatable strings ( #8448 )
...
* Fix User > Profile showing {getProgressDisplay()}
* Remove bad nextRewardAt check
* 1st iteration of issue #8385 - more pending
* #8385 config and jade fixes, tests pending
* #8385 fixing lint errors
* Fix faqs string and test
* Fix faq.jade and add workaround for faq.js
* Fixing accidental checking for faq.js
* fix emails in faq.js
* fetch emails once in auth.js
* Fixing community manager email in auth.js
2017-03-27 18:03:31 +02:00
5eadf9e486
Fixed subscription popup too narrow in Japanese ( #8581 ) ( #8583 )
2017-03-27 09:57:49 -06:00
68ad3e2d4a
Task notes modals ( #8521 )
...
* Merged in develop
* Show task notes modal on click
* Began adding tests
* Removed extra characters
* Fixed lingering popup
* Added markdown
* Fixed line endings
2017-03-27 09:10:21 -06:00
de947f8069
Updating User API Doc (part 1) ( #8476 )
...
* Update API Doc #8087
Includes: GET /api/v3/user – POST /api/v3/user/buy/:key
* User API Doc update 1
Changed "GET user" description to a URL to the user model
* Update API DOC User 1
Cleaned up stray spaces
* Updated API Doc for User (part 1)
for GET user:
restored apiDescription from first PR
put link to model into "apiSuccessExample"
* Remove notifications from example responses
* Fixed trailing spaces
2017-03-26 21:42:21 +02:00
d541e3aa31
Fixed collection quest progress not being updated ( #8584 )
2017-03-26 21:27:44 +02:00
b0eda344f1
Limit party size to 30 members ( #8589 )
...
* Added a field in Party page with members count and maximum members in party
* Added information of invitations counter
* Limited party to 2 members on server (API)
* Fixed english text
* Consider current number of invitations in the party
* Moved PARTY_LIMIT_MEMBERS to common folder
* Access the PARTY_LIMIT_MEMBERS through groupsCtrl
* Some corrections
* Hide invite button when invite limit is reached
* Added missing trailing comma
* Do not test 'returns only first 30 invites' in a party anymore, but in a guild: party is limited to 30 members, so it would always fail
* Test: allow 30 members in a party
* Test: do not allow 30+ members in a party
* Improved 'allow 30 members in a party' test
* Test: 'allow 30+ members in a guild'
* Added missing trailing comma
* Code style corrections
* Fixed new line position
* Party limit check done inside Group.validateInvitations function
* Improved members count query
* Fixed tests
* Rewrite tests
* Removed import of BadRequest: value became unused
* Added 'await' to remaining 'Group.validateInvitations' functions
* Fixed tests that would always success
2017-03-26 21:23:19 +02:00
02708a7b10
remove "Habitica - Gamify Your Life" video from Press Kit ( #8595 )
...
- removes embedded youtube video from press kit page
- removes "Habitica - Gamify Your Life.mp4" from presskit.zip
2017-03-26 21:12:09 +02:00
fd9f3a32c4
fix linting
2017-03-25 17:48:51 +01:00
6e0341a4ff
add more logging
2017-03-25 17:33:35 +01:00
625077fc1a
add tests and fix bugs
2017-03-25 17:22:28 +01:00
9d456e934c
remove un-necessary JSON.parse
2017-03-25 11:46:40 +01:00
771d8f492a
update stripe webhooks url
2017-03-25 11:46:40 +01:00
f3fab88f0b
add console.log statements for debugging
2017-03-25 11:46:40 +01:00
207e3476e6
add stripe webhook to handle cancelled subscriptions
2017-03-25 11:46:40 +01:00
0ec293bd15
chore(news): Bailey
2017-03-23 21:00:48 +00:00
cb00ecc0be
chore(i18n): update locales
2017-03-23 19:53:14 +00:00
94ef4f80cc
chore(sprites): compile
2017-03-23 19:45:05 +00:00
814b163e1a
March 2017 Content ( #8594 )
...
* feat(content): Mystery 032017, Shimmer Potions
* fix(date): end 4/19 not 30
* fix(dates): Floral after Shimmer
2017-03-23 14:41:41 -05:00
421bdce38b
fix(sprites): don't get blocked ( #8576 )
2017-03-23 12:23:29 -05:00
624566ecec
Added end date option to group plan migration ( #8588 )
2017-03-23 10:40:15 -06:00
77ff91868e
Redirection fixes ( #8592 )
...
* fix(redirects): logic update
* test(middlewares): redirects tests
* fix(nconf): IS_PROD is boolean
* fix(test): treat IS_PROD as Boolean here too
* fix(test): apiUrl test copypasta
2017-03-23 10:25:58 -05:00
59f490d178
fix(sprites): accidental project_file deletion
2017-03-21 19:42:02 +00:00
ae64ef94ae
fix(event): update Justin sprite
2017-03-21 19:06:43 +00:00
2335e22a0c
chore(i18n): update locales
2017-03-21 18:58:46 +00:00
910154b3ed
chore(news): Bailey
2017-03-21 18:46:17 +00:00
31e36339c4
fix(event): update Daniel sprite
2017-03-20 19:12:43 +00:00
07fe1df024
chore(sprites): compile
2017-03-20 18:36:37 +00:00
258742f6b7
Optional HTTP Basic Auth ( #8586 )
...
* add ability to add http basic auth to the website
* debug
* remove console.log
2017-03-20 15:02:48 +01:00
Sabe Jones