Commit Graph

17897 Commits

Author SHA1 Message Date
Sabe Jones 6f64cb7d9b Merge branch 'release' into develop 2018-10-30 21:26:39 +00:00
Sabe Jones 7d989bcf50 4.68.0 v4.68.0 2018-10-30 21:26:19 +00:00
Sabe Jones 7bd29c2dd7 chore(i18n): update locales 2018-10-30 21:24:55 +00:00
Sabe Jones 9e10490102 chore(sprites): compile 2018-10-30 16:21:51 -05:00
Sabe Jones 5792bc0000 feat(content): Habitoween 2018 2018-10-30 16:21:42 -05:00
Matteo Pagliazzi 06812878b5 Merge branch 'negue/stable_img_states' into develop 2018-10-30 16:37:04 +01:00
Matteo Pagliazzi 8714c7d162 fix lint 2018-10-30 16:36:30 +01:00
Matteo Pagliazzi e66f4e7812 Merge branch 'develop' into negue/stable_img_states 2018-10-30 16:35:30 +01:00
negue c73f565f65 refactor animal methods / vue methods 2018-10-29 20:46:16 +01:00
Kirsty 82e21df943 fix filter checkboxes in seasonal shop (#10792) 2018-10-29 16:04:42 +01:00
Sabe Jones 18ed148320 Merge branch 'release' into develop 2018-10-28 20:46:13 +00:00
Sabe Jones a5fc909f0d 4.67.1 v4.67.1 2018-10-28 20:45:38 +00:00
Sabe Jones 30a5192e19 chore(i18n): update locales 2018-10-28 20:45:27 +00:00
Matteo Pagliazzi 79c0499672 Mongoose: use $type as the typeKey (#10789)
* use $type as the typeKey in mongoose

* fix and add tests
2018-10-28 15:42:48 -05:00
Matteo Pagliazzi dadb752087 Mongoose: use $type as the typeKey (#10789)
* use $type as the typeKey in mongoose

* fix and add tests
2018-10-28 15:23:41 +01:00
Matteo Pagliazzi 37b29d3449 fix(tests): increase timeout 2018-10-28 13:14:49 +01:00
Matteo Pagliazzi bb2ed249b9 fix deprecation warning for sinon.js 2018-10-28 12:44:34 +01:00
Sabe Jones bb90dde1b6 feat(usernames): verification step during Justin intro for social users 2018-10-27 12:37:22 -05:00
Sabe Jones 5299c8d406 fix(comments): validator for emails, remove prefixes, allow length 1 2018-10-26 16:25:15 -05:00
Sabe Jones 8b81e38538 fix(PR): more cleanup 2018-10-26 15:48:53 -05:00
Sabe Jones 8e05a1b489 Merge branch 'develop' into sabrecat/usernames-master 2018-10-26 15:45:55 -05:00
Sabe Jones aafcbe60a3 fix(PR): remove unrelated changes 2018-10-26 15:42:41 -05:00
Matteo Pagliazzi 56d1b77215 Upgrade sinon (#10773)
* upgrade sinon

* sinon changes

* fix unit tests
2018-10-26 18:15:28 +02:00
Nathanael Farley 61da558a5d Added explanatory webhook text to UI. (#10782)
* Added explanatory webhook text to UI.

* Made new webhook API info translateable.
2018-10-26 16:46:36 +02:00
Sabe Jones 490531cc76 4.67.0 v4.67.0 2018-10-25 21:36:13 +00:00
Sabe Jones 8cd4c502bc chore(i18n): update locales 2018-10-25 21:35:58 +00:00
Sabe Jones d8cacb653e chore(sprites): compile 2018-10-25 16:31:13 -05:00
Sabe Jones 59436a8bf7 feat(content): Mystery Items Oct 2018 2018-10-25 16:31:00 -05:00
Sabe Jones 6fade19f27 4.66.2 v4.66.2 2018-10-25 20:32:06 +00:00
Sabe Jones 15d028a281 chore(i18n): update locales 2018-10-25 20:31:20 +00:00
Sabe Jones 95b283676a Merge branch 'sabrecat/username-display' into sabrecat/usernames-master 2018-10-25 05:32:41 -05:00
Sabe Jones 6e7e81206a fix(profile): better username/UUID styling 2018-10-25 05:29:02 -05:00
Sabe Jones af74cc7c64 Merge branch 'sabrecat/username-display' into sabrecat/usernames-master 2018-10-24 20:01:00 -05:00
Sabe Jones a9e2a17077 fix(chat): no min height on autocomplete dropdown 2018-10-24 19:59:54 -05:00
Sabe Jones 92057dbe17 Merge branch 'sabrecat/username-display' into sabrecat/usernames-master 2018-10-24 19:41:21 -05:00
Sabe Jones b4ab525be5 fix(chat): better @ searching, no chat card borders 2018-10-24 19:39:50 -05:00
Sabe Jones d3c464d5ea Merge branch 'sabrecat/force-username-modal' into sabrecat/usernames-master 2018-10-24 18:40:43 -05:00
Sabe Jones 804fe1c6d5 fix(usernames): various
z-index modals above Resting banner
force reload after verify username
add missing e-mail validation on frontpage
let Yesterdaily modal float behind username modal
2018-10-24 18:39:54 -05:00
negue 3c5025a78e fix background empty / resetCallback - refactor pet methods/components 2018-10-24 20:43:15 +02:00
Sabe Jones e028232527 Merge branch 'release' into develop 2018-10-24 18:35:55 +00:00
Sabe Jones e3b270a62e 4.66.1 v4.66.1 2018-10-24 18:35:34 +00:00
Sabe Jones fceeacec3b chore(i18n): update locales 2018-10-24 18:35:27 +00:00
Matteo Pagliazzi f93c67e57c fix(amazon gift): do not reset the gift amount when opening the amazon modal 2018-10-24 20:29:27 +02:00
Sabe Jones 192dc26fbe Merge branch 'release' into develop 2018-10-23 22:50:49 +00:00
Sabe Jones 1c1f270f64 4.66.0 v4.66.0 2018-10-23 22:50:25 +00:00
Sabe Jones 483768f4a7 chore(i18n): update locales 2018-10-23 22:49:30 +00:00
SabreCat 65031cef3a chore(sprites): compile 2018-10-23 22:45:47 +00:00
Sabe Jones 2fc1f46359 Veteran Pet ladder award for users affected by username changes (#10765)
* feat(usernames): Veteran Pet ladder award for affected users

* feat(content): Vet Pet Bailey etc.
2018-10-23 17:38:30 -05:00
Matteo Pagliazzi 30fd530576 fix(tests): more timeouts fixes 2018-10-23 20:23:52 +02:00
Matteo Pagliazzi f79999fde7 minor deps updates 2018-10-23 16:48:59 +02:00