Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,478 Commits 64 Branches 1,256 Tags
73a5e5fcabccf6a0909d0be5a81d8df95a2fd7ef
Commit Graph

3923 Commits

Author SHA1 Message Date
negue 73a5e5fcab style / padding issues 2023-04-25 20:51:14 +02:00
negue 0a10eb32cc fix "setting new password" invalid check 2023-04-15 20:54:08 +02:00
negue a79bec3fa5 add password for other logins 2023-04-11 23:15:15 +02:00
negue 9ff17fd6dd "fix values" use keydown event to mark as change 2023-04-11 23:05:19 +02:00
negue 1f470942a9 delete old api.vue 2023-04-06 00:19:18 +02:00
negue b4904a8b84 Merge remote-tracking branch 'origin/develop' into negue/ui/setting 
# Conflicts:
#	website/client/src/components/settings/api.vue
#	website/client/src/components/settings/site.vue
 2023-04-06 00:18:07 +02:00
negue b5da7ccc70 refactor webhook ui to use save/cancel buttons 2023-04-06 00:11:36 +02:00
negue f49f67ff5c remove unused settings 2023-04-05 22:56:37 +02:00
CuriousMagpie 8c96ac241a updated stylesheet 2023-04-04 17:42:45 -04:00
negue cc73b44b25 remove advancedCollapsed settings to start it opened 2023-03-29 23:40:30 +02:00
negue e0300e8710 remove displayInviteToPartyWhenPartyIs1 setting 2023-03-29 22:58:09 +02:00
SabreCat 888f6f2486 Merge branch 'sabrecat/fools-2023' into release 2023-03-29 15:07:40 -05:00
Natalie L e8501f5cf8 feat(content): Add April 2023 subscriber items (#14562) 
* feat(content): add April Subscriber items

* feat(content): add slim armor version to April subscriber items
 2023-03-29 14:53:51 -05:00
Natalie L fc49015ff0 chore(content): update press kit faq and third party app list in settings (#14554) 
* Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (405 of 405 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (2781 of 2781 strings)

Translated using Weblate (Portuguese)

Currently translated at 100.0% (135 of 135 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (217 of 217 strings)

Translated using Weblate (Portuguese)

Currently translated at 100.0% (56 of 56 strings)

Translated using Weblate (Portuguese)

Currently translated at 100.0% (13 of 13 strings)

Translated using Weblate (Portuguese)

Currently translated at 100.0% (112 of 112 strings)

Translated using Weblate (Portuguese)

Currently translated at 100.0% (131 of 131 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (405 of 405 strings)

Translated using Weblate (Portuguese)

Currently translated at 81.7% (331 of 405 strings)

Translated using Weblate (Portuguese)

Currently translated at 100.0% (214 of 214 strings)

Translated using Weblate (Portuguese)

Currently translated at 62.5% (5 of 8 strings)

Translated using Weblate (Portuguese)

Currently translated at 100.0% (61 of 61 strings)

Translated using Weblate (Portuguese)

Currently translated at 63.8% (1777 of 2781 strings)

Translated using Weblate (Portuguese)

Currently translated at 100.0% (182 of 182 strings)

Translated using Weblate (Portuguese)

Currently translated at 71.6% (43 of 60 strings)

Translated using Weblate (Portuguese)

Currently translated at 79.7% (609 of 764 strings)

Translated using Weblate (Portuguese)

Currently translated at 100.0% (375 of 375 strings)

Translated using Weblate (Portuguese)

Currently translated at 100.0% (47 of 47 strings)

Translated using Weblate (Portuguese)

Currently translated at 100.0% (770 of 770 strings)

Translated using Weblate (Portuguese)

Currently translated at 100.0% (146 of 146 strings)

Translated using Weblate (German)

Currently translated at 100.0% (404 of 404 strings)

Translated using Weblate (German)

Currently translated at 79.5% (97 of 122 strings)

Translated using Weblate (German)

Currently translated at 97.7% (753 of 770 strings)

Translated using Weblate (German)

Currently translated at 100.0% (146 of 146 strings)

Translated using Weblate (Portuguese)

Currently translated at 77.0% (94 of 122 strings)

Translated using Weblate (Indonesian)

Currently translated at 76.7% (310 of 404 strings)

Translated using Weblate (Portuguese)

Currently translated at 76.2% (93 of 122 strings)

Translated using Weblate (Chinese (Traditional))

Currently translated at 85.6% (2381 of 2781 strings)

Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (60 of 60 strings)

Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (217 of 217 strings)

Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (112 of 112 strings)

Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (267 of 267 strings)

Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (404 of 404 strings)

Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (182 of 182 strings)

Translated using Weblate (Chinese (Traditional))

Currently translated at 95.8% (732 of 764 strings)

Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (122 of 122 strings)

Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (375 of 375 strings)

Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (770 of 770 strings)

Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (146 of 146 strings)

Translated using Weblate (Portuguese)

Currently translated at 74.5% (91 of 122 strings)

Translated using Weblate (Portuguese)

Currently translated at 72.1% (88 of 122 strings)

Co-authored-by: Ana Beatriz <anabeatriz.augusto06@yahoo.com>
Co-authored-by: Andressa Murari Sudré <andressa@sudre.com.br>
Co-authored-by: Cachinhos <cachnhos@gmail.com>
Co-authored-by: Falzart Werefox <muh_fauzi_ramadhan@yahoo.co.id>
Co-authored-by: Jay <fallacyofwildlifeconservation@gmail.com>
Co-authored-by: Jerry Chen <minecjraft@qq.com>
Co-authored-by: Weblate <noreply@weblate.org>
Co-authored-by: Yu-Wei Tien <a38498987911@gmail.com>
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/de/
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/pt/
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/zh_Hant/
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/de/
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/pt/
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/zh_Hant/
Translate-URL: https://translate.habitica.com/projects/habitica/communityguidelines/de/
Translate-URL: https://translate.habitica.com/projects/habitica/communityguidelines/pt/
Translate-URL: https://translate.habitica.com/projects/habitica/communityguidelines/zh_Hant/
Translate-URL: https://translate.habitica.com/projects/habitica/content/pt/
Translate-URL: https://translate.habitica.com/projects/habitica/content/zh_Hant/
Translate-URL: https://translate.habitica.com/projects/habitica/contrib/pt/
Translate-URL: https://translate.habitica.com/projects/habitica/faq/pt/
Translate-URL: https://translate.habitica.com/projects/habitica/faq/zh_Hant/
Translate-URL: https://translate.habitica.com/projects/habitica/front/pt/
Translate-URL: https://translate.habitica.com/projects/habitica/front/zh_Hant/
Translate-URL: https://translate.habitica.com/projects/habitica/gear/pt/
Translate-URL: https://translate.habitica.com/projects/habitica/gear/zh_Hans/
Translate-URL: https://translate.habitica.com/projects/habitica/gear/zh_Hant/
Translate-URL: https://translate.habitica.com/projects/habitica/generic/pt/
Translate-URL: https://translate.habitica.com/projects/habitica/groups/de/
Translate-URL: https://translate.habitica.com/projects/habitica/groups/id/
Translate-URL: https://translate.habitica.com/projects/habitica/groups/pt/
Translate-URL: https://translate.habitica.com/projects/habitica/groups/pt_BR/
Translate-URL: https://translate.habitica.com/projects/habitica/groups/zh_Hans/
Translate-URL: https://translate.habitica.com/projects/habitica/groups/zh_Hant/
Translate-URL: https://translate.habitica.com/projects/habitica/limited/zh_Hant/
Translate-URL: https://translate.habitica.com/projects/habitica/messages/pt/
Translate-URL: https://translate.habitica.com/projects/habitica/npc/pt/
Translate-URL: https://translate.habitica.com/projects/habitica/overview/pt/
Translate-URL: https://translate.habitica.com/projects/habitica/pets/pt/
Translate-URL: https://translate.habitica.com/projects/habitica/pets/zh_Hant/
Translate-URL: https://translate.habitica.com/projects/habitica/questscontent/pt/
Translate-URL: https://translate.habitica.com/projects/habitica/questscontent/zh_Hant/
Translate-URL: https://translate.habitica.com/projects/habitica/rebirth/pt/
Translate-URL: https://translate.habitica.com/projects/habitica/spells/pt/
Translate-URL: https://translate.habitica.com/projects/habitica/subscriber/pt_BR/
Translate-URL: https://translate.habitica.com/projects/habitica/subscriber/zh_Hant/
Translate-URL: https://translate.habitica.com/projects/habitica/tasks/pt/
Translation: Habitica/Achievements
Translation: Habitica/Backgrounds
Translation: Habitica/Communityguidelines
Translation: Habitica/Content
Translation: Habitica/Contrib
Translation: Habitica/Faq
Translation: Habitica/Front
Translation: Habitica/Gear
Translation: Habitica/Generic
Translation: Habitica/Groups
Translation: Habitica/Limited
Translation: Habitica/Messages
Translation: Habitica/Npc
Translation: Habitica/Overview
Translation: Habitica/Pets
Translation: Habitica/Questscontent
Translation: Habitica/Rebirth
Translation: Habitica/Spells
Translation: Habitica/Subscriber
Translation: Habitica/Tasks

* update press kit and third party app list in settings

---------

Co-authored-by: Weblate <noreply@weblate.org>
Co-authored-by: Ana Beatriz <anabeatriz.augusto06@yahoo.com>
Co-authored-by: Andressa Murari Sudré <andressa@sudre.com.br>
Co-authored-by: Cachinhos <cachnhos@gmail.com>
Co-authored-by: Falzart Werefox <muh_fauzi_ramadhan@yahoo.co.id>
Co-authored-by: Jay <fallacyofwildlifeconservation@gmail.com>
Co-authored-by: Jerry Chen <minecjraft@qq.com>
Co-authored-by: Yu-Wei Tien <a38498987911@gmail.com>
Co-authored-by: SabreCat <sabe@habitica.com>
 2023-03-28 16:52:15 -05:00
SabreCat e2defc675e fix(css): don't make invisible links 2023-03-24 19:46:11 -05:00
SabreCat b472af532c Merge branch 'apple_sub_fix' into release 2023-03-21 13:54:16 -05:00
negue 1741ddfc64 webhook margins 2023-03-20 23:00:17 +01:00
negue 24a43d027c userid tooltip 2023-03-20 22:40:19 +01:00
negue 42fcb20bc4 remove balance for choosing class 2023-03-16 00:51:10 +01:00
negue 160848473d show real class setting modal if enough gems available 2023-03-16 00:20:56 +01:00
negue f74ba9738d update apple icon and size 2023-03-16 00:10:53 +01:00
negue bf961bc728 Copied API Token Notification 2023-03-15 23:59:42 +01:00
negue 28f0220b4e remove blue color of setting links 2023-03-15 23:53:33 +01:00
negue b53ccace95 fix username/email setting input width 2023-03-15 23:43:06 +01:00
negue 1dfa5b275d developer mode 2023-03-15 23:11:32 +01:00
SabreCat c83a8c9766 fix(stable): correctly suppress hatching modal 2023-03-15 16:15:55 -05:00
CuriousMagpie c481354f78 feat(content): add new achievement, Plant Parent 2023-03-15 15:51:04 -05:00
CuriousMagpie ec9973f9d2 feature(upgrade): added btn-block styling to "Unpause Damage" button 2023-03-15 15:24:02 -05:00
SabreCat de3f1b3f5e chore(sprites): compile 2023-03-14 16:47:14 -05:00
SabreCat 7098d2a72e Merge branch 'release' into sabrecat/fools-2023 2023-03-14 16:46:11 -05:00
negue 776618d2db Add new Pause Dailies Setting 2023-03-14 21:11:52 +01:00
negue 576c80af7e Merge remote-tracking branch 'origin/develop' into negue/ui/setting 
# Conflicts:
#	website/client/src/components/payments/selectUserModal.vue
#	website/client/src/components/settings/site.vue
#	website/client/src/router/index.js
 2023-03-14 21:04:05 +01:00
negue dec1a1159d developer mode dummy row 2023-03-14 21:00:52 +01:00
SabreCat 8ff8213954 Merge branch 'sabrecat/invite-notif' into release 2023-03-14 09:25:29 -05:00
SabreCat 7874ae5092 fix(hyperlinks): WHITE inactive drawer tabs 2023-03-13 15:28:26 -05:00
SabreCat 481719e513 Revert "fix(hyperlinks): gray inactive drawer tabs" 
This reverts commit 9657112bca.
 2023-03-13 15:19:41 -05:00
SabreCat 9657112bca fix(hyperlinks): gray inactive drawer tabs 2023-03-13 14:35:43 -05:00
SabreCat f7026b2478 Merge branch 'release' into sabrecat/invite-notif 2023-03-13 14:13:06 -05:00
negue 1e80a7d145 WIP webhook row 2023-03-11 00:03:33 +01:00
negue cc4bedbe2d add spritely login creds message to the new api-row / redirect old url to the new one 2023-03-10 20:28:57 +01:00
negue f9833aa78a API Token Row 2023-03-09 02:23:39 +01:00
SabreCat 458aee9a3a Merge branch 'release' into develop 2023-03-07 11:48:14 -06:00
Natalie L 57f86bac70 feat(content): March backgrounds and Enchanted Armoire items (#14524) 
* feat(content): March backgrounds and Enchanted Armoire

* fix(backgrounds): trivial syntax consistency

* fix(gear): missing verbiage

* fix(gear): correct usage of <%= attrs %>

* fix(backgrounds): broken string tokens

* fix(backgrounds): more broken tokens

---------

Co-authored-by: SabreCat <sabe@habitica.com>
Co-authored-by: Sabe Jones <sabrecat@gmail.com>
 2023-03-06 16:57:56 -06:00
Natalie L f2fe83a469 feature(upgrade): copy Pause Damage button to Settings page (#14532) 
* feature(upgrade): copying Pause Damage button to Settings page

* Removing duplicate string 'cause I can't search effectively. 😅
 2023-03-06 16:16:23 -06:00
negue 123c9b9bb1 "Your User Data" Row instead of Page 2023-03-06 22:46:50 +01:00
SabreCat 99c46602c4 fix(fooling): correct special pet mapping 2023-03-06 09:47:53 -06:00
negue 0ade5663ae userid row 2023-03-03 22:43:03 +01:00
negue b4f2236ab8 rename folder of setting rows 2023-03-03 22:22:32 +01:00
SabreCat ee585c0ff3 feat(event): April Fools 2023 2023-03-03 14:32:56 -06:00
SabreCat 16ae182f34 Merge branch 'release' into develop 2023-02-28 15:37:35 -06:00