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
e277a088ee
Added some additional comments
2019-03-17 04:20:21 -04:00
e083df64e4
fixes #11047 Switches Hall query to use lowercase name
2019-03-17 04:00:50 -04:00
2a225c2376
chore(event): end Pi Day
2019-03-15 10:31:08 -05:00
9ad50be6ca
fix(test): update food const
2019-03-14 07:32:32 -05: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
98fd509530
Hotfix: correct issues from PRs rollout ( #10993 )
...
* fix(various): correct issues from PRs rollout
1. Send Gems modal opens from profiles again
2. Contributor titles appear on hover again
3. Tags dropdown in tasks appears again
4. Only user's own @mentions get highlighted again
* fix(test): correct order of css classes in expect
2019-02-15 16:01:33 -06:00
4d1b239231
Track specific items dropped by Armoire ( #10977 )
...
* feat(analytics): track specific items dropped by Armoire
* fix(lint): remove console log
* fix(analytics): address test failures
* fix(analytics): add missed if block
* fix(analytics): seriously tho actually fix
2019-02-10 19:30:49 +01:00
b9aaccdf13
refactored the highlightUsers-method, only matches mentions and not emails ( #10982 )
2019-02-10 19:27:22 +01:00
0155491a68
Upgrade vue ( #10983 )
...
* deps: update
* fix tests
2019-02-10 19:03:35 +01:00
0cbd6fb4d7
Merge branch 'develop' of https://github.com/HabitRPG/habitica into negue/flagpm
...
# Conflicts:
# website/client/components/chat/chatCard.vue
# website/client/components/header/menu.vue
2019-02-07 19:16:10 +01:00
b35bd18282
Merge branch '10954-wikiafix' of https://github.com/GiacomoLaw/habitica into GiacomoLaw-10954-wikiafix
2019-02-07 18:20:05 +01:00
92f2079b76
fix emails in chat ( #10912 )
...
* additional regex checks to ignore the <tag attribute="content">
* extract highlightUsers method - add test
* refactor highlight regex
* refactor the regex without `lookbehind`
* remove unneeded regex
2019-02-07 17:55:36 +01:00
fdc0e0f5fe
Merge branch 'release' into develop
2019-02-02 13:11:25 -06:00
5b7c4bf03f
fix(event): end Cake
2019-02-02 13:10:56 -06:00
c1cad5c0a9
Merge branch 'release' into develop
2019-01-31 17:12:21 -06:00
b1f42dcac9
feat(content): Habitica Birthday 2019
2019-01-31 17:10:56 -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
08c8f26b80
Merge branch 'develop' into 10954-wikiafix
2019-01-26 18:03:50 +00: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
9e6394c38c
changed wikia links to fandom
...
Fixes issue #10954
2019-01-24 11:21:52 +00: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
0b352b9103
Unit Tests; 1 fix to appFooter debug menu ( #10894 )
...
* Built
* Update .editorconfig
* Fixed filename ('translaotr.js' => 'translator.js')
* Fixed Filename
* User Unit Tests
* Writing tests for avatar.vue
* writing tests for getters/user.js
* Writing Tests for avatar.vue
* Writing Tests for avatar.vue
* writing tests for store/getters/user.js
* renamed file
* Integrated test into user.test.js
* Reverting
* Fetching most recent version
* +1 Level now adds a level
* updating to current version
* Minor edits to pass lint test
* Removing non-functional Tests
* Cleaning up
2018-12-23 19:45:59 +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
e2c5b9058b
more checks on the item.klass, also added the specialClass checks ( #10859 )
2018-11-22 14:35:34 +01: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
Matteo Pagliazzi