e2c5b9058b
more checks on the item.klass, also added the specialClass checks ( #10859 )
2018-11-22 14:35:34 +01:00
cc751960ac
save state and close tab afetr success
2018-11-21 11:42:32 +01:00
433c73c9d3
paypal: restore url after purchase
2018-11-21 11:25:36 +01:00
680c2162a7
paypal: new redirects
2018-11-21 11:19:55 +01:00
a2b38ffb02
add two slurs - TRIGGER / CONTENT WARNING: assault, slurs, swearwords, etc
2018-11-21 19:48:50 +10:00
6395870c00
fix(stable): remove progress number from petItem
2018-11-21 10:35:59 +01:00
9562ba432f
Merge branch 'release' into develop
2018-11-20 21:02:17 +00:00
745edd731d
chore(i18n): update locales
2018-11-20 20:59:23 +00:00
53b195931c
chore(sprites): compile
2018-11-20 14:55:56 -06:00
37ae467fff
feat(content): Frost Hatching Potions
2018-11-20 14:55:45 -06:00
52a7112591
some ui fixes / requested changes
2018-11-20 17:20:58 +01:00
d7d7d64b45
move computed-props to methods - refactor mountItem to use the states inside ( #10853 )
2018-11-20 12:28:26 +01:00
fd13771088
Set background on the dropdown toggle
...
Set the background to `$white` to stop Firefox falling back to the
default grey background for a button.
2018-11-19 19:40:41 +00:00
c9d725ec20
Fix +ve / -ve habit control buttons
...
Align the icons centrally within the positive / negative controls.
2018-11-19 19:34:01 +00:00
3203bffeaa
refactor update the message to use .save - fix test
2018-11-18 22:37:09 +01:00
3f47cdd9a2
merge fixes
2018-11-18 22:12:41 +01:00
8b15d94ae1
Merge remote-tracking branch 'origin/develop' into negue/flagpm
...
# Conflicts:
# website/client/components/chat/chatCard.vue
# website/client/components/chat/chatMessages.vue
# website/common/locales/en/messages.json
2018-11-18 22:04:33 +01:00
e76bdbd62d
Fix for #10814 , prevent ParallelSave errors ( #10852 )
...
* fix(group leave): prevent ParallelSave errors while leaving a group with multiple group or challenge tasks
* fix typo
2018-11-18 20:48:16 +01:00
067e869141
fix(chat): prevent duplicate messages, closes #10823
2018-11-18 19:38:56 +01:00
f56018d46a
Very large Guild member counts overflow the badge #10753 ( #10812 )
2018-11-17 11:06:26 +01:00
b846185f8a
Set width on .custom-control-label ( #10840 )
...
Set `width: 100%` on the `.custom-control-label`.
Although `overflow-wrap: break-word` is set on the parent `.checklist-item` element, it doesn't seem to take effect unless a width is set on the label.
2018-11-17 11:01:36 +01:00
ff81e55839
groupChatReceived webhook fix ( #10802 )
...
* Moved sendGroupChatReceivedWebhooks to group.sendChat function.
* Added test for new functionality.
2018-11-17 10:48:41 +01:00
47ad7305f5
chore(i18n): update locales
2018-11-15 22:02:46 +00:00
d9b5bbe2a9
chore(sprites): compile
2018-11-15 15:58:15 -06:00
c2fe04367f
feat(content): Oddballs Bundle
...
Also includes one more tweak to @mention text highlighting
2018-11-15 15:58:07 -06:00
abcc77b7d6
fix(chat): more width tweakage
2018-11-14 16:46:03 -06:00
07cbf45265
fix(chat): less intrusive highlight and better margins
2018-11-14 16:31:35 -06:00
89fdd8a8bb
chore(i18n): update locales
2018-11-14 14:39:23 +00:00
d406da4081
chore(news): Bailey
2018-11-14 08:30:34 -06:00
d74786ef85
Merge branch 'sabrecat/usernames-master' into develop
2018-11-14 08:21:49 -06:00
64a3d08ce3
fix(tests): linting & more expects
...
Also one more tweak for invite validation responsiveness
2018-11-14 07:43:08 -06:00
1a7461a8a2
move the update username route to v3 ( #10836 )
2018-11-14 10:40:27 +01:00
cc13c4f28e
fix(invites): more responsive validation
2018-11-13 19:50:07 -06:00
239f78674b
fix(usernames): address failing tests
2018-11-14 01:44:09 +00:00
d691dee2ca
fix(usernames): filter @ on server side for username lookup
2018-11-13 15:34:50 -06:00
481bd6727d
fix(usernames): exclude unverified users during query
2018-11-13 15:13:41 -06:00
d0fc1e0751
fix(invites): show errors inline
2018-11-13 15:10:35 -06:00
b07dbb7752
Merge branch 'develop' into sabrecat/usernames-master
2018-11-13 14:15:23 -06:00
34e7690c38
fix(usernames): various
...
Disappearing input fields
Text replacement in @mentions
UUID visibility in profiles
Purple dot for @mentioned usernames
TypeError preventing RYA
Group Plan member list error
2018-11-13 14:14:02 -06:00
eca7382545
prevent buying market gear if class doesn't match ( #10818 )
...
* prevent buying market gear if class doesn't match
* add test
2018-11-12 21:32:54 +01:00
7484ecf729
Merge branch 'develop' into sabrecat/usernames-master
2018-11-08 15:13:28 -06:00
8f2435c37c
refactor Inbox-mongodb requests
2018-11-08 22:04:55 +01:00
acf514e9cb
chore(i18n): update locales
2018-11-08 18:47:32 +00:00
2789d44dbf
chore(news): Bailey
2018-11-08 12:43:50 -06:00
5d6b6ed29a
feat(usernames): follow-up email and setting for email opt-out
2018-11-08 10:00:25 -06:00
7fbc68511b
fix: special are not "AllowedToFeed" ( #10808 )
...
* fix: special are not "AllowedToFeed"
* fix lint
2018-11-08 11:11:04 +01:00
b1dd79f75c
fix(invites): bogus validation errors
2018-11-07 15:58:17 -06:00
1ac4dd8171
feat(usernames): invite by username
2018-11-07 15:00:22 -06:00
4f86abd6b2
Merge branch 'develop' into sabrecat/usernames-master
2018-11-07 08:39:57 -06:00
23b0688abb
Merge branch 'develop' into sabrecat/usernames-master
2018-11-06 19:56:45 -06:00
negue