9cf8c0a824
Merge branch 'release' into develop
2019-04-02 13:09:46 -05:00
c60481ab34
Amplitude fixes v2 ( #11100 )
...
* fix(analytics): properly catch and log errors
* misc
* refactor
* more refactor
* fallback for user id
* fix tests
2019-04-02 18:44:39 +02:00
0b8ce63c76
WIP: Improve User model performances ( #10832 )
...
* wip: define items as mixed objects
* add default owned gear
* mark modified
* more mark modified
* more mark modified
* more mark modified
* more mark modified
* fix common tests
* fix common tests
* update mongoose
* add itemsUtils
* use new util function in hall controller
* add tests for items utils
* update website/server to mark all items as modified
* start updating common code
* update login incentives
* update unlock
* remove changes to package-lock.json
* remove changes to package.json
2019-04-01 19:24:18 +02:00
0b82722d27
performance: private messages - API ( #11077 )
...
* paging for inbox
* clean up
2019-03-31 20:52:53 +02:00
abb8dc4dc1
Merge pull request #11078 from ChesterSng/11602-display-message-when-social-auth-acc-uses-password
...
Fixes #11062 Display information message when social authentication account uses password to login
2019-03-23 18:36:12 +01:00
87d86ee632
Add test case for user that uses social authentication
2019-03-23 20:04:09 +08:00
b387d77128
Lint fixes
2019-03-22 16:18:58 -04:00
e644ae83fd
Overrides for generateUser and test adjustment
2019-03-22 14:44:27 -04:00
e083df64e4
fixes #11047 Switches Hall query to use lowercase name
2019-03-17 04:00:50 -04:00
080c4b3e20
Merge branch 'develop' into negue/flagpm
2019-03-03 17:12:11 +01:00
d267f09d04
Enable Username to be searched in Hall of Heroes - fixes #10972 ( #10980 )
...
* Add if block to search for username if not valid uuid
* Add validationError check
* Modify test case and added test case for username
* Update description of API
* Update Test
* Correct test
* Change placeholder text in heroes.vue
* Refactor code
* Add quotes
* Update hall.js
2019-02-21 13:33:15 -06:00
0ca3c1f94d
fix POST-chat.test (author_name format)
2019-01-27 21:29:45 +01:00
2f699e24d7
update test to use the correct author_name format
2019-01-27 19:05:00 +01:00
faa0611ab2
Merge branch 'develop' of https://github.com/HabitRPG/habitica into negue/flagpm
2019-01-27 18:14:51 +01:00
87923b7f0d
Add username to challenge csv export ( #10956 )
...
- Adds the member's username to the challenge csv
- Updates to unit tests
- Issue #10955
Supports the ability for challenge owners to judge challenge winners
after the added functionality enabling users to modify their name
(display name). The added field ties the user to their results by
their username.
2019-01-26 18:44:48 +01:00
5d0be7bc72
Merge branch 'release' into develop
2019-01-24 13:14:19 -06:00
6ea4d96830
add extra condition to skip ssl check
2019-01-23 17:19:57 +01:00
04a7fd25a6
allow skipping SSL check with secret key ( #10962 )
2019-01-23 17:10:11 +01:00
5bd9fcc99d
Merge branch 'release' into develop
2019-01-18 14:59:37 -06:00
ec37524164
chore(promo): end G1G1 deal
2019-01-15 18:57:10 -06:00
f63d2e47f0
do not show "Notification not found" error messages ( #10931 )
...
* start fixing #10391
* do not show snackbars for notifications not found
* revert message changes
* update tests
* add new test
* fix property
2019-01-13 11:43:02 +01:00
7c954f7073
Prevent progress being cleared when quest ends ( #10870 )
...
* Prevent progress being cleared when quest ends
changing group tests to make sure it keeps user's progress
fix and remove .only() from tests
* fix tests and check null case for clearing up user's quest without resetting progress
2018-12-28 19:16:21 +01:00
cfbfec34aa
Allow gems and subs to be gifted through in-app-purchases ( #10892 )
...
* Allow gems to be gifted through IAPs
* implement non recurring IAP subscriptions
* fix localization issue in error
* fix non renewing subscription handling
* Fix lint error
* fix tests
* move findbyId mock to helper file
* undo package-lock changes
* Fix lint error
2018-12-23 19:20:14 +01:00
8220199e49
Gift 1 Get 1 Promo 2018-19! ( #10915 )
...
* feat(subscription): promo banner in modal
* feat(subscription): promo banner on main page
* fix(banners): remove extraneous margin adjustment
* fix(banners): various
* feat(promotion): gift 1, get 1
* fix(promo): various
* chore(promo): add Bailey
* fix(promo): use different email template for promo beneficiary
* fix(promo): turns out Winter is meaningful
2018-12-18 15:28:53 -06:00
f42e22b58f
Make env vars more palatable for containerization ( #10895 )
...
* refactor(env-vars): remove object/colon syntax
* fix(tests): correct config expectations
2018-12-06 10:13:49 -06:00
817c943860
Merge remote-tracking branch 'origin/develop' into negue/flagpm
2018-11-29 19:02:01 +01:00
a30c4379a6
fix(tests): correct string update errors
2018-11-28 01:00:46 +00:00
3203bffeaa
refactor update the message to use .save - fix test
2018-11-18 22:37:09 +01:00
8b15d94ae1
Merge remote-tracking branch 'origin/develop' into negue/flagpm
...
# Conflicts:
# website/client/components/chat/chatCard.vue
# website/client/components/chat/chatMessages.vue
# website/common/locales/en/messages.json
2018-11-18 22:04:33 +01:00
ff81e55839
groupChatReceived webhook fix ( #10802 )
...
* Moved sendGroupChatReceivedWebhooks to group.sendChat function.
* Added test for new functionality.
2018-11-17 10:48:41 +01:00
d74786ef85
Merge branch 'sabrecat/usernames-master' into develop
2018-11-14 08:21:49 -06:00
64a3d08ce3
fix(tests): linting & more expects
...
Also one more tweak for invite validation responsiveness
2018-11-14 07:43:08 -06:00
f635f178da
fix(tests): correct expects
2018-11-14 13:07:44 +00:00
1a7461a8a2
move the update username route to v3 ( #10836 )
2018-11-14 10:40:27 +01:00
239f78674b
fix(usernames): address failing tests
2018-11-14 01:44:09 +00:00
b07dbb7752
Merge branch 'develop' into sabrecat/usernames-master
2018-11-13 14:15:23 -06:00
eca7382545
prevent buying market gear if class doesn't match ( #10818 )
...
* prevent buying market gear if class doesn't match
* add test
2018-11-12 21:32:54 +01:00
4f86abd6b2
Merge branch 'develop' into sabrecat/usernames-master
2018-11-07 08:39:57 -06:00
112e4e1d76
Merge branch 'develop' into sabrecat/usernames-master
2018-11-01 21:51:33 -05:00
eafa2f8cdd
Merge branch 'release' into sabrecat/usernames-master
2018-11-01 14:51:28 -05:00
79c0499672
Mongoose: use $type as the typeKey ( #10789 )
...
* use $type as the typeKey in mongoose
* fix and add tests
2018-10-28 15:42:48 -05:00
dadb752087
Mongoose: use $type as the typeKey ( #10789 )
...
* use $type as the typeKey in mongoose
* fix and add tests
2018-10-28 15:23:41 +01:00
37b29d3449
fix(tests): increase timeout
2018-10-28 13:14:49 +01:00
8e05a1b489
Merge branch 'develop' into sabrecat/usernames-master
2018-10-26 15:45:55 -05:00
56d1b77215
Upgrade sinon ( #10773 )
...
* upgrade sinon
* sinon changes
* fix unit tests
2018-10-26 18:15:28 +02:00
192dc26fbe
Merge branch 'release' into develop
2018-10-23 22:50:49 +00:00
30fd530576
fix(tests): more timeouts fixes
2018-10-23 20:23:52 +02:00
4ed1082558
fix for #10496 : Newly subscribed accounts receive erroneous notification that they have Mystery Items ( #10759 )
...
* fix
Newly subscribed accounts receive erroneous notification that they have Mystery Items
* Added unit test for #10496
* Restored a previous unit test
2018-10-23 13:47:15 +02:00
00717eda76
fix(tests): increase timeout
2018-10-23 13:30:38 +02:00
d1b86e6c14
Remove code for Pusher ( #10774 )
...
* remove pusher
* fix linting
2018-10-23 13:25:52 +02:00
Sabe Jones