 negue
|
1c17b415f0
|
refactor {group,inbox}-chatReporter variables
|
2018-12-06 23:55:18 +01:00 |
|
|
negue
|
b912a83f22
|
refactor "formatUser" to show the correct user and displayname
|
2018-11-29 20:15:47 +01:00 |
|
|
negue
|
fb3a9740bd
|
add display name to the email variables
|
2018-11-29 20:00:05 +01:00 |
|
|
negue
|
817c943860
|
Merge remote-tracking branch 'origin/develop' into negue/flagpm
|
2018-11-29 19:02:01 +01:00 |
|
|
negue
|
0aba448c48
|
fix sentence
|
2018-11-29 19:01:26 +01:00 |
|
|
Sabe Jones
|
b82660823d
|
Merge branch 'release' into develop
|
2018-11-28 20:57:37 +00:00 |
|
|
Sabe Jones
|
fde4402fbb
|
4.74.0
v4.74.0
|
2018-11-28 20:57:14 +00:00 |
|
|
Sabe Jones
|
5fe0776074
|
chore(i18n): update locales
|
2018-11-28 20:55:35 +00:00 |
|
|
Sabe Jones
|
d218f316d3
|
chore(sprites): compile
|
2018-11-28 14:50:54 -06:00 |
|
|
Sabe Jones
|
f19e69948a
|
feat(content): mystery items 2018-11
|
2018-11-28 14:50:43 -06:00 |
|
|
Sabe Jones
|
e6807d36b5
|
fix(analytics): record usernames
|
2018-11-28 13:02:48 -06:00 |
|
|
Phillip Thelen
|
1ece230621
|
remove console call
|
2018-11-28 12:52:08 -06:00 |
|
|
Phillip Thelen
|
d934d9d759
|
Move group chat analytics event to server
|
2018-11-28 12:52:00 -06:00 |
|
|
Matteo Pagliazzi
|
bf7fabb20a
|
fix(amazon): add new env variable to specify environment
|
2018-11-28 11:07:06 +01:00 |
|
|
Sabe Jones
|
88a2f317d8
|
Merge branch 'release' into develop
|
2018-11-27 19:46:39 -06:00 |
|
|
SabreCat
|
a30c4379a6
|
fix(tests): correct string update errors
|
2018-11-28 01:00:46 +00:00 |
|
|
Matteo Pagliazzi
|
b509c6631d
|
update package-lock.json
|
2018-11-27 22:19:25 +01:00 |
|
|
Matteo Pagliazzi
|
5a725fa4b0
|
update package-lock.json
|
2018-11-27 22:17:43 +01:00 |
|
|
Sabe Jones
|
dbe2143b7a
|
fix(mystery-items): add missing set sprite
|
2018-11-26 14:23:18 -06:00 |
|
|
Sabe Jones
|
7b687280d7
|
Merge branch 'release' into develop
|
2018-11-26 19:10:05 +00:00 |
|
|
Sabe Jones
|
8db6c8bd4f
|
4.73.2
v4.73.2
|
2018-11-26 19:09:42 +00:00 |
|
|
Sabe Jones
|
bf91dacb94
|
chore(i18n): update locales
|
2018-11-26 19:01:55 +00:00 |
|
|
Sabe Jones
|
33e0892e95
|
chore(event): end Thanksgiving tweaks
|
2018-11-26 12:59:23 -06:00 |
|
|
Phillip Thelen
|
42b146d5d0
|
Attach client to chat messages (#10845)
* Attach client to chat messages
* Word
* Design tweaks
* Fix potential error
|
2018-11-26 10:45:42 +01:00 |
|
|
Nathan Zimmerman
|
2bebaf2cf8
|
Fixes issue #10857 ("Tags have extra space at the bottom when they should be centered") (#10861)
* Fix for #10857 centered category tag text
* Fixes #10857 and #10856 display tag markdown.
|
2018-11-26 10:44:41 +01:00 |
|
|
Matteo Pagliazzi
|
6181328ac1
|
feat(footer): always show expanded footer (#10862)
|
2018-11-26 10:37:29 +01:00 |
|
|
Sabe Jones
|
c64d4b0914
|
4.73.1
v4.73.1
|
2018-11-23 20:20:56 +00:00 |
|
|
Sabe Jones
|
f94fd0d69d
|
chore(i18n): update locales
|
2018-11-23 20:17:56 +00:00 |
|
|
Sabe Jones
|
2cd66436bc
|
Merge branch 'release' into develop
|
2018-11-22 18:05:28 -06:00 |
|
|
Sabe Jones
|
81a17738b8
|
4.73.0
v4.73.0
|
2018-11-22 21:09:31 +00:00 |
|
|
Sabe Jones
|
b6b953ec46
|
chore(i18n): update locales
|
2018-11-22 21:09:20 +00:00 |
|
|
Sabe Jones
|
ab34c83a9d
|
chore(sprites): compile
|
2018-11-22 15:05:33 -06:00 |
|
|
Sabe Jones
|
9cea86f4e0
|
feat(content): Turkey Day 2018
|
2018-11-22 15:05:03 -06:00 |
|
|
Sabe Jones
|
1b7a705bf9
|
Merge branch 'paglias/migration-no-recursion' into release
|
2018-11-22 13:44:46 -06:00 |
|
|
negue
|
e2c5b9058b
|
more checks on the item.klass, also added the specialClass checks (#10859)
|
2018-11-22 14:35:34 +01:00 |
|
|
Alys
|
a2b38ffb02
|
add two slurs - TRIGGER / CONTENT WARNING: assault, slurs, swearwords, etc
|
2018-11-21 19:48:50 +10:00 |
|
|
Matteo Pagliazzi
|
6395870c00
|
fix(stable): remove progress number from petItem
|
2018-11-21 10:35:59 +01:00 |
|
|
Sabe Jones
|
9562ba432f
|
Merge branch 'release' into develop
|
2018-11-20 21:02:17 +00:00 |
|
|
Sabe Jones
|
8a3a83de37
|
4.72.0
v4.72.0
|
2018-11-20 21:01:41 +00:00 |
|
|
Sabe Jones
|
745edd731d
|
chore(i18n): update locales
|
2018-11-20 20:59:23 +00:00 |
|
|
Sabe Jones
|
53b195931c
|
chore(sprites): compile
|
2018-11-20 14:55:56 -06:00 |
|
|
Sabe Jones
|
37ae467fff
|
feat(content): Frost Hatching Potions
|
2018-11-20 14:55:45 -06:00 |
|
|
negue
|
52a7112591
|
some ui fixes / requested changes
|
2018-11-20 17:20:58 +01:00 |
|
|
negue
|
d7d7d64b45
|
move computed-props to methods - refactor mountItem to use the states inside (#10853)
|
2018-11-20 12:28:26 +01:00 |
|
|
negue
|
3203bffeaa
|
refactor update the message to use .save - fix test
|
2018-11-18 22:37:09 +01:00 |
|
|
negue
|
3f47cdd9a2
|
merge fixes
|
2018-11-18 22:12:41 +01:00 |
|
|
negue
|
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 |
|
|
Matteo Pagliazzi
|
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 |
|
|
Matteo Pagliazzi
|
067e869141
|
fix(chat): prevent duplicate messages, closes #10823
|
2018-11-18 19:38:56 +01:00 |
|
|
greenkeeper[bot]
|
51224a69d9
|
Update superagent to the latest version 🚀 (#10848)
* fix(package): update superagent to version 4.0.0
* chore(package): update lockfile package-lock.json
|
2018-11-18 19:24:39 +01:00 |
|