Sabe Jones
7954763738
Merge branch 'release' into develop
2017-06-22 23:05:23 +00:00
Sabe Jones
d062fd8507
3.98.0
2017-06-22 23:04:42 +00:00
Sabe Jones
ceb10137a2
chore(i18n): update locales
2017-06-22 23:04:09 +00:00
SabreCat
58330a4d01
chore(sprites): compile
2017-06-22 22:55:36 +00:00
SabreCat
678f48fde9
feat(content): June 2017 subscriber items
2017-06-22 22:54:17 +00:00
Alys
a642d94443
fix bug that prevented sending of emails to admin addresses ( #8832 )
2017-06-22 14:33:27 -07:00
Keith Holliday
39a112b605
Payments gem reset ( #8712 )
...
* Added gem reset if user does not have date last updated set
* Fixed login of adding updated date
2017-06-22 14:21:09 -07:00
Keith Holliday
8c8f0ea201
Used ajax when canceling from the website ( #8697 )
...
* Used ajax when canceling from the website
* Fixed grammar issue
2017-06-22 14:13:53 -07:00
Sabe Jones
773d546e4f
Merge branch 'release' into develop
2017-06-21 04:01:33 +00:00
Sabe Jones
f269d381da
3.97.2
2017-06-21 04:00:53 +00:00
Sabe Jones
3483f69559
fix(sprites): realign healer fins
2017-06-21 03:59:51 +00:00
Sabe Jones
9ada0c9b02
Merge branch 'release' into develop
2017-06-21 01:52:36 +00:00
Sabe Jones
8bbe9ac36e
3.97.1
2017-06-21 01:52:08 +00:00
Sabe Jones
75b93e6ec4
fix(sprites): unbleach Matt
2017-06-21 01:51:50 +00:00
Sabe Jones
bd9bebe591
Merge branch 'release' into develop
2017-06-21 01:26:18 +00:00
Sabe Jones
f7b298d506
3.97.0
2017-06-21 01:25:54 +00:00
Sabe Jones
4bd2932955
chore(i18n): update locales
2017-06-20 22:18:38 +00:00
SabreCat
7060f5941d
chore(sprites): compile
2017-06-20 22:10:04 +00:00
SabreCat
21379ee357
feat(event): Summer Splash 2017
2017-06-20 22:08:38 +00:00
Keith Holliday
fe62713809
Added migration to go from prod to test db ( #8816 )
2017-06-20 06:17:10 -06:00
Sabe Jones
ca7272a987
Merge branch 'release' into develop
2017-06-19 22:44:02 +00:00
Sabe Jones
cb46cd8eeb
3.96.2
2017-06-19 22:43:34 +00:00
Sabe Jones
d9d02ca81d
chore(i18n): update locales
2017-06-19 22:43:18 +00:00
Sabe Jones
50c216eb41
chore(news): Bailey announcement
2017-06-19 22:38:06 +00:00
SabreCat
2c60fade01
Merge branch 'release' into develop
2017-06-17 20:20:52 +00:00
SabreCat
6bdf8fdabc
3.96.1
2017-06-17 20:19:35 +00:00
SabreCat
3db304b6bf
fix(potions): disable Florals
...
Also add sprite for Bars of Soap in Attack of the Mundane 1
2017-06-17 20:18:36 +00:00
Matteo Pagliazzi
ea2788ab2f
fix gulp in production
2017-06-17 19:02:03 +02:00
Sabe Jones
5e111f6f6c
Merge branch 'release' into develop
2017-06-16 20:42:52 +00:00
Sabe Jones
ea85a8a3a8
3.96.0
2017-06-16 20:42:15 +00:00
Sabe Jones
e811a2700e
feat(migration): update achievements ( #8825 )
2017-06-16 13:41:25 -07:00
Sabe Jones
bf76f823d5
chore(i18n): update locales
2017-06-16 17:43:26 +00:00
Sabe Jones
83b573dcfc
chore(i18n): update locales
2017-06-16 17:42:28 +00:00
Matteo Pagliazzi
c4fa9426b3
Client Tasks v1 / Bootstrap configurable ( #8822 )
...
* make bs4 configurable, change gutters to match zeplin\s
* correctly customize gutters
2017-06-16 18:58:34 +02:00
Matteo Pagliazzi
042e5a8d63
Client Fixes ( #8821 )
...
* new client: fix animation flickering
* fix transitions
* update copy
2017-06-16 18:07:24 +02:00
Keith Holliday
f7ce269f3c
Add false return when repeats are empty ( #8777 )
...
* Add false return when repeats are empty
* Added front end check for repeats on monthly-daysOfWeek
* Fixed tests with static date
2017-06-14 11:27:50 -07:00
Sabe Jones
c084f8a2b9
Merge branch 'release' into develop
2017-06-13 21:25:41 +00:00
Sabe Jones
c1c42e17b8
3.95.0
2017-06-13 21:21:55 +00:00
Sabe Jones
306a782e7a
chore(i18n): update locales
2017-06-13 21:20:48 +00:00
SabreCat
20178c0722
chore(sprites): compile
2017-06-13 21:10:02 +00:00
SabreCat
256e2e809c
feat(content): Nudibranch Pets
2017-06-13 21:09:13 +00:00
Matteo Pagliazzi
592345e22c
Party members in header v2 ( #8815 )
...
* update comemnt
* flyout on hover
* fix hasClass and isBuffed
* polish members in party header
2017-06-13 20:55:45 +02:00
Matteo Pagliazzi
292b2acb1e
client: fix production path for chunks
2017-06-08 19:17:35 -07:00
Matteo Pagliazzi
977f9d5174
Client: party members in header ( #8804 )
...
* wip party members in header
* wip
* add inbox routes back
* polishing
2017-06-08 18:24:40 -07:00
Matteo Pagliazzi
85644fdc1b
client: user -list-detail -> member-details
2017-06-08 14:36:56 -07:00
Matteo Pagliazzi
138b5c4bdb
wip client/header-party-members ( #8803 )
2017-06-08 14:33:23 -07:00
Keith Holliday
52edb8a8da
New client members ( #8795 )
...
* Began styling member modal
* Added store and updated modal styles
* Began converting angular
* Ported over angular routes
* Fixed lint issues
2017-06-08 14:27:22 -07:00
Keith Holliday
1999e1098e
Allow guilds edit ( #8800 )
...
* test: test that admin users can update guilds
* test: test admin removeMember privileges
* fix: allow admins to edit guilds
* fix: add edit guild options for admins
* test: test that admin can't remove current leader
* Add error msg for removing current leader
* Taskwoods Quest Line (#8156 )
* feat(content): Gold Quest 2016-10
* chore(news): Bailey
* chore(i18n): update locales
* chore(sprites): compile
* 3.49.0
* chore: update express
* Fix for the ReDOS vulnerability
habitica is currently affected by the high-severity [ReDOS vulnerability](https://snyk.io/vuln/npm:tough-cookie:20160722 ).
Vulnerable module: `tough-cookie`
Introduced through: ` request`
This PR fixes the ReDOS vulnerability by upgrading ` request` to version 2.74.0
Check out the [Snyk test report](https://snyk.io/test/github/HabitRPG/habitica ) to review other vulnerabilities that affect this repo.
[Watch the repo](https://snyk.io/add ) to
* get alerts if newly disclosed vulnerabilities affect this repo in the future.
* generate pull requests with the fixes you want, or let us do the work: when a newly disclosed vulnerability affects you, we'll submit a fix to you right away.
Stay secure,
The Snyk team
* Documentation - coupon
closes #8109
* fix(client): Allow member hp to be clickable
fixes #8016
closes #8155
* chore(npm): shrinkwrap
* test: test isAbleToEditGroup
* Add isAbleToEditGroup to groupsCtrl
* Remove unnecessary ternary
* Fix linting
* Move edit permission logic out to groupsCtrl
* fix: change ternary to boolean
* Fix linting
* Fixed merge issues
2017-06-08 13:45:24 -07:00
Keith Holliday
4d3a0c0571
Fixed issue with repeat settings turning false ( #8773 )
2017-06-08 12:18:49 -07:00
Matteo Pagliazzi
706de95458
Client: Header & Menu & Icons ( #8770 )
...
* header revamp - wip
* fix webpack fonts
* wip icons
* fix compilation errors
* implement icons loading without iconmoo
* new svg implementation
* wip
* fix issues with svgs
* fix issues with svgs
* fix bits svg
* fix displaying of pet in avatar
* avatar class icon
* no party header
* update navigation
* split code by route
* round gems and gp
* add string for faqs
* fix icons in css
2017-06-08 12:04:19 -07:00
