Sabe Jones
|
d5955b8889
|
Merge branch 'develop' into release
|
2018-12-14 15:15:06 -06:00 |
|
Sabe Jones
|
01fd17ee3f
|
fix(script): revert email query
|
2018-12-14 15:14:50 -06:00 |
|
Sabe Jones
|
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 |
|
Sabe Jones
|
1d3db244ba
|
4.75.4
|
2018-12-11 18:26:58 -06:00 |
|
Sabe Jones
|
80ca074352
|
fix(deploy): correct Dockerfile
|
2018-12-11 18:26:07 -06:00 |
|
Sabe Jones
|
6d4f9e0759
|
4.75.3
|
2018-12-11 20:48:40 +00:00 |
|
Sabe Jones
|
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 |
|
Sabe Jones
|
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 |
|
Sabe Jones
|
8750701c08
|
Merge branch 'release' into develop
|
2018-12-11 20:45:44 +00:00 |
|
Sabe Jones
|
900676bf0a
|
4.75.2
|
2018-12-11 20:45:15 +00:00 |
|
Sabe Jones
|
e219daf44c
|
chore(i18n): update locales
|
2018-12-11 20:44:53 +00:00 |
|
Sabe Jones
|
1b12a6b51f
|
feat(content): Bird Buddies Bundle
|
2018-12-11 14:41:09 -06:00 |
|
Matteo Pagliazzi
|
8441b0a3d6
|
fix http auth env var
|
2018-12-09 20:12:50 +01:00 |
|
Matteo Pagliazzi
|
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 |
|
Matteo Pagliazzi
|
4d322c1bf6
|
Merge branch 'sukh0128-develop' into develop
|
2018-12-07 15:20:27 +01:00 |
|
Matteo Pagliazzi
|
a855ddacc7
|
Merge branch 'develop' of https://github.com/sukh0128/habitica into sukh0128-develop
|
2018-12-07 15:20:12 +01:00 |
|
Matteo Pagliazzi
|
9d48ef7322
|
Merge pull request #10896 from AyoubElk/patch-1
Fixed typo in folder path
|
2018-12-07 15:13:08 +01:00 |
|
Sabe Jones
|
2991f7acfb
|
4.75.1
|
2018-12-06 16:23:28 +00:00 |
|
Sabe Jones
|
9dbfb565bb
|
chore(i18n): update locales
|
2018-12-06 16:22:06 +00: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 |
|
Ayoub El Khattabi
|
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 |
|
Sabe Jones
|
18ab57eb91
|
Merge branch 'release' into develop
|
2018-12-05 20:44:02 +00:00 |
|
Sabe Jones
|
0dcbd8ccb8
|
4.75.0
|
2018-12-05 20:43:39 +00:00 |
|
Sabe Jones
|
ed82b46f7b
|
chore(i18n): update locales
|
2018-12-05 20:43:23 +00:00 |
|
Sabe Jones
|
dcc3044685
|
chore(sprites): compile
|
2018-12-05 14:39:09 -06:00 |
|
Sabe Jones
|
5cd62d7052
|
feat(content): Armoire and BGs 2018-12
|
2018-12-05 14:38:53 -06:00 |
|
Erdenesukh Tsendjav
|
5e232d8c9f
|
Merge branch 'develop' of github.com:sukh0128/habitica into develop
|
2018-12-04 17:29:16 -06:00 |
|
Erdenesukh Tsendjav
|
13793f8b3c
|
revert
|
2018-12-04 17:28:27 -06:00 |
|
Erdenesukh Tsendjav
|
55f875f95a
|
Delete package-lock.json
|
2018-12-04 17:04:55 -06:00 |
|
Erdenesukh Tsendjav
|
14576be374
|
merged
|
2018-12-04 16:03:11 -06:00 |
|
Erdenesukh Tsendjav
|
4cb2c26475
|
The istanbul command string in the gulp-tests.js file for each of the tests had to be changed to just the keyword istanbul instead of pointing to the istanbul file location on WINDOWS machines
|
2018-12-04 15:55:09 -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
|
dd313b17b5
|
fix(migration): correct push op
|
2018-12-03 21:06:23 -06:00 |
|
Sabe Jones
|
bb01475e02
|
Merge branch 'release' into develop
|
2018-12-03 22:54:08 +00:00 |
|
Sabe Jones
|
757959529b
|
4.74.7
|
2018-12-03 22:53:23 +00:00 |
|
Sabe Jones
|
71ad1957b1
|
chore(i18n): update locales
|
2018-12-03 22:52:42 +00:00 |
|
Sabe Jones
|
3ba5ea1d2d
|
chore(news): Bailey
|
2018-12-03 16:50:02 -06:00 |
|
Sabe Jones
|
902da35f2b
|
fix(migration): syntax
|
2018-12-03 22:06:58 +00:00 |
|
Sabe Jones
|
aaa16a9527
|
refactor(migrations): move Take This to new template
also fix linting error in server lib
|
2018-12-03 22:04:52 +00:00 |
|
Sabe Jones
|
b98e95ee45
|
chore(items): deactivate premium potions
|
2018-12-03 15:49:09 -06:00 |
|
Matteo Pagliazzi
|
757160d6b7
|
update karma to fix tests
|
2018-12-03 13:33:58 +01:00 |
|
Matteo Pagliazzi
|
4cf68eb018
|
update package-lock
|
2018-12-03 13:22:23 +01:00 |
|
Matteo Pagliazzi
|
e91d5e5664
|
Merge pull request #10863 from HabitRPG/payments/paypal-amazon-checkout
Paypal and Amazon: Improve checkout experience
|
2018-12-03 12:55:53 +01:00 |
|
Matteo Pagliazzi
|
b9e12aca3e
|
success modal and fix redirects
|
2018-12-02 17:33:21 +01:00 |
|
Jeong Jin Hwi
|
53ca9475ee
|
Accoount Deletion Feedback:update email #10880
|
2018-12-03 01:04:42 +09:00 |
|
Matteo Pagliazzi
|
e212842b50
|
fix redirects and basic success message
|
2018-12-02 15:44:52 +01:00 |
|
Matteo Pagliazzi
|
d2f7cba43d
|
Merge branch 'develop' into payments/paypal-amazon-checkout
|
2018-12-02 14:47:56 +01:00 |
|
Matteo Pagliazzi
|
84558f79d6
|
Merge pull request #10885 from HabitRPG/greenkeeper/initial
Update dependencies to enable Greenkeeper 🌴
|
2018-12-02 14:46:11 +01:00 |
|
Matteo Pagliazzi
|
178e59f287
|
update npm files
|
2018-12-02 14:44:19 +01:00 |
|
greenkeeper[bot]
|
7acccc0763
|
chore(package): update dependencies
|
2018-12-02 13:36:14 +00:00 |
|