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
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
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
Sabe Jones
1d68cbfaa2
chore(news): more Bailey
2018-12-21 14:42:11 -06:00
Sabe Jones
a6cea47789
feat(event): Winter Wonderland 2018
2018-12-20 11:11:50 -06:00
Sabe Jones
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
Sabe Jones
1b12a6b51f
feat(content): Bird Buddies Bundle
2018-12-11 14:41:09 -06:00
Sabe Jones
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
Sabe Jones
18ab57eb91
Merge branch 'release' into develop
2018-12-05 20:44:02 +00:00
Sabe Jones
5cd62d7052
feat(content): Armoire and BGs 2018-12
2018-12-05 14:38:53 -06:00
Matteo Pagliazzi
b66a0b76ef
Merge pull request #10886 from jeongjinhwi/develop
...
Accoount Deletion Feedback:update email #10880
2018-12-04 09:38:33 +01:00
Sabe Jones
bb01475e02
Merge branch 'release' into develop
2018-12-03 22:54:08 +00:00
Sabe Jones
3ba5ea1d2d
chore(news): Bailey
2018-12-03 16:50:02 -06:00
Jeong Jin Hwi
53ca9475ee
Accoount Deletion Feedback:update email #10880
2018-12-03 01:04:42 +09:00
Matteo Pagliazzi
7873800f87
fix(kafka queue): remove leftover code
2018-12-01 12:16:34 +01:00
Sabe Jones
b91ef9f539
chore(news): Last Chance Bailey
...
also give a few more days for items
2018-11-30 14:21:12 -06:00
negue
817c943860
Merge remote-tracking branch 'origin/develop' into negue/flagpm
2018-11-29 19:02:01 +01:00
Sabe Jones
b82660823d
Merge branch 'release' into develop
2018-11-28 20:57:37 +00:00
Sabe Jones
f19e69948a
feat(content): mystery items 2018-11
2018-11-28 14:50:43 -06:00
Phillip Thelen
1ece230621
remove console call
2018-11-28 12:52:08 -06:00
Phillip Thelen
d934d9d759
Move group chat analytics event to server
2018-11-28 12:52:00 -06:00
Phillip Thelen
42b146d5d0
Attach client to chat messages ( #10845 )
...
* Attach client to chat messages
* Word
* Design tweaks
* Fix potential error
2018-11-26 10:45:42 +01:00
Sabe Jones
2cd66436bc
Merge branch 'release' into develop
2018-11-22 18:05:28 -06:00
