Commit Graph

15398 Commits

Author SHA1 Message Date
SabreCat a0f10cbf4b Merge branch 'THI/sleep-dailies-fix' into release 2017-05-30 20:58:33 +00:00
SabreCat dea847ba1a chore(news): Bailey 2017-05-30 20:11:21 +00:00
Keith Holliday e9750353a7 Set isDue and NextDue during sleep 2017-05-30 09:12:09 -06:00
Sabe Jones 74d1c7763e 3.93.1 v3.93.1 2017-05-29 01:08:31 +00:00
Keith Holliday 6f034bb5dd Fixed issue when repeat object is malformed (#8765)
* Fixed issue when repeat object is malformed

* Removed only

* Changed numeric check to lodash isFinite

* Removed newer lodash function
2017-05-28 20:07:29 -05:00
SabreCat feae40cf0a 3.93.0 v3.93.0 2017-05-25 01:00:21 +00:00
SabreCat 0d3fe53155 chore(news): Bailey 2017-05-25 00:59:37 +00:00
SabreCat c3a3c1514a Merge branch 'monthlies' into release 2017-05-25 00:50:19 +00:00
Sabe Jones 7c236e7e0e 3.92.0 v3.92.0 2017-05-23 22:15:40 +00:00
Sabe Jones 0221d2d7f9 chore(i18n): update locales 2017-05-23 22:12:33 +00:00
SabreCat 567eb1d98b chore(sprites): compile 2017-05-23 22:04:26 +00:00
SabreCat 3cf533f261 feat(content): new Mystery Items
and reenable Floral Potions
2017-05-23 22:03:31 +00:00
Keith Holliday 7d000d2cf6 Removed let from front end 2017-05-23 08:56:36 -06:00
Keith Holliday 280b720c13 Allow user to deselect all days during week 2017-05-22 08:37:45 -06:00
Keith Holliday fefaed368a Use user's format 2017-05-22 08:16:12 -06:00
Keith Holliday 6f370395ea Updated common test 2017-05-22 08:06:14 -06:00
Keith Holliday 65566f7607 Fixed integration tests 2017-05-22 07:54:07 -06:00
Keith Holliday c0117706e4 Merge remote-tracking branch 'upstream/develop' into enable-repeatables 2017-05-22 07:49:01 -06:00
Matteo Pagliazzi f267456a30 client: fix drawer 2017-05-21 15:38:33 +02:00
Matteo Pagliazzi 228b724d52 fix missing trailing comma 2017-05-21 14:43:25 +02:00
Keith Holliday 19b09b4894 Merged in develop 2017-05-20 19:24:25 -06:00
Keith Holliday f49d21d7b4 added next due date as today for weekly 2017-05-20 18:38:53 -06:00
Keith Holliday c08c0685f3 Fixed broken tests 2017-05-20 17:19:35 -06:00
negue 59bfe66c94 Client/item content (#8738)
* extract item popover-content as component

# Conflicts:
#	website/client/components/inventory/item.vue

* extract item-content as slot

* scoped context to pass the item

* itemContentClass instead of itemContent-slot
2017-05-20 19:59:45 +02:00
SabreCat 023fd6e6b0 3.91.2 v3.91.2 2017-05-19 20:51:10 +00:00
SabreCat 7ee2f90f37 fix(docs): move apiParamExamples to newlines 2017-05-19 20:49:59 +00:00
SabreCat 46709ddadd 3.91.1 v3.91.1 2017-05-19 20:22:06 +00:00
SabreCat a3ee09e764 chore(event): disable Fairy Potions 2017-05-19 20:17:51 +00:00
Sabe Jones 4127f36c02 chore(i18n): update locales 2017-05-19 20:16:18 +00:00
SabreCat dad924ac7d chore(sprites): compile 2017-05-19 20:05:55 +00:00
Sabe Jones 547c87dee7 Guild A/B test and Achievement (#8740)
* WIP(guilds): AB test pester modal

* WIP(AB-test): guild pester cont'd

* fix(style): linting error

* fix(AB-test): markModified and notif enum

* fix(tests): update AB expectations

* fix(modal): remove extra includes

* feat(achievements): add Joined Guild cheevo
Also removes unused achievement sprites, and properly saves counter used in A/B testing

* fix(style): linting error from conflict
2017-05-19 14:45:11 -05:00
Keith Holliday 99a2013767 Fixed display of next due dates 2017-05-18 14:12:36 -06:00
Keith Holliday a5e0e171cc Added next due date 2017-05-18 10:42:11 -06:00
Keith Holliday 1d93943458 Prevented edit of repeats on 2017-05-18 10:26:57 -06:00
Keith Holliday 7f2719a75c Fixed every x weekly 2017-05-18 10:11:29 -06:00
Sabe Jones 8a9ed04f5e Merge branch 'release' into develop 2017-05-18 02:13:14 +00:00
Sabe Jones 4e66c038a6 3.91.0 v3.91.0 2017-05-18 02:11:56 +00:00
Sabe Jones bd9618e1c6 chore(i18n): update locales 2017-05-18 02:08:40 +00:00
SabreCat 342034a80d chore(sprites): compile 2017-05-18 01:59:44 +00:00
SabreCat f2aed3cb27 chore(news): Bailey
Also rolls back a leftover bit of the Spring Fling.
2017-05-18 01:58:37 +00:00
SabreCat 4f5f15d162 fix(test): account for cumulative balance 2017-05-18 01:44:07 +00:00
SabreCat b5c1b78789 docs(content): comment bundle structure 2017-05-18 01:44:07 +00:00
SabreCat f2ace5bb63 test(bundles): check balance deduction 2017-05-18 01:44:07 +00:00
SabreCat 72b8ba2d5c fix(test): remove only 2017-05-18 01:44:07 +00:00
SabreCat 8555e4bea8 test(bundles): shop and purchase tests 2017-05-18 01:44:07 +00:00
SabreCat 4de5b4253b fix(style): address linting errors 2017-05-18 01:44:07 +00:00
SabreCat 410004f8c6 feat(purchases): sell bundled quests 2017-05-18 01:44:07 +00:00
SabreCat 76c7e15497 refactor(content): split quests file 2017-05-18 01:44:06 +00:00
Sabe Jones e6f605f23a Discount Bundled Quests (#8731)
* refactor(content): split quests file

* feat(purchases): sell bundled quests

* fix(style): address linting errors

* test(bundles): shop and purchase tests

* fix(test): remove only

* test(bundles): check balance deduction

* docs(content): comment bundle structure

* fix(test): account for cumulative balance
2017-05-17 20:36:34 -05:00
Matteo Pagliazzi 0af1203832 Client Redesign: Inventory pages, secondary menu, misc css and design items (#8631)
* add colors palette

* add secondary menu component and style it

* add box shadow to secondary menu

* misc css, fixes for secondary menu

* client: add equipment page with grouping, css: add some styles

* add typography

* more equipment

* stable: fix linting

* equipment: add styles (lots of general styles too)

* remove duplicate google fonts loading

* add dropdowns

* design: white search input background, remove gray from items

* start adding drawer and selected indicator

* wip equipment

* fix equipment

* equipment: correctly bind new properties on items.gear.equipped

* equipment: fix vue binding. version 2

* equipment: fix vue binding. version 3

* back to first fix for equip op, fix for sourcemaps, send http request when an item is equipped, load bootstrap-vue components where needed

* checkboxes and radio buttons

* correctly renders selected items in first postion during the first render

* add search

* general changes, constants part of app state, add popovers

* add toggle switch, rename css

* correct offset

* upgrade deps

* upgrade deps

* drawer and lot of other work

* update equipping mechanism

* finish equipment

* fix compilation and upgrade deps

* use v-show in place of v-if to fix ui issues

* v-show -> v-if

* fix linting in test/client

* fix es6 compilation in test/client

* fix babel compilation for tests

* fix groupsUtilities mixin tests

* client: buttons

* client: buttons: fix colors

* client: finish buttons and dropdowns

* upgrade bootstrap-vue, finish buttons and dropdowns

* fix tasks page layout

* misc fixes for buttons

* add textareas

* fix app menu

* add inputs

* fixes for toggleSwitch

* typography

* checkboxes and radio buttons

* add checkbox icon

* fix equip.js

* extract strings to newClient.json

* add Popover above 'Use Costume' / 'Auto Equip' slider - disable item select if costume-mode and 'useCostume' isn't active

* show "you have disabled your costume" error above the drawer items

* check errorMessage for null

* hide star if costume not enabled

* fix errorMessage (!errorMessage seems not to work for string)

* show minimize / expand icon - always centered by css

* drawer test

* drawer: fix centering on large screens

* fix show more button

* add margin when two dropdowns are next to each other

* adjust the page padding based on the drawer, misc fixes

* drawer fixes
2017-05-16 21:09:55 +02:00