Commit Graph

565 Commits

Author SHA1 Message Date
Sabe Jones 8b9c7da5dc Merge branch 'release' into develop 2019-08-27 16:00:52 -05:00
Sabe Jones a1535d286d chore(sprites): compile 2019-08-27 16:00:12 -05:00
Sabe Jones 38f17f0b6a Merge branch 'release' into develop 2019-08-20 11:23:19 -05:00
Matteo Pagliazzi 0ed8bcedca fix(logo): remove unused mask props 2019-08-20 18:13:07 +02:00
Sabe Jones ccde367a06 chore(news): Kickstarter announcement 2019-08-20 10:30:31 -05:00
Sabe Jones 4de8e9a3fd chore(news): Bailey
Also adds target:_blank to some Tavern links
2019-08-15 09:47:52 -05:00
Sabe Jones 0a73a14bff chore(sprites): compile 2019-08-13 19:16:29 -05:00
Sabe Jones 41782b2157 feat(content): re-enable Farm Friends bundle 2019-08-08 15:47:33 -05:00
Sabe Jones e2385bd1fd Merge branch 'release' into develop 2019-08-06 16:59:08 -05:00
Sabe Jones 8886082ebf chore(sprites): compile 2019-08-06 16:44:05 -05:00
Sabe Jones 07ae4134f3 Squashed commit of the following:
commit 0db0a69f0fa00d831b7d90340e045097e8d92343
Author: Sabe Jones <sabrecat@gmail.com>
Date:   Tue Jul 16 10:01:49 2019 -0500

    fix(groups): return 0, not empty, when skipping downscore on Dailies
    fixes #11231

commit 1bf5bc714f660345f37bcc4e3587143341521c65
Author: Sabe Jones <sabrecat@gmail.com>
Date:   Tue Jul 16 09:48:28 2019 -0500

    fix(groups): correct task creation button

commit 90908211200bc4a3eb204178df5c812ffcd09f37
Author: Sabe Jones <sabrecat@gmail.com>
Date:   Tue Jul 16 09:46:04 2019 -0500

    fix(groups): clear approval status at cron for Habits and Dailies

commit 57e8dd0252c3ea45dd6fa1a7670ee197f32e76e5
Merge: d31b0a2d0 c9a56e8f3
Author: Sabe Jones <sabrecat@gmail.com>
Date:   Tue Jul 16 09:33:27 2019 -0500

    Merge branch 'develop' into sabrecat/group-tasks

commit d31b0a2d0e3b7a46235696e9b05fa734ac29a2e5
Merge: f2185a91b 043696c22
Author: SabreCat <sabrecat@gmail.com>
Date:   Mon Jun 24 14:58:26 2019 +0000

    Merge branch 'develop' into sabrecat/group-tasks

commit f2185a91bde554c7eb22cd6bdfc1ef9227f1e765
Author: Sabe Jones <sabrecat@gmail.com>
Date:   Tue Jun 18 10:10:10 2019 -0500

    fix(groups): divide task delta by number of assigned users

commit af0cde52f22129312d0102ecc5571f59aa2e396e
Author: Sabe Jones <sabrecat@gmail.com>
Date:   Tue Jun 18 10:06:01 2019 -0500

    fix(groups): remove chat spam

commit c1c810967a9e34155948a9164862125517372268
Merge: bf4f3fb08 f987585cf
Author: Sabe Jones <sabrecat@gmail.com>
Date:   Tue Jun 18 08:15:28 2019 -0500

    Merge branch 'develop' into sabrecat/group-tasks

commit bf4f3fb08491b4c4e1dbfaa58a2a6510c3cb78aa
Author: Sabe Jones <sabrecat@gmail.com>
Date:   Thu May 23 11:29:01 2019 -0500

    fix(test): expect new task class from store

commit ae0379c80519523f68d4d606e1cc4bed8e9e49ec
Merge: ce5096e11 664cf5a47
Author: Sabe Jones <sabrecat@gmail.com>
Date:   Thu May 23 11:25:15 2019 -0500

    Merge branch 'develop' into sabrecat/group-tasks

commit ce5096e116558419e4a73e8b23a58c78a1f2ab9b
Author: Sabe Jones <sabrecat@gmail.com>
Date:   Thu May 23 11:02:01 2019 -0500

    feat(group-plans): clarify non-interactive controls on task board

commit ff3cec9530e30d51c43171d6f97d3888ff200352
Author: Sabe Jones <sabrecat@gmail.com>
Date:   Tue May 21 11:10:50 2019 -0500

    feat(group-plans): score shared task when user scores it
2019-08-02 15:49:41 -05:00
Sabe Jones 90e89791f3 chore(event): end Summer Splash 2019-08-01 18:08:43 -05:00
Sabe Jones 016c8307df chore(event): Naming Day 2019 2019-07-31 13:13:27 -05:00
Sabe Jones 7ffecf9206 Merge branch 'release' into develop 2019-07-25 15:00:01 -05:00
Sabe Jones c98d7aae37 chore(sprites): compile 2019-07-25 14:58:18 -05:00
Matteo Pagliazzi ea13aece21 fix better tasks color 2019-07-25 21:47:58 +02:00
Tressley Cahill 2f6584378d New colors updates (#11261)
* Update $purple-400

* Update colors.scss

Adds new colors and updates existing variables.
2019-07-22 19:00:39 +02:00
Sabe Jones c99d62228f Merge branch 'release' into develop 2019-07-17 14:20:54 -05:00
Sabe Jones 61c78355bd feat(content): enable Splashy Pals Bundle 2019-07-17 14:20:21 -05:00
reisturm 6724413ce9 Fixed styling bug on stats profile page. (#11187)
* Fixed styling bug on stats profile page.

* 24 px popover-content-titleonly
2019-07-12 16:02:33 +02:00
Tressley Cahill babceaff42 Update "Add Task" button to diamond (#11214)
* Update $purple-400

* Add .diamond-btn

Swapped .rounded-btn for .diamond-btn
2019-07-12 15:36:14 +02:00
Sabe Jones adbe58a0da chore(sprites): compile 2019-07-02 13:30:41 -05:00
Sabe Jones 1c59e78ea9 chore(sprites): compile 2019-07-01 14:53:50 -05:00
SabreCat 3b268287b1 chore(sprites): compile 2019-06-25 15:14:56 +00:00
Sabe Jones 69c2b0378f chore(sprites): compile 2019-06-20 15:13:27 -05:00
Sabe Jones 2c03c114da chore(sprites): compile 2019-06-18 19:20:23 -05:00
Sabe Jones 8e9500fed2 feat(event): Summer Splash 2019 2019-06-18 19:20:14 -05:00
Sabe Jones 8bbada540d feat(rebirth): add banner to buy modal 2019-06-18 15:24:50 -05:00
Sabe Jones 4c4fbfe790 fix(backgrounds): put errant BGs on 3x3 grid 2019-06-13 12:22:28 -05:00
Sabe Jones 896950dbf0 chore(sprites): compile 2019-06-11 15:26:50 -05:00
Sabe Jones a0b6f576d2 Merge branch 'release' into develop 2019-06-04 16:49:17 -05:00
Sabe Jones e1fe48bee4 chore(sprites): compile 2019-06-04 16:48:16 -05:00
Sabe Jones 74c93955f8 Merge branch 'release' into develop 2019-06-03 15:22:54 -05:00
Sabe Jones a26c2bce23 chore(date): Bailey and disable potions 2019-06-03 15:22:21 -05:00
HydeHunter2 fb6ca0c73b Add chevron buttons to sub-items in the menu (#11158)
* Add arrow buttons to sub-items

* Fix mistyped in width

* Add 'v-once' to never changing elements(icons)

* Add animation and ability to close tabs

* Fix typo in rotate

* Only 1 opened tab

* Add animation to dropdown elements

* Close menu after clicking tab

* Improved closing the menu after clicking on links

* Remove browser prefixes

* Add 'active' class to some tabs after clicking

* Return ability to open tabs from Desktop

* pin 'currency-tray' at top of menu

* Revert "pin 'currency-tray' at top of menu"

This reverts commit 12d4144a11.

* Fix display of 'Groups' sub-items
2019-05-31 12:51:29 +02:00
Alexey Pyltsyn 75281ab638 Remove default color in Instagram icon (#11196) 2019-05-31 12:23:00 +02:00
Sabe Jones ef0c11c2bd chore(sprites): compile 2019-05-30 15:13:35 -05:00
Sabe Jones cd67877ef3 chore(sprites): compile 2019-05-28 15:45:16 -05:00
Sabe Jones 8c005aa05a fix(shops): remove outdated Featured Item
and Bailey
2019-05-23 13:40:06 -05:00
Sabe Jones 01657f573d feat(quests): create Hatching Potion category 2019-05-21 14:48:44 -05:00
Sabe Jones 95613dcfb8 Merge branch 'sabrecat/potion-quests' into release 2019-05-21 14:28:46 -05:00
Sabe Jones 8498ab9fe2 chore(news): Bailey 2019-05-16 14:07:39 -05:00
Sabe Jones 790614a9d4 chore(sprites): compile 2019-05-14 16:33:51 -05:00
Sabe Jones 0eb7e10e7f fix(sprites): rebuild including Wolf 2019-05-14 13:22:45 -05:00
Sabe Jones 71904d106f chore(sprites): compile 2019-05-13 11:02:19 -05:00
Sabe Jones 5a473eb0e0 Merge branch 'develop' into release 2019-05-09 14:32:14 -05:00
Sabe Jones e6fcdf62ef fix(sprites): dojo resize fix 2019-05-09 14:31:28 -05:00
Sabe Jones 09e748bc92 feat(content): reenable Feathered Friends bundle 2019-05-09 14:27:22 -05:00
Matteo Pagliazzi 9151690f86 Better group plan and subscription cancellation (#11132)
* wip: better group plan cancellation

* add cancelation confirm modal

* abstract confirm modal for subs

* abstract canceled modal for subs

* working code

* add missing files

* fix text and margins

* fix(cancel modal): share css and add close icon
2019-05-08 21:37:02 +02:00
Sabe Jones 411213f381 chore(sprites): compile 2019-05-07 15:57:02 -05:00