Sabe Jones
fc08b753cd
Merge branch 'release' into develop
2019-03-26 20:23:22 -05:00
Sabe Jones
6ce1f6f32e
chore(sprites): compile
2019-03-26 20:22:35 -05:00
Sabe Jones
50278db1d6
feat(content): Mystery Items March 2019
2019-03-26 20:22:26 -05:00
Matteo Pagliazzi
fe636b9bd2
Merge pull request #10819 from ianoxley/9796-keyboard-a11y
...
Add <button> and focus styles for keyboard users
2019-03-24 12:29:07 +01:00
Ian Oxley
7835fe1deb
Fix outline issue in Firefox
2019-03-23 22:13:03 +00:00
Ian Oxley
8fb0d0899d
Fix checkbox alignment for dailies
2019-03-23 22:12:43 +00:00
Matteo Pagliazzi
abb8dc4dc1
Merge pull request #11078 from ChesterSng/11602-display-message-when-social-auth-acc-uses-password
...
Fixes #11062 Display information message when social authentication account uses password to login
2019-03-23 18:36:12 +01:00
Matteo Pagliazzi
910a76db68
Merge pull request #11064 from randi2kewl/todo-calendar-highlight-today
...
Added a highlight on today's date in To-Dos cal
2019-03-23 18:29:15 +01:00
Matteo Pagliazzi
2f792d51f8
Merge pull request #11069 from randi2kewl/11047-hall-search-case-insensitive
...
Fixes #11047 Hall search case insensitive
2019-03-23 18:22:53 +01:00
Matteo Pagliazzi
6cc925b535
Merge pull request #10988 from HabitRPG/sabrecat/platform-analytics-tweak
...
Set registered platform on analytics only once
2019-03-23 18:19:15 +01:00
Randi Miller
ae21680a5f
Add border-radius to highlighted tile
2019-03-22 14:23:04 -04:00
Randi Miller
c1767eca1b
Move datepicker css and color fixes
2019-03-22 14:17:36 -04:00
Chester Sng
d20cd1bbf1
Remove unused string constant in front.js
2019-03-22 19:36:13 +08:00
Chester Sng
3e45f5af41
Add check for the existence of user's password before attempting to authenticate
2019-03-22 19:30:00 +08:00
Bonnie L
23cc2b9d21
catch promise rejection when user submits a message to group. fixes #10970 ( #10978 )
...
* catch promise rejection when user submits a message to group
* switch response exception handling to try/catch to avoid mixing aysnc/await with promises
2019-03-21 16:54:10 -05:00
JSn1nj4
58c4fcd506
Fix sellModal data caching ( #11044 )
...
* Several deps set to "optional" in lock file
This was done automatically when running `npm i` on Windows.
Node v10.15.2
NPM 6.4.1
* Begin working on issue #10687
Key files to look into:
- website/client/components/inventory/item.vue
- website/client/components/shops/market/sellModal.vue
File notes for me:
item.vue: provides wrapper for displaying item data.
sellModel.vue: for displaying items player intends to sell
- lines 10-21: check `item` computed property and load `item` component
- lines 151-153: ask how return line is evaluated to an `item`
The last one could be important to figuring out this caching issue.
Since the property is computed, it's possible that line is evaluating to
a truthy value that Vue is seeing as unchanged, even if the actual
`item` object is different each time.
* Pick up from sellModal.vue:155
This is where the item context seems to be set. The Vue dev tools
indicate that the `<item>` component is updating. It's only the `item`
reference inside of the `<sellModal>` component that isn't updating.
Issue #10687
* Remove (v-once) directive
This was preventing data referenced within nested elements from
updating.
Issue #10687
* Revert package-lock.json to "develop" version
This removes the "optional" settings that were automatically added by NPM to a handful of dependencies while working on PR #11044 .
* Attempt to rerun tests
The most recent change shouldn't have caused tests to fail.
2019-03-21 16:52:00 -05:00
Alec Brickner
2878abc130
Center allocatable stat points ( #11053 )
2019-03-21 16:49:38 -05:00
Dmitry
a8cb6e3409
Second empty head option was removed from edit avatar - hair - style ( #11061 )
2019-03-21 16:47:17 -05:00
Alys
2caa540006
allow moderators/staff to always see Report button for a flagged message ( #11068 )
2019-03-21 16:46:00 -05:00
Sabe Jones
90d498ff96
chore(sprites): compile
2019-03-21 16:36:01 -05:00
Sabe Jones
928327e02a
feat(content): Magic Hatching Potions March 2019
2019-03-21 16:34:19 -05:00
Randi Miller
f454700722
extending equipment modal hack to address #11015 ( #11070 )
...
* extending equipment modal hack to address #11015
* fix(modal): call hack only once, remove more dangling body props
2019-03-21 13:37:35 -05:00
Matteo Pagliazzi
83bce24e1f
Merge branch 'develop' into 9796-keyboard-a11y
2019-03-21 16:05:18 +01:00
Sabe Jones
e7979a99e6
Merge branch 'release' into develop
2019-03-19 19:53:54 -05:00
Sabe Jones
2ad4bee816
chore(sprites): compile
2019-03-19 19:53:11 -05:00
Sabe Jones
e0291cf432
feat(event): Spring Fling 2019
2019-03-19 19:52:59 -05:00
Randi Miller
bac9121153
Changes color scheme for datepicker fixes #11064
2019-03-19 15:44:06 -04:00
Sabe Jones
d178928c45
fix(analytics): remove excess promise layer
2019-03-18 15:51:49 -05:00
Sabe Jones
9a6aa5f443
merge negue-ui-fixes into develop
...
Squashed commit of the following:
commit d0628da7557e718b4d144283949f6572718d9b45
Author: negue <eugen.bolz@gmail.com>
Date: Fri Mar 15 19:34:39 2019 +0100
fix quest-tooltip padding/sizes
commit c16bc0fe4521e01520628ddc84af54930b15e066
Merge: 24e3fe2a6 163f31688
Author: negue <eugen.bolz@gmail.com>
Date: Fri Mar 15 18:58:51 2019 +0100
Merge branch 'fix/quest-tooltip-cells' into negue-ui-fixes
commit 24e3fe2a6c8e384722d95f7edd9ce9e4ce16960c
Author: negue <eugen.bolz@gmail.com>
Date: Fri Mar 15 18:49:47 2019 +0100
use item margin instead of container padding
commit 03ab975193b2007e24fcbb971fc7d4169bfb3ac7
Author: negue <eugen.bolz@gmail.com>
Date: Thu Mar 14 21:41:43 2019 +0100
fix input heights
commit 3aa18f1105a02655066e10a82cf53be9340a6bf1
Author: negue <eugen.bolz@gmail.com>
Date: Thu Mar 14 20:58:22 2019 +0100
revert margin-bottom on checklist
commit d8f533fda1d3833ab2f4aeb3bd8001d4a7881e8b
Merge: fbd01ab79 7d45dcfee
Author: Sabe Jones <sabrecat@gmail.com>
Date: Thu Mar 14 11:10:34 2019 -0500
Merge branch 'fix/shops-ui' into negue-ui-fixes
commit fbd01ab79d5ea8144c191cd51a9c11216418493a
Merge: 65517d259 546e260e3
Author: Sabe Jones <sabrecat@gmail.com>
Date: Thu Mar 14 11:09:03 2019 -0500
Merge branch 'fix/more-ui' into negue-ui-fixes
commit 65517d25947144f57b84fad84ce709ac7d008119
Merge: 5e935230a 2dcec78a4
Author: Sabe Jones <sabrecat@gmail.com>
Date: Thu Mar 14 11:08:20 2019 -0500
Merge branch 'fix/tasks-ui' into negue-ui-fixes
commit 546e260e36a99f1c73d36069f57d2bbc64633a0e
Author: negue <eugen.bolz@gmail.com>
Date: Sat Mar 9 23:13:54 2019 +0100
fix checkbox check mark
commit 46ea2010f82d9549e3cc649376586517b8746306
Author: negue <eugen.bolz@gmail.com>
Date: Sat Mar 9 22:48:20 2019 +0100
remove bottom margin on a collapsed checklist
commit 7d45dcfee592a2f8cf8b1d6fe8d4a3502c520ec7
Author: negue <eugen.bolz@gmail.com>
Date: Wed Mar 6 22:45:09 2019 +0100
fix star/empty colors - fix quest layout - countBadge z-index
commit f9b9e75c18a63fb72c83e7c41a0f0c0cd61a84b0
Author: negue <eugen.bolz@gmail.com>
Date: Mon Mar 4 20:14:49 2019 +0100
shops - timeTravelers: refactor filter logic
commit 6d3e9e0de04cc92a3e5897c4e2508a67082f003f
Author: negue <eugen.bolz@gmail.com>
Date: Mon Mar 4 20:06:02 2019 +0100
shops-seasonal: refactor filter logic
commit aa2949e9d1fc62de8d9b82e8f74b5bb7ad3d9fb7
Author: negue <eugen.bolz@gmail.com>
Date: Mon Mar 4 19:54:23 2019 +0100
shops - quest: refactor filter logic + quest items margins
commit ad62b7a358e51d25dce745a949a209c250ed16de
Author: negue <eugen.bolz@gmail.com>
Date: Mon Mar 4 19:50:51 2019 +0100
shop: equipment-cards background + market filter logic (as other pages)
commit 2dcec78a4a14383fdf8576271da07a938e0bdf98
Author: negue <eugen.bolz@gmail.com>
Date: Wed Feb 27 21:02:10 2019 +0100
remove space between notes and checklist
commit 31fab9b66d98bbadd0761d0a382d3c7be43e7cd6
Author: negue <eugen.bolz@gmail.com>
Date: Wed Feb 27 20:45:59 2019 +0100
remove margin of checklist items
commit 28b134a19be650b8bc68e5a32996ffee478e720b
Author: negue <eugen.bolz@gmail.com>
Date: Wed Feb 27 20:33:43 2019 +0100
show `Options` instead of `Show More`
commit cafcfb611264167d85bf23b7ff05037189315d23
Author: negue <eugen.bolz@gmail.com>
Date: Wed Feb 27 20:30:22 2019 +0100
remove pointer on disabled task-controls
commit 7acbcc424b5844d578642107c176a88d0b545bd2
Author: negue <eugen.bolz@gmail.com>
Date: Wed Feb 27 20:25:36 2019 +0100
remove margin of task-title markdown-p-tag
commit f667ab957bd19db4f096925293a3525cb4adff8b
Author: negue <eugen.bolz@gmail.com>
Date: Wed Feb 27 20:25:16 2019 +0100
40px height search + tags button
commit 2080ecb7e8d8b75b8d730a2f252b1b52f68db437
Author: negue <eugen.bolz@gmail.com>
Date: Wed Feb 27 20:24:35 2019 +0100
show grabbing cursor while dragging
commit 163f31688926abe79f916810293e97f940105065
Author: negue <eugen.bolz@gmail.com>
Date: Fri Feb 15 23:26:40 2019 +0100
replace the questInfo to use table-like behavior, expands to the content
2019-03-18 15:06:32 -05:00
Randi Miller
e083df64e4
fixes #11047 Switches Hall query to use lowercase name
2019-03-17 04:00:50 -04:00
Sabe Jones
dae37c17d6
Merge branch 'release' into develop
2019-03-15 10:37:22 -05:00
Sabe Jones
2a225c2376
chore(event): end Pi Day
2019-03-15 10:31:08 -05:00
Ian Oxley
bd9d9d31c3
Update :focus outline for men icons
...
Make the .svg-icon focus style match its hover style.
2019-03-14 20:44:09 +00:00
Sabe Jones
f1b5ce9c66
Merge branch 'release' into develop
2019-03-14 14:11:25 -05:00
Matteo Pagliazzi
9fd0e27c66
fix(stripe): fix buying gems
2019-03-14 19:43:10 +01:00
Matteo Pagliazzi
994082a1d8
payments success state: add note about auto renewal
2019-03-14 19:36:56 +01:00
Sabe Jones
8486b9631f
Merge branch 'develop' into release
2019-03-14 12:25:55 -05:00
Sabe Jones
3f04c8abf5
chore(email): next split test iteration
2019-03-14 12:21:46 -05:00
Sabe Jones
89e1c69728
fix(string): correct set membership for blue hairbow
2019-03-14 11:23:25 -05:00
Sabe Jones
1ff3f3d4e7
Merge branch 'release' into develop
2019-03-14 07:05:35 -05:00
Sabe Jones
0d374d817c
chore(email): end split test
2019-03-14 07:02:45 -05:00
Sabe Jones
034058301d
Merge branch 'sabrecat/pi-day' into release
2019-03-14 07:00:52 -05:00
Sabe Jones
ae2d50c5b8
feat(pie): immediate pie for new users
2019-03-14 06:51:47 -05:00
Randi Miller
fff16a86a5
Added a highlight on today's date in To-Dos cal
2019-03-14 03:40:03 -04:00
Matteo Pagliazzi
c7309ae179
fix(amazon): disabled state for button, fix bug where checkout button would not appear
2019-03-13 19:19:30 +01:00
Matteo Pagliazzi
ef42fba049
fix(paypal): button styles
2019-03-13 18:34:41 +01:00
Sabe Jones
d75f926136
Merge branch 'release' into develop
2019-03-12 19:30:52 -05:00
Sabe Jones
8bcd93075b
chore(news): Bailey
2019-03-12 19:29:51 -05:00
Sabe Jones
f318afb8cf
Revert "replace the questInfo to use table-like behavior, expands to the content ( #10995 )"
...
This reverts commit 3ebd37f7cb .
2019-03-12 19:20:56 -05:00
Sabe Jones
b954379f38
Revert "fixes Tasks UI ( #11036 )"
...
This reverts commit f548103f4c .
2019-03-12 19:20:40 -05:00