f74b4d3e73
Merge branch 'develop' into release
2018-12-20 17:24:59 +00:00
ab6fdb99af
4.77.0
2018-12-20 17:23:29 +00:00
e3efa557dd
chore(i18n): update locales
2018-12-20 17:22:57 +00:00
a6cea47789
feat(event): Winter Wonderland 2018
2018-12-20 11:11:50 -06:00
5a200a88bd
chore(sprites): compile
2018-12-20 09:42:04 -06:00
545499ea0b
WIP(event): partial content build
2018-12-20 09:40:54 -06:00
3e7f4229ec
Merge branch 'release' into develop
2018-12-19 13:03:20 +00:00
56d5f77b6e
4.76.1
2018-12-19 13:02:58 +00:00
efdf5a2e16
chore(i18n): update locales
2018-12-19 13:01:40 +00:00
add3a2887f
fix(css): restore close svg defaults
2018-12-19 06:58:56 -06:00
0ed7c7596a
Merge branch 'release' into develop
2018-12-18 21:32:39 +00:00
55a452694f
4.76.0
2018-12-18 21:32:12 +00:00
cd4d5f83ff
chore(i18n): update locales
2018-12-18 21:31:56 +00: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
bd1f6918ba
fix(sprites): wolf and penguin tweaks
2018-12-18 12:22:46 -06:00
5b21e62647
fix(i18n): format
2018-12-18 15:02:03 +01:00
5e76d6df21
fix(i18n): position of $ sign
2018-12-17 13:12:35 +01:00
7348145b7d
fix(success-modal): misc fixes
2018-12-16 15:39:37 +01:00
ba2832d21f
4.75.5
2018-12-14 21:22:05 +00:00
688f5084a1
chore(i18n): update locales
2018-12-14 21:19:56 +00:00
d5955b8889
Merge branch 'develop' into release
2018-12-14 15:15:06 -06:00
01fd17ee3f
fix(script): revert email query
2018-12-14 15:14:50 -06:00
979497dd35
fix(deletion): user delete bugs
...
Correct lookup in GDPR script, and address a TypeError when deleting a user with no tasks
2018-12-14 00:54:59 +00:00
1d3db244ba
4.75.4
2018-12-11 18:26:58 -06:00
80ca074352
fix(deploy): correct Dockerfile
2018-12-11 18:26:07 -06:00
6d4f9e0759
4.75.3
2018-12-11 20:48:40 +00:00
d096695559
Usernames Misc: Bulk Email and New Party Modal ( #10898 )
...
* feat(migrations): genericize bulk email
* chore(migrations): archive one-offs
* feat(usernames): change create party modal to copy username
* fix(modal): styling
* fix(modal): add Chrome clipboard implementation
2018-12-11 20:48:34 +00:00
a2c8b8b05c
Usernames Misc: Bulk Email and New Party Modal ( #10898 )
...
* feat(migrations): genericize bulk email
* chore(migrations): archive one-offs
* feat(usernames): change create party modal to copy username
* fix(modal): styling
* fix(modal): add Chrome clipboard implementation
2018-12-11 14:47:50 -06:00
8750701c08
Merge branch 'release' into develop
2018-12-11 20:45:44 +00:00
900676bf0a
4.75.2
2018-12-11 20:45:15 +00:00
e219daf44c
chore(i18n): update locales
2018-12-11 20:44:53 +00:00
1b12a6b51f
feat(content): Bird Buddies Bundle
2018-12-11 14:41:09 -06:00
8441b0a3d6
fix http auth env var
2018-12-09 20:12:50 +01:00
0667695390
Payments: Success Messages ( #10903 )
...
* fix v-once
* gems purchase success dialog
* amazon and stripe support for gems message, translations
* subscriptions success message
* subscriptions success message
* group plans success message and many fixes
* finish success messages for payments
* add success modal when gifting from balance
2018-12-09 20:08:01 +01:00
4d322c1bf6
Merge branch 'sukh0128-develop' into develop
2018-12-07 15:20:27 +01:00
a855ddacc7
Merge branch 'develop' of https://github.com/sukh0128/habitica into sukh0128-develop
2018-12-07 15:20:12 +01:00
9d48ef7322
Merge pull request #10896 from AyoubElk/patch-1
...
Fixed typo in folder path
2018-12-07 15:13:08 +01:00
2991f7acfb
4.75.1
2018-12-06 16:23:28 +00:00
9dbfb565bb
chore(i18n): update locales
2018-12-06 16:22:06 +00: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
95f3315796
Fixed typo in folder path
...
The tast test:api:unit:watch should watch the path 'test/api/unit/**/*' instead of the non existent 'test/api/v3/unit/**/*'
2018-12-06 11:26:22 +00:00
18ab57eb91
Merge branch 'release' into develop
2018-12-05 20:44:02 +00:00
0dcbd8ccb8
4.75.0
2018-12-05 20:43:39 +00:00
ed82b46f7b
chore(i18n): update locales
2018-12-05 20:43:23 +00:00
dcc3044685
chore(sprites): compile
2018-12-05 14:39:09 -06:00
5cd62d7052
feat(content): Armoire and BGs 2018-12
2018-12-05 14:38:53 -06:00
5e232d8c9f
Merge branch 'develop' of github.com:sukh0128/habitica into develop
2018-12-04 17:29:16 -06:00
13793f8b3c
revert
2018-12-04 17:28:27 -06:00
55f875f95a
Delete package-lock.json
2018-12-04 17:04:55 -06:00
14576be374
merged
2018-12-04 16:03:11 -06:00
Sabe Jones