Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,313 Commits 64 Branches 1,256 Tags
e277a088ee7fd8bacaaed2e49a6faeda0f3873f7
Commit Graph

18313 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Randi Miller e277a088ee Added some additional comments 2019-03-17 04:20:21 -04:00
Randi Miller e083df64e4 fixes #11047 Switches Hall query to use lowercase name 2019-03-17 04:00:50 -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 78612a91dd 4.86.2 v4.86.2 2019-03-12 19:30:09 -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
Matteo Pagliazzi 9b62804a5c fix tavern/chat ui (#11056) 
* add markdown-formatting link - hide textarea if guidelines not accepting - chat ui

* fix item-with-icon height/margins . public guild item member count
 2019-03-11 18:32:07 +01:00
negue d21e29462c fix: shop ui (#11046) 
* shop: equipment-cards background + market filter logic (as other pages)

* shops - quest: refactor filter logic + quest items margins

* shops-seasonal: refactor filter logic

* shops - timeTravelers: refactor filter logic

* fix star/empty colors - fix quest layout - countBadge z-index
 2019-03-11 18:26:23 +01:00
Matteo Pagliazzi 6bccd2a866 New Payments Buttons (#11045) 
* start implementing separate amazon button component

* wio

* switch amazon to new flow

* adjust amazon pay button size

* design buttons and add them to the settings page

* abstract css

* fixes and buy gems modal

* group plans css

* new buttons for gifts, fix padding in settings

* gift modal styles

* final style fixes
 2019-03-11 18:23:47 +01:00
negue caea222330 fix item-with-icon height/margins . public guild item member count 2019-03-09 22:19:55 +01:00
negue 8ecbdc1448 add markdown-formatting link - hide textarea if guidelines not accepting - chat ui 2019-03-09 21:10:20 +01:00
Sabe Jones ee20b1eea8 4.86.1 v4.86.1 2019-03-07 13:30:58 -06:00
Sabe Jones ff62c6eea0 Merge branch 'develop' into release 2019-03-07 13:30:49 -06:00
Melior 57cd4d44cd Translated using Weblate (German) (#11052) 
Currently translated at 100.0% (206 of 206 strings)

Translation: Habitica/Settings
Translate-URL: https://translate.habitica.com/projects/habitica/settings/de/

Merge branch 'origin/develop' into Weblate.

Translated using Weblate (Russian)

Currently translated at 99.7% (1753 of 1757 strings)

Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/ru/

Merge branch 'origin/develop' into Weblate.

Translated using Weblate (Russian)

Currently translated at 100.0% (309 of 309 strings)

Translation: Habitica/Content
Translate-URL: https://translate.habitica.com/projects/habitica/content/ru/

Translated using Weblate (Portuguese (Brazil))

Currently translated at 98.8% (412 of 417 strings)

Translation: Habitica/Backgrounds
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/pt_BR/

Translated using Weblate (Russian)

Currently translated at 100.0% (169 of 169 strings)

Translation: Habitica/Npc
Translate-URL: https://translate.habitica.com/projects/habitica/npc/ru/

Translated using Weblate (Russian)

Currently translated at 99.7% (1753 of 1757 strings)

Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/ru/

Translated using Weblate (Russian)

Currently translated at 100.0% (153 of 153 strings)

Translation: Habitica/Limited
Translate-URL: https://translate.habitica.com/projects/habitica/limited/ru/

Translated using Weblate (Russian)

Currently translated at 99.7% (1753 of 1757 strings)

Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/ru/

Translated using Weblate (Russian)

Currently translated at 100.0% (153 of 153 strings)

Translation: Habitica/Limited
Translate-URL: https://translate.habitica.com/projects/habitica/limited/ru/

Translated using Weblate (Russian)

Currently translated at 99.7% (1753 of 1757 strings)

Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/ru/

Translated using Weblate (Russian)

Currently translated at 99.7% (1753 of 1757 strings)

Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/ru/

Translated using Weblate (Russian)

Currently translated at 99.7% (1753 of 1757 strings)

Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/ru/

Translated using Weblate (Russian)

Currently translated at 99.7% (1753 of 1757 strings)

Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/ru/

Translated using Weblate (Russian)

Currently translated at 99.7% (1753 of 1757 strings)

Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/ru/

Translated using Weblate (Russian)

Currently translated at 99.7% (1752 of 1757 strings)

Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/ru/

Translated using Weblate (Russian)

Currently translated at 100.0% (153 of 153 strings)

Translation: Habitica/Limited
Translate-URL: https://translate.habitica.com/projects/habitica/limited/ru/

Translated using Weblate (Russian)

Currently translated at 99.7% (1752 of 1757 strings)

Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/ru/

Translated using Weblate (Russian)

Currently translated at 100.0% (211 of 211 strings)

Translation: Habitica/Tasks
Translate-URL: https://translate.habitica.com/projects/habitica/tasks/ru/

Translated using Weblate (Russian)

Currently translated at 100.0% (36 of 36 strings)

Translation: Habitica/Loadingscreentips
Translate-URL: https://translate.habitica.com/projects/habitica/loadingscreentips/ru/

Translated using Weblate (Russian)

Currently translated at 99.7% (1752 of 1757 strings)

Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/ru/

Translated using Weblate (Russian)

Currently translated at 100.0% (309 of 309 strings)

Translation: Habitica/Content
Translate-URL: https://translate.habitica.com/projects/habitica/content/ru/

Translated using Weblate (Russian)

Currently translated at 100.0% (137 of 137 strings)

Translation: Habitica/Challenge
Translate-URL: https://translate.habitica.com/projects/habitica/challenge/ru/

Translated using Weblate (Russian)

Currently translated at 100.0% (417 of 417 strings)

Translation: Habitica/Backgrounds
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/ru/

Translated using Weblate (Russian)

Currently translated at 100.0% (417 of 417 strings)

Translation: Habitica/Backgrounds
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/ru/

Translated using Weblate (German)

Currently translated at 100.0% (309 of 309 strings)

Translation: Habitica/Content
Translate-URL: https://translate.habitica.com/projects/habitica/content/de/
 2019-03-07 13:30:19 -06:00
Sabe Jones e989503cfa Merge branch 'develop' into release 2019-03-07 13:28:34 -06:00
Sabe Jones 431cec7634 fix(strings): remove some trailing spaces 2019-03-07 13:28:05 -06:00
Matteo Pagliazzi 2a367ab3a7 Revert "New payments buttons and new Amazon checkout flow (#10940)" 
This reverts commit 77f3bb53de.
 2019-03-07 16:58:49 +01:00
Matteo Pagliazzi bc91dd81e9 Revert "fix(amazon): make sure to use up to date data" 
This reverts commit 298a79b58d.
 2019-03-07 16:58:38 +01:00
Sabe Jones 201085651b Merge branch 'release' into develop 2019-03-05 15:44:04 -06:00
Sabe Jones bb395a7ad8 4.86.0 v4.86.0 2019-03-05 15:43:35 -06:00
Sabe Jones 264aad79ac chore(sprites): compile 2019-03-05 15:43:29 -06:00
Sabe Jones 9c797e6a54 feat(content): Armoire and Backgrounds March 2019 2019-03-05 15:43:19 -06:00
Sabe Jones e6c3d00665 fix(emails): send split-test mailings for social reg accounts 2019-03-05 14:55:45 -06:00
negue 660928323e fix header design (#11013) 
* statsbar-component for a closer tooltip

* fix scss scope, twice
 2019-03-04 22:01:45 +01:00
Matteo Pagliazzi 298a79b58d fix(amazon): make sure to use up to date data 2019-03-04 22:00:40 +01:00
Matteo Pagliazzi 77f3bb53de New payments buttons and new Amazon checkout flow (#10940) 
* start implementing separate amazon button component

* wio

* switch amazon to new flow
 2019-03-04 21:51:17 +01:00
Alec Brickner 17d8a7b706 Fix mismatch between pet and star badge (#11041) 2019-03-03 17:48:51 +01:00
Alec Brickner 1d8a5b1952 Keep mystery items synced with server (#11039) 2019-03-03 17:39:42 +01:00
negue f548103f4c fixes Tasks UI (#11036) 
* show grabbing cursor while dragging

* 40px height search + tags button

* remove margin of task-title markdown-p-tag

* remove pointer on disabled task-controls

* show `Options` instead of  `Show More`

* remove margin of checklist items

* remove space between notes and checklist
 2019-03-03 17:28:58 +01:00
negue 2595ccb2b4 refactor filters to work like in guilds/challenges (#11023) 2019-03-03 17:24:59 +01:00
negue ceb4288b17 Footer Design / Instagram Link (#11022) 
* re-add instagram icon+link

* fix donate button hover - smaller icons if not desktop

* lower margin on the small icons

* Update appFooter.vue

remove DevBlog link from footer
 2019-03-03 17:22:55 +01:00
negue 3ebd37f7cb replace the questInfo to use table-like behavior, expands to the content (#10995) 2019-03-03 17:17:45 +01:00
Matteo Pagliazzi ff3df55639 Merge branch 'negue/flagpm' into develop 2019-03-03 17:12:19 +01:00
Matteo Pagliazzi 080c4b3e20 Merge branch 'develop' into negue/flagpm 2019-03-03 17:12:11 +01:00
Alec Brickner e939799800 Ensure profile page gets synced (#11032) 2019-03-03 17:05:38 +01:00
Sabe Jones b7797b3e6c 4.85.5 v4.85.5 2019-03-01 16:22:33 -06:00
Sabe Jones 55bd35d7d3 chore(monthly): announce Challenges, end potions 2019-03-01 16:22:19 -06:00
Sabe Jones b9ae03f795 4.85.4 v4.85.4 2019-02-28 16:02:53 -06:00
Sabe Jones 75f6398de2 chore(news): Bailey 2019-02-28 16:02:46 -06:00
Sabe Jones a1fb702d1e Merge branch 'release' into develop 2019-02-27 16:17:23 -06:00
Sabe Jones 868759d3e8 4.85.3 v4.85.3 2019-02-27 16:17:01 -06:00
Matteo Pagliazzi 45a9d6d17b ios: cancel invalid subscriptions without errors (#11035) 2019-02-27 18:48:13 +01:00
Matteo Pagliazzi cc766d2260 gcp stackdriver tracing: attach user id (#11033) 2019-02-27 18:47:33 +01:00
Sabe Jones e710a00e74 Merge branch 'release' into develop 2019-02-26 17:53:19 -06:00
Sabe Jones bad06ba449 4.85.2 v4.85.2 2019-02-26 17:52:59 -06:00
Sabe Jones ccb088e127 Merge branch 'sabrecat/email-split' into release 2019-02-26 17:52:48 -06:00
Sabe Jones 4a4d48aed8 chore(email): expand to 4 variants 2019-02-26 10:14:55 -06:00