a2e5548b1c
Merge branch 'develop' into release
2018-03-22 18:53:40 +00:00
36dabad2c9
fix seasonal shop ( #10164 )
2018-03-22 13:50:58 -05:00
25b9e6f330
Added memwatch for memory leak detection ( #10166 )
2018-03-22 12:44:45 -05:00
d0a786554c
Removed balance check test ( #10159 )
...
* Removed balance check test
* Removed balance check in common
* Removed gem logic and added achievement to tests
2018-03-21 11:53:47 -05:00
de79e0e3c3
add swear word - TRIGGER / CONTENT WARNING: assault, slurs, swearwords, etc
2018-03-21 19:19:13 +10:00
0e74d25ede
Merge branch 'release' into develop
2018-03-20 23:12:23 +00:00
bde8b76da7
4.32.1
2018-03-20 23:11:49 +00:00
4235be4b43
chore(i18n): update locales
2018-03-20 23:11:37 +00:00
3af7f89d10
Merge branch 'release' into develop
2018-03-20 22:57:52 +00:00
396362d27e
4.32.0
2018-03-20 22:57:28 +00:00
972efb1878
fix(seasonal-shop): remove quest
...
it was breaking the API. Wut? Just use canBuy logic and Quest Shop for now
2018-03-20 22:49:54 +00:00
6c18d19d95
fix(test): extra curly
2018-03-20 21:56:55 +00:00
9b8bdb90d8
chore(sprites): compile
2018-03-20 21:31:04 +00:00
a84ea8b1b7
feat(event): Spring Fling 2018
2018-03-20 21:30:43 +00:00
480a839bc5
update package-lock
2018-03-18 16:36:36 +01:00
df9c54fe20
chore(package): update http-proxy-middleware to version 0.18.0 ( #10131 )
2018-03-18 16:33:33 +01:00
8dbab1a976
chore(package): update sinon-chai to version 3.0.0 ( #10096 )
2018-03-18 16:33:19 +01:00
df6088bc6d
fix(package): update url-loader to version 1.0.0 ( #10088 )
2018-03-18 16:31:03 +01:00
f0ff3a4eb6
fix(package): update html-webpack-plugin to version 3.0.0 ( #10070 )
2018-03-18 16:29:25 +01:00
786e4419da
chore(package): update eslint-loader to version 2.0.0 ( #10056 )
2018-03-18 16:28:20 +01:00
fff4ea3ad3
Added popover stats to costume equipment on profile stats - fixes #9280 ( #10136 )
...
* Added popover stats to costume equipment on the stats page of a profile (#9280 )
* Changed popover position to bottom for equip and costume items.
* Fixed indent on line 160
* Changed escaped double quotes to single quotes for readability
2018-03-18 16:24:41 +01:00
e18e89bc10
Task page - task filters v2 ( #10053 )
...
* update column.vue, getters/task.js, getters/user.js and add unittests and helpers
* add vue-test-utils pkg + unit test for column.vue
* add unit test column.vue
* update unit tests
* fix linting errors
2018-03-18 16:23:58 +01:00
68ea28305d
fix linting issues
2018-03-17 22:36:17 +01:00
242b3508a1
Update Staff list in the tavern to make staff names clickable to pull up staff profiles. ( #10107 )
...
* Update Staff list in the tavern to make staff names clickable to pull up staff profiles.
fixes #9290
* Addressing PR comments.
2018-03-17 22:29:52 +01:00
8c316d939f
Updated get challenges api to return challenges sorted by which challenges include the habitica_official category ( #10079 )
...
and removed sorting on the official flag of the challenges object.
fixes #9955
2018-03-17 22:26:24 +01:00
45eb19e992
Update the API to prevent the user from leaving a group if they are the only member and have a quest active. ( #10091 )
...
* Update the API to prevent the user from leaving a group if they are the only member and have a quest active.
fixes #10068
* fixing api doc
2018-03-17 22:26:07 +01:00
3ad0ffcaec
Escaping regex characters from user input before searching for groups. ( #10092 )
...
fixes #9953
2018-03-17 22:25:50 +01:00
fef8929dd9
Fixes start date updating the repeat on day for dailies repeated monthly ( #10095 )
...
fixes # 9200
2018-03-17 22:25:34 +01:00
911f894750
Fixing edit profile page so blurb can be editted after reload. ( #10097 )
...
fixes #10032
2018-03-17 22:25:17 +01:00
d4e2f5ac9e
fix: Fixing xml data export 500 error. ( #10114 )
...
* fix: Fixing xml data export 500 error.
fixes #10100
* Removing outdated comment.
* Making xml data export test pass consistently.
2018-03-17 22:24:40 +01:00
e43749bed1
Stats over 3 digits overlap ( fixes #10033 ) ( #10133 )
...
* Formatted stats
* small changes
* Fixed issues as per comments
2018-03-17 22:23:55 +01:00
8be29e27d0
Hide "Delete Completed" To-Dos button on Challenge or Group Task Board - fixes #9935 ( #10128 )
...
* only show delete to-dos for user's task page
* remove stray spaces
2018-03-17 22:22:12 +01:00
301668fe22
fix: you are already in group message - fixes #10119 ( #10122 )
...
* add youAreAlreadyInGroup message
* add test for youAreAlreadyInGroup message
* update youAreAlreadyInGroup message
2018-03-17 22:21:16 +01:00
767f3ebe12
Add space in profile modal to make it consistent with other text ( #10103 )
2018-03-17 22:19:58 +01:00
25e6f8e26e
Add Completion Text to Older Quests #10066 ( #10081 )
2018-03-17 22:18:54 +01:00
1c6608d071
fix flower avatar in chat #10015 ( #10040 )
2018-03-17 22:17:47 +01:00
d2b160438c
Added margin to buttons on Settings-page ( #10034 )
...
* Added margin to buttons on Settings-page
* Added bottom margin for 'Enable Class System' button
2018-03-17 22:16:55 +01:00
37d70f089c
Removes video from presskit.zip ( #10013 )
...
* presskit without video
* Boss/ update pics
* Logo/ change broken pics
* updated broken files
* Delete Level Up.PNG
* Add files via upload
* update outdated icons
* update party
* upload updated presskit
2018-03-17 22:15:40 +01:00
04b4912d59
Fix password reset when querying for emails with upcase characters ( fixes #9059 ) ( #9707 )
...
* downcase updating an email to be consistent with creating
* add tests to ensure downcase of email for create/update
* create migration to downcase existing User objects
* delete 'only'
* change gmail to example
* add trailing comma from lint error
* search for emails with at least one capital letter
* fix query in order to search for any email with at least one capital letter
* batch process effected users with at least one capital in email
* update script for batch process effected users
2018-03-17 22:13:54 +01:00
b9a6d9ceec
Allow Un-subscribed Users to Claim Mystery Items ( #9270 )
...
Remove restriction on mystery/special inventory items that prevents
non-subscribed users from seeing the items. Organize the imports on the
page.
Resolves: Issue #9228
2018-03-17 22:13:31 +01:00
2a97915477
Purchase API Refactoring: Market Gear ( #10010 )
...
* convert buyGear to buyMarketGearOperation + tests
* move NotImplementedError
2018-03-17 21:56:19 +01:00
29a9deaeb8
prevent lint indent warning on multi-line reduce function ( #10145 )
2018-03-17 21:13:55 +01:00
0fcc1f2080
correct position of pets in the profile overview - fixes #10104 ( #10144 )
2018-03-17 21:13:35 +01:00
9287098e70
fix #10116 ( #10143 )
2018-03-17 21:13:12 +01:00
1812f63812
raise coverage for user api calls ( #10099 )
...
* user integration tests
* fix lint
2018-03-17 21:12:53 +01:00
3d4107db3e
checkout of the Inn - banner ( #9835 )
...
* show resting banner
* resume damage
* replace colors by variables
* remove indentation
2018-03-17 21:12:25 +01:00
67e750a81c
4.31.1
2018-03-15 21:19:44 +00:00
7fe62a731b
Fixed gem amount on master key ( #10140 )
...
* Fixed gem amount on master key
* fix(news): update Bailey text
2018-03-15 16:19:11 -05:00
3c224fe353
Merge branch 'release' into develop
2018-03-15 19:10:56 +00:00
bb6f465ac8
4.31.0
2018-03-15 19:10:37 +00:00
SabreCat