4618fd8954
Merge branch 'release' into develop
2017-11-20 19:21:17 +00:00
7193cc6bae
chore(i18n): update locales
2017-11-20 19:20:03 +00:00
20a99e526d
Should do diff week fix ( #9551 )
...
* Fixed week difference when changing year
* Added year switchover test
* Fixed start date setting
2017-11-20 12:22:01 -06:00
9c2f5213cb
Challenge fixes ( #9528 )
...
* Added challenge member search to progress dropdown
* Added leave challenge modal
* Allowed editing for challenge leader only
* Pevented users from editing challenge task info
* Set default progress default to daily
* Removed reward filters from user challenge progress
2017-11-17 17:13:07 -06:00
c06d5107ac
Merge branch 'release' into develop
2017-11-17 22:50:27 +00:00
b28189fff5
chore(i18n): update locales
2017-11-17 22:30:34 +00:00
2a5e9c0780
feat(event): Turkey Day 2017
...
and (content) November Subscriber Items
2017-11-17 22:21:05 +00:00
67564317fb
Group plan fixes ( #9518 )
...
* Fixed group plan editing
* Added translations
* Abstracted query for group or challenge tasks
2017-11-17 20:31:39 +11:00
be5d776fb4
chore(i18n): update locales
2017-11-16 22:07:54 +00:00
8d444980de
remove unneeded space from in front of a full stop
2017-11-16 19:29:38 +10:00
08ccd595f2
Add quantity information when purchasing items ( #9481 )
2017-11-16 10:08:11 +01:00
c5296d4cb0
Add variable placeholder. ( #9465 )
...
Changes the character translation string `charactersRemaining` in
groups.json to include a variable placeholder `<%= characters %>`
2017-11-15 17:41:18 +01:00
229fd06ee3
Removed "Tag list in tasks starts collapsed" settings and strings ( #9406 )
2017-11-15 17:37:15 +01:00
eb8f84aae0
#9354 Indicate that Orb of Rebirth is instant ( #9357 )
...
* #9354 Indicate that Orb of Rebirth is instant
Clarified the text
* #9354 Indicate that Orb of Rebirth is instant
Reverted changes in all but locales/en
2017-11-15 17:35:51 +01:00
e39b80bb9a
changed to 'createChallengeCloneTasks' ( #9300 )
...
* changed to 'createChallengeCloneTasks'
* createChallengeCloneTasks
* Added new i18n strings
2017-11-15 17:34:33 +01:00
838b9a5822
Merge branch 'release' into develop
2017-11-15 01:03:07 +00:00
2bf0fdf4a2
chore(i18n): update locales
2017-11-15 01:00:56 +00:00
dbc5b9f850
feat(content): Yarn Pet Quest
2017-11-15 00:53:10 +00:00
c43ca62bc4
Added check for balance with respect to quantity ( #9469 )
2017-11-14 16:55:08 -07:00
3f92317b9e
Revert "Implements repeat every X days since last completion ( Fixes #6941 ) ( #8962 )"
...
This reverts commit 9d69d4b863
2017-11-09 22:13:34 +00:00
0d2737572d
Merge branch 'release' into develop
2017-11-09 17:57:48 +00:00
28149202db
chore(i18n): update locales
2017-11-09 17:53:06 +00:00
4b23cd9f23
add missing string for dateEndNovember
2017-11-09 17:46:12 +00:00
8aaabdc086
add missing removeInvite string
2017-11-09 17:45:59 +00:00
74d8ecc732
Merge branch 'release' into develop
2017-11-09 17:24:48 +00:00
63c8a09e22
add missing string for dateEndNovember
2017-11-09 21:58:16 +10:00
865f623c99
add missing removeInvite string
2017-11-09 18:16:58 +10:00
993df72708
chore(i18n): update locales
2017-11-07 23:53:47 +00:00
50d3226a86
feat(content): change to Thunderstorm Hatching Potions
2017-11-07 22:02:46 +00:00
9d69d4b863
Implements repeat every X days since last completion ( Fixes #6941 ) ( #8962 )
...
* Implemented repeat after completion
* Added tests for repeat after completion in shouldDo.test.js
* Remove lastTicked
* Undoes removal of website/client/README.md
2017-11-07 12:56:46 -06:00
12fd79059b
adjust login messages to indicate case-sensitivity and hint about google sign-in
2017-11-04 20:34:17 +10:00
232061a629
improve wording for Brutal Smash skill
2017-11-04 20:24:35 +10:00
3fcc1c522d
allow "visit the stable" text to be translated
2017-11-04 20:16:47 +10:00
286db39478
chore(i18n): update locales
2017-11-03 03:04:15 +00:00
f8876fe055
feat(content): Backgrounds and Armoire 2017-11
...
End Habitoween and Fall Festival
2017-11-03 01:56:15 +00:00
a208ba4aba
Tasks v2 Part 2 ( #9236 )
...
* start updating colors for tasks controls
* finish updating controls colors
* change hoevr behavior
* change transition duration
* update color with transition
* refactor menu wip
* wip
* upgrade vue deps
* fix warnings
* fix menu
* misc fixes
* more fixes
* fix badge
* fix margins in menu
* wip tooltips
* tooltips
* fix checklist colors
* add badges
* fix quick add input
* add transition to task controls too
* add batch add
* fix task filtering
* finish tasks badges
* fix menu
* upgrade deps
* fix shop items using all the same image
* fix animation
* disable client tests until we remove phantomjs
* revert changes to tasks colors
* fix opacity in task modal inputs
* remove client unit tests from travis
* wip task dropdown
* fix z-index for task footer/header
* fixes and add files
* fixes
* bigger clickable area
* more space to open task dropdown
* droddown position
* fix menu position
* make sure other dropdowns get closed correctly
* fixes
* start to fix z-index
* draggable = false for task dropdown
* fix for dropdown position
* implement move to top / bottom
* fix push to bottom
* typo
* fix drag and drop
* use standard code
* wider click area for dropdown
* unify badge look
* fix padding
* misc fixes
* more fixes
* make dropdown scrollable
* misc fixes
* fix padding for notes
* use existing code instead of new props
2017-11-02 21:07:38 +01:00
3e37941e0a
Bulk stats ( #9260 )
...
* Reorganized stats
* Organized allocation common code
* Added bulk allocate to common
* Added allocate bulk route
* Fixed structure and lint
* Fixed import and apidoc
2017-10-31 12:57:44 -06:00
e7ec9a6d65
chore(i18n): update locales
2017-10-30 20:49:09 +00:00
d5cedaa925
feat(event): Habitoween
2017-10-30 20:40:29 +00:00
c39505d41c
Hotfix/add autoreload ( #9269 )
...
* Added auto refresh on server update back
* Fixed lint
* Updated copy
2017-10-25 15:22:26 -05:00
6bc70ca471
Hotfix/oct 24 fixes ( #9261 )
...
* Removed max height from text section
* Added items to mystery sets
* Group manager fixes
* Fixed promo code apply
2017-10-24 17:41:36 -05:00
31281b43d3
chore(i18n): update locales
2017-10-24 20:34:47 +00:00
dc3ee25e65
feat(content): subscriber items
...
Also fix(sprites): resize and recanvas gift boxes
2017-10-24 20:21:30 +00:00
7fe2504906
Bulk purchasing ( #9196 )
...
* Moved buy tests
* Added mystery buy to buy.js
* Added quest purchasing to buy
* Added buy special
* Moved integration tests to buy folder
* Removed buyGear dependency
* Removed buyArmoire dependency
* Removed buyHealthPotion dependency
* Removed myster, quest and special dependency
* Replaced functions with factory
* Added bulk purchasing to common
* Added bulk purchasing to the api
* Added bulk purchasing to client
* Refactored purchasing function to reduce long method
* Added bulk purchase to gem purchases
* Added bulk purchasing to api
* Added bulk purchasing to gem items on client
* Removed bulk from equipment
* Removed recentlyPurchased
* Fixed style issues and prevented puchasing more gems than are left
* Fixed lint
* Fixed missing keys
* Fixed gem amount notice
* Added quest modal to pinned item
* Added bulk purchase to gem modal
* Fixed styles
* Fixed bulk purchase for spells
* Fixed modal size
* Hid autofill
2017-10-23 16:05:35 -05:00
b74cee3d21
API Token Changes ( #9202 )
...
* hide API token by default
* wip
* add route to reset the api token
* remove dead code
2017-10-23 22:58:33 +02:00
824bf62e0a
Force refresh is server version is updated ( #9239 )
...
* Force refresh is server version is updated
* Added reload true
* Added confirmation of update
* Forced refresh on cron
* Updated response tests
2017-10-23 12:58:11 -05:00
6838b7d0a6
remove duplicated word "caused" from Masterclassers quest text
2017-10-20 23:12:26 +10:00
1df8668d38
chore(i18n): update locales
2017-10-18 20:57:03 +00:00
0450e9c3ae
Added empty state values for photo and description in user profile ( #9201 )
2017-10-18 15:36:26 -05:00
15626b8ae1
Prevent user from blocking himself - fixes #9097 ( #9194 )
...
* Added check - user can't block himself
* removed exclusive test
2017-10-18 15:26:01 -05:00
Sabe Jones