95e541ae75
Merge branch 'release' into develop
2019-04-01 10:27:24 -05:00
07e4b2c463
fix(event): include stable
2019-04-01 10:24:55 -05:00
e749e42665
feat(event): April Fools 2019
2019-04-01 10:17:05 -05:00
0b82722d27
performance: private messages - API ( #11077 )
...
* paging for inbox
* clean up
2019-03-31 20:52:53 +02:00
0d12686a10
chore(news): Bailey
2019-03-29 13:57:02 -05:00
e58fbcc34c
chore(news): Bailey
2019-03-28 16:23:11 -05:00
fc08b753cd
Merge branch 'release' into develop
2019-03-26 20:23:22 -05:00
50278db1d6
feat(content): Mystery Items March 2019
2019-03-26 20:22:26 -05: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
2f792d51f8
Merge pull request #11069 from randi2kewl/11047-hall-search-case-insensitive
...
Fixes #11047 Hall search case insensitive
2019-03-23 18:22:53 +01:00
3e45f5af41
Add check for the existence of user's password before attempting to authenticate
2019-03-22 19:30:00 +08:00
928327e02a
feat(content): Magic Hatching Potions March 2019
2019-03-21 16:34:19 -05:00
e0291cf432
feat(event): Spring Fling 2019
2019-03-19 19:52:59 -05:00
e083df64e4
fixes #11047 Switches Hall query to use lowercase name
2019-03-17 04:00:50 -04:00
8bcd93075b
chore(news): Bailey
2019-03-12 19:29:51 -05:00
6668aae89b
feat(event): Pi Day
2019-03-12 17:10:38 -05:00
201085651b
Merge branch 'release' into develop
2019-03-05 15:44:04 -06:00
9c797e6a54
feat(content): Armoire and Backgrounds March 2019
2019-03-05 15:43:19 -06:00
080c4b3e20
Merge branch 'develop' into negue/flagpm
2019-03-03 17:12:11 +01:00
55bd35d7d3
chore(monthly): announce Challenges, end potions
2019-03-01 16:22:19 -06:00
75f6398de2
chore(news): Bailey
2019-02-28 16:02:46 -06:00
962236846a
Merge branch 'release' into develop
2019-02-25 17:00:41 -06:00
fe04b56ecc
feat(content): February Mystery Items
2019-02-25 16:58:56 -06: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
b21cd4a2b6
feat(content): Mythical Marvels Bundle
...
and end Valentine's miscellany
2019-02-19 18:06:21 -06:00
165ca8737b
chore(news): Blog Bailey
2019-02-14 13:25:40 -06:00
d675e80555
fix(lint): use curly apostrophe and single quotes
2019-02-12 13:48:13 -06:00
b721155f01
feat(event): Valentine's 2019 and Magic Hatching Potions
2019-02-12 07:19:58 -06: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
93290ec6d5
Merge branch 'release' into develop
2019-02-05 15:44:40 -06:00
6ab3bac96c
feat(content): Armoire and BGs
2019-02-05 15:42:33 -06:00
f590c485dc
Merge branch 'release' into develop
2019-02-04 16:52:53 -06:00
0910f65fc0
chore(news): Bailey
2019-02-04 16:52:17 -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
c86da9783b
Merge branch 'release' into develop
2019-01-30 09:06:42 -06:00
00a686dcf6
feat(content): subscriber items Jan 2019
2019-01-28 16:10:22 -06: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
5fac4a943c
chore(news): Bailey
2019-01-24 13:35:32 -06:00
5d0be7bc72
Merge branch 'release' into develop
2019-01-24 13:14:19 -06:00
f8d799d55c
chore(news): Bailey
2019-01-18 15:13:25 -06:00
5bd9fcc99d
Merge branch 'release' into develop
2019-01-18 14:59:37 -06:00
962662fe7c
chore(news): Bailey
2019-01-14 12:38:35 -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
8237b7f2de
chore(news): Bailey
2019-01-11 13:37:58 -06:00
1d1b25391f
feat(content): customizations and dinosaurs
2019-01-08 19:30:41 -06:00
61606cb69d
change to User ID - change mail var _DISPLAYNAME _DISPLAY_NAME
2019-01-04 21:04:41 +01:00
d22b4bb2f7
feat(content): Armoire and Backgrounds Jan 2019
2019-01-04 13:58:51 -06:00
1e10e20a24
apidocs should say how to provide comment when flagging #10916 ( #10925 )
2019-01-03 11:31:03 +01:00
Sabe Jones