Commit Graph

1148 Commits

Author SHA1 Message Date
Sabe Jones 0d12686a10 chore(news): Bailey 2019-03-29 13:57:02 -05:00
Sabe Jones e58fbcc34c chore(news): Bailey 2019-03-28 16:23:11 -05:00
Sabe Jones fc08b753cd Merge branch 'release' into develop 2019-03-26 20:23:22 -05:00
Sabe Jones 50278db1d6 feat(content): Mystery Items March 2019 2019-03-26 20:22:26 -05:00
Matteo Pagliazzi 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
Matteo Pagliazzi 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
Chester Sng 3e45f5af41 Add check for the existence of user's password before attempting to authenticate 2019-03-22 19:30:00 +08:00
Sabe Jones 928327e02a feat(content): Magic Hatching Potions March 2019 2019-03-21 16:34:19 -05:00
Sabe Jones e0291cf432 feat(event): Spring Fling 2019 2019-03-19 19:52:59 -05:00
Randi Miller e083df64e4 fixes #11047 Switches Hall query to use lowercase name 2019-03-17 04:00:50 -04:00
Sabe Jones 8bcd93075b chore(news): Bailey 2019-03-12 19:29:51 -05:00
Sabe Jones 6668aae89b feat(event): Pi Day 2019-03-12 17:10:38 -05:00
Phillip Thelen 51f66af320 Improve auto completing 2019-03-06 12:59:57 +01:00
Sabe Jones 201085651b Merge branch 'release' into develop 2019-03-05 15:44:04 -06:00
Sabe Jones 9c797e6a54 feat(content): Armoire and Backgrounds March 2019 2019-03-05 15:43:19 -06:00
Matteo Pagliazzi 080c4b3e20 Merge branch 'develop' into negue/flagpm 2019-03-03 17:12:11 +01:00
Sabe Jones 55bd35d7d3 chore(monthly): announce Challenges, end potions 2019-03-01 16:22:19 -06:00
Sabe Jones 75f6398de2 chore(news): Bailey 2019-02-28 16:02:46 -06:00
Phillip Thelen 5e50e98738 limit autocomplete results to 5 2019-02-28 16:22:25 +01:00
Phillip Thelen 601811eac6 fix lint error 2019-02-28 15:30:33 +01:00
Phillip Thelen 071dffe8f2 Add check to make sure users don’t search for parties/guilds they are not part of 2019-02-28 15:27:58 +01:00
Sabe Jones 962236846a Merge branch 'release' into develop 2019-02-25 17:00:41 -06:00
Sabe Jones fe04b56ecc feat(content): February Mystery Items 2019-02-25 16:58:56 -06:00
Chester Sng 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
Sabe Jones b21cd4a2b6 feat(content): Mythical Marvels Bundle
and end Valentine's miscellany
2019-02-19 18:06:21 -06:00
Phillip Thelen 1173a9b586 Correctly handle autocomplete for public and private guilds 2019-02-15 15:56:18 +01:00
Sabe Jones 165ca8737b chore(news): Blog Bailey 2019-02-14 13:25:40 -06:00
Phillip Thelen 076e1b851e Merge branch 'develop' into phillip/autocomplete-username 2019-02-14 18:02:19 +01:00
Phillip Thelen 718ea926d8 add optional parameters to limit autocompletion to specific group 2019-02-14 17:59:51 +01:00
Sabe Jones b711c1672b fix(lint): use curly apostrophe and single quotes 2019-02-12 13:48:53 -06:00
Sabe Jones d675e80555 fix(lint): use curly apostrophe and single quotes 2019-02-12 13:48:13 -06:00
Phillip Thelen 328ecb22d8 Fix lint error 2019-02-12 15:36:49 +01:00
Phillip Thelen be5137d14d Merge branch 'develop' into phillip/autocomplete-username 2019-02-12 14:40:47 +01:00
Phillip Thelen 3fec6fca0e optimize autocomplete regex 2019-02-12 14:38:45 +01:00
Phillip Thelen bb674d1539 Cache username autocomplete requests 2019-02-12 14:31:30 +01:00
Sabe Jones b721155f01 feat(event): Valentine's 2019 and Magic Hatching Potions 2019-02-12 07:19:58 -06:00
Phillip Thelen 59dbd12576 Fix sending private messages 2019-02-08 17:40:27 +01:00
negue 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
Phillip Thelen e9d5123f8a fix failing tests 2019-02-07 18:02:23 +01:00
Phillip Thelen 82863bd947 optimize mention highlighting 2019-02-06 15:00:41 +01:00
Sabe Jones 93290ec6d5 Merge branch 'release' into develop 2019-02-05 15:44:40 -06:00
Sabe Jones 6ab3bac96c feat(content): Armoire and BGs 2019-02-05 15:42:33 -06:00
Phillip Thelen 8618913a75 Merge branch 'develop' of https://github.com/HabitRPG/habitica into autocomplete-username
# Conflicts:
#	package.json
2019-02-05 16:48:06 +01:00
Sabe Jones f590c485dc Merge branch 'release' into develop 2019-02-04 16:52:53 -06:00
Sabe Jones 0910f65fc0 chore(news): Bailey 2019-02-04 16:52:17 -06:00
Sabe Jones c1cad5c0a9 Merge branch 'release' into develop 2019-01-31 17:12:21 -06:00
Sabe Jones b1f42dcac9 feat(content): Habitica Birthday 2019 2019-01-31 17:10:56 -06:00
Sabe Jones c86da9783b Merge branch 'release' into develop 2019-01-30 09:06:42 -06:00
Sabe Jones 00a686dcf6 feat(content): subscriber items Jan 2019 2019-01-28 16:10:22 -06:00
negue faa0611ab2 Merge branch 'develop' of https://github.com/HabitRPG/habitica into negue/flagpm 2019-01-27 18:14:51 +01:00