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
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
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
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
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
Mira-M
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
Sabe Jones
5fac4a943c
chore(news): Bailey
2019-01-24 13:35:32 -06:00
Sabe Jones
5d0be7bc72
Merge branch 'release' into develop
2019-01-24 13:14:19 -06:00
Sabe Jones
f8d799d55c
chore(news): Bailey
2019-01-18 15:13:25 -06:00
Sabe Jones
5bd9fcc99d
Merge branch 'release' into develop
2019-01-18 14:59:37 -06:00
Sabe Jones
962662fe7c
chore(news): Bailey
2019-01-14 12:38:35 -06:00
Matteo Pagliazzi
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
Sabe Jones
8237b7f2de
chore(news): Bailey
2019-01-11 13:37:58 -06:00
Sabe Jones
1d1b25391f
feat(content): customizations and dinosaurs
2019-01-08 19:30:41 -06:00
negue
61606cb69d
change to User ID - change mail var _DISPLAYNAME _DISPLAY_NAME
2019-01-04 21:04:41 +01:00
Sabe Jones
d22b4bb2f7
feat(content): Armoire and Backgrounds Jan 2019
2019-01-04 13:58:51 -06:00
Juliusdotsh
1e10e20a24
apidocs should say how to provide comment when flagging #10916 ( #10925 )
2019-01-03 11:31:03 +01:00
Sabe Jones
b1aeb8ed87
Merge branch 'release' into develop
2019-01-02 17:08:50 -06:00
Sabe Jones
af40c437be
chore(news): Bailey
...
also fix erroneously active hatching potion and remove concluded bundle
from pinned items
2019-01-02 16:10:57 -06:00
Sabe Jones
a99150c485
Merge branch 'release' into develop
2019-01-01 07:14:04 -06:00
Sabe Jones
696b67204d
fix(lint): ’
2019-01-01 07:13:41 -06:00
Sabe Jones
4f3536e887
Merge branch 'release' into develop
2018-12-31 23:48:59 +00:00
Sabe Jones
f7983f39eb
feat(event): New Year's 2018-19
2018-12-31 17:44:13 -06:00
Rene Cordier
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
negue
19b75c6257
drag tags to reorder ( #10911 )
...
* drag tags to reorder
* change color, remove unneeded sortTag-call
2018-12-23 19:45:05 +01:00
