b4dab2e13c
Merge branch 'release' into develop
2018-03-07 22:53:09 +00:00
2abf0f4900
feat(content): Hug a Bug Quest Bundle
2018-03-06 21:56:01 +00:00
27ef187e66
Merge branch 'release' into develop
2018-03-05 20:59:17 +00:00
da50d2f495
feat(world-boss): third Rage Strike support
2018-03-05 20:46:22 +00:00
9c9b67aa9d
Keys kennel fixes ( #9848 )
...
* Show keys to pets immediately
* Ensured keys to pets dissapear after use
* Added resdirect to stable after purchase
* Added mount check and updated keys to mounts and to both
* Added api calls
* Added check for beastmaster progress
* Added mount check for release mounts. Added pets and mount check to release both
* Added actions
* Added catch to common tests
* Added beast count and reload
* Removed extra console log
2018-03-02 15:30:11 -06:00
7cff331800
Removed uri for client side oauth ( #10058 )
...
* Removed uri for client side oauth
* Fixed lint
2018-03-02 14:07:15 -07:00
e7bc505b88
Modal popup fixes ( #10080 )
...
* Added validation for modal stack
* Lint fixes
2018-03-02 12:43:22 -07:00
cf7fc8d578
Merge branch 'develop' into release
2018-03-01 23:23:57 +00:00
b39a5be2d1
chore(sprites): compile
2018-03-01 23:23:36 +00:00
2959f0afab
Removed modify inventory because the Content is causing Garbage Collection issues ( #10075 )
2018-03-01 08:24:46 -07:00
dee81ee6c9
Reversed order to put newest on top ( #10059 )
2018-02-28 08:17:54 -07:00
5e5d73816b
fixes #10057 ( #10063 )
2018-02-27 22:24:31 +01:00
892ba3b741
Merge branch 'release' into develop
2018-02-27 20:55:34 +00:00
0b4eafeb28
prevent selling negative items ( #10061 )
2018-02-27 14:51:10 -06:00
cedfc005f8
feat(world-boss): Market Strike support
2018-02-27 20:04:37 +00:00
6118336a5d
Marked new stuff complete when clicking later ( #10043 )
...
* Marked new stuff complete when clicking later
* Moved flag set to action
2018-02-26 12:07:54 -07:00
84dc2f8e3c
Fixed sorting and model creation for inboxes ( #10039 )
2018-02-25 08:04:55 -07:00
3a1e56cc8e
Upgrade server deps ( #10017 )
...
* remove unused apn lib and upgrade moment-recur
* upgrade validator
* upgrade got
* request -> got
* fix validation
* fix tests
* upgrade nodemailer
* fix unit tests
* fix webhook tests, upgrade express-validator (using legacy api)
* upgrade js2xmlparser
* update misc packages
* fix linting
* update packages
2018-02-23 15:21:00 +01:00
f86a77608b
chore(sprites): compile & cleanup
2018-02-22 22:57:34 +00:00
9487811d31
fix(world-boss): Tavern layout tweaks
2018-02-22 21:31:57 +00:00
d5e4be85e9
Revert "Task page : task filters ( #9898 )"
...
This reverts commit 9919faeed8
2018-02-22 12:28:24 +01:00
deaf7fee81
Added world boss notification ( #10030 )
...
* Added world boss notification
* Updated styles
2018-02-21 14:58:56 -06:00
72dc7c01c3
Merge branch 'release' into develop
2018-02-21 17:47:56 +00:00
84dc1ab546
chore(news): Bailey
2018-02-21 17:35:33 +00:00
d0a05ad745
fix(lint): disable-line typo
2018-02-20 21:41:33 +00:00
c991a3e20f
fix(lint): disable-line typo
2018-02-20 21:41:11 +00:00
695f53758a
Merge branch 'release' into develop
2018-02-20 21:16:43 +00:00
416c24d1e2
fix(auth): initialize Hello for social
...
fixes #9460
2018-02-20 21:15:36 +00:00
b0974fc4fc
feat(rage-strike): Seasonal Shop modal
2018-02-20 20:05:32 +00:00
9919faeed8
Task page : task filters ( #9898 )
...
* add tasklist getter
* add unit test + refactor for getters
* add task order sorting + update unit tests
* remove direct access to store.state.tasks
* add tag and search filter back to column.vue + unit tests
* add unit test for task order setting function
* add task filters to helper file + modify taskColumn state access to getter
* update column to get values at runtime. TODO set active filter at runtime
* add TaskColumn init state + daily-due-default
* add check for task type daily before set/reset dailyDueView
* remove unused sortBy import in column.vue
* remove unused sortBy
* pr review requested updates
* pr review clean up updates
2018-02-19 19:03:38 +01:00
f592103754
Partial Fix for #8735 ("Failed party invitations do not indicate which invitations failed") ( #9939 )
...
* Updated from origin and added invite error fixes
* Update test for capitalization issue
* New error display
Changed app.vue to display error message using error.response.data.message
2018-02-19 19:00:42 +01:00
119f21ddce
New PR for margins in stable - fixes #9651 ( #9982 )
...
* made style change for pet item class to have more margins.
* made style change for pet item class to have more margins.
* files got added
* encapsulated the items as stated in #9903
* #9903 moved the css to stable -> petitem.vue for better encapsulation.
* saving pngs
* update on files
* updated files as requested in PR!
* Revert "saving pngs"
This reverts commit a38ea664e1#9982 removed redundant css
* #9982 applied scss to mount slots as well.
* #9982 refactored scss to be in one place.
* #9982 changed selector
2018-02-19 18:55:16 +01:00
311a898938
Fix attributes box size being too small on Japanese ( #9984 )
2018-02-19 18:52:07 +01:00
1c1b050e2c
If message uuid is set as system append as user 'system message' #9985 ( #9988 )
2018-02-19 18:51:43 +01:00
b619496f8e
fix linting
2018-02-17 18:41:49 +01:00
80fe58bc6f
Upgrade client deps ( #9990 )
...
* upgrade axios
* upgrade axios-progress-bar
* upgrade bootstrap-vue
* fix issues
2018-02-17 18:15:43 +01:00
74ba55c20b
Upgrade tests tools and lint migrations and scripts (part 2) ( #9998 )
...
* upgrade gulp-babel
* upgrade babel-eslint
* upgrade eslint-friendly-formatter
* start upgrading chai
* start to upgrade eslint
* restore skipped tests
* start to upgrqde monk
* fix linting and remove unused file
* fix mocha notifications, and common tests
* fix unit tests
* start to fix initrgration tests
* more integration tests fixes
* upgrade monk to latest version
* lint /scripts
* migrations: start moving to /archive unused migrations and run eslint with --fix
* lint migrations
* fix more integration tests
* fix test
2018-02-17 18:11:24 +01:00
ee087e5eee
refactor(rage-strike): consts
2018-02-16 21:36:10 +00:00
95179be346
feat(world-boss): Rage Strike support
2018-02-16 21:18:51 +00:00
b0ae0ef4da
HOTFIX: purchase marketGear ( #9992 )
...
* fix purchase marketGear
* test marketGear purchase in the client
2018-02-16 17:56:05 +01:00
dad4f864ff
fixes #10001 ( #10002 )
2018-02-16 17:55:45 +01:00
f7ffc173b1
Prevented of closing bailey without clicking bottom buttons ( #9993 )
2018-02-16 09:21:59 -07:00
70fbc83664
Merge branch 'release' into develop
2018-02-16 03:08:22 +00:00
5987145b86
fix(phobia): show censored art as needed
2018-02-14 22:35:14 +00:00
791d711298
Merge branch 'release' into develop
2018-02-14 21:09:30 +00:00
2f46d1bc65
chore(sprites): compile
2018-02-14 20:48:48 +00:00
cdcee8d169
World boss client ( #9999 )
...
* WIP(world-boss): client components partial
* WIP(world-boss): more client additions
* WIP(world-boss): some beautification
* WIP(world-boss): more Tavern beauty
* fix(world-boss): gradient adjustment
* fix(style): various WB tweaks
* fix(world-boss): better resolution Rage Strike
* fix(world-boss): alignment fixes
* Added world boss modal
* feat(world-boss): add info button
* fix(world-boss): move SVG and tweak padding
2018-02-14 13:43:10 -06:00
1e23395c8c
Merge branch 'release' into develop
2018-02-12 22:08:03 +00:00
82ff241e39
chore(sprites): compile
2018-02-12 21:58:54 +00:00
cf4aaf1618
feat(event): enable Valentines
2018-02-12 21:56:29 +00:00
Sabe Jones