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

1417 Commits

Author SHA1 Message Date
negue ea8563cd17 Merge remote-tracking branch 'origin/negue/ui/setting' into negue/ui/setting 2023-08-29 21:23:02 +02:00
negue 3e16584dcf fix PR comments 2023-08-29 21:22:06 +02:00
negue 84ba44fb19 fix PR comments 2023-08-29 20:38:54 +02:00
CuriousMagpie 6259955891 update form.scss 2023-08-25 11:20:26 -04:00
negue da82bd8e68 remove ending 2023-08-24 21:40:02 +02:00
negue 82e5fd2a83 fix spacing 2023-08-21 22:25:41 +02:00
negue 9ad06ea88b clean up debug row for login methods 2023-08-21 22:09:22 +02:00
negue 41cde37675 Merge remote-tracking branch 'origin/develop' into negue/ui/setting 
# Conflicts:
#	website/client/src/router/user-routes.js
 2023-08-21 21:51:22 +02:00
negue 8c568060f9 fix PR comments 2023-08-21 21:49:31 +02:00
SabreCat 50cc7ee09a fix(profile): skip redundant navigation 2023-08-15 15:48:30 -05:00
negue b679cfb935 Split Vue.Router routes (#14812) 2023-08-11 15:34:59 -05:00
negue 36f7a4711d Merge remote-tracking branch 'origin/develop' into negue/ui/setting 2023-08-11 20:04:15 +02:00
negue d279af7897 Merge branch 'negue/refactor/routes' into negue/ui/setting 
# Conflicts:
#	config.json.example
#	website/client/src/router/index.js
#	website/client/src/router/static-routes.js
#	website/client/src/router/user-routes.js
#	website/common/locales/en/settings.json
 2023-08-09 21:13:37 +02:00
negue b20ea44d49 Split Vue.Router routes 2023-08-09 21:04:12 +02:00
SabreCat fd038bd150 fix(groups): redirect guild url to group plan 2023-08-08 13:44:21 -05:00
SabreCat a79a088a8f Merge branch 'sabrecat/unsociable' into release 2023-08-08 09:24:06 -05:00
SabreCat 1371b80635 fix(groups): add back string 
also fix party seeking analytics and a spurious text decoration
 2023-08-07 15:55:29 -05:00
SabreCat 9fa355fbcc fix(sunset): release candidate 2023-08-07 15:04:44 -05:00
SabreCat a8b52ab656 fix(chat): correctly map CG bullet points 2023-08-07 12:51:19 -05:00
SabreCat cce6d91611 fix(groups): return Plans on GET guilds 2023-08-07 12:24:43 -05:00
SabreCat 6867aab74b fix(faq): better mobile routing, new q 2023-08-01 18:38:21 -05:00
SabreCat 150cd16b1c Merge branch 'release' into sabrecat/unsociable 2023-08-01 15:27:16 -05:00
SabreCat 9b8bb99039 fix(profile): revert accidental changes 2023-08-01 13:44:49 -05:00
SabreCat 1532f8f774 Merge branch 'sabrecat/chat-warning' into sabrecat/unsociable 2023-07-31 18:44:43 -05:00
SabreCat aa4426c800 fix(event): corrections to contributor goodies 2023-07-31 18:44:08 -05:00
SabreCat 7697d87358 Merge branch 'develop' into sabrecat/unsociable 2023-07-31 12:08:58 -05:00
SabreCat 712205d253 Merge branch 'develop' into sabrecat/chat-warning 2023-07-31 12:07:48 -05:00
SabreCat 67c16c137b Merge branch 'release' into develop 2023-07-31 12:07:26 -05:00
Sabe Jones ede036e94b Universal routing for migrations (#14772) 
* refactor(notifs): universal routing for migrations

* fix(lint): remove whitespace

* chore(content): update migration for new scheme

* fix(migration): account for cake

* chore(images): update sprite CSS

---------

Co-authored-by: SabreCat <sabe@habitica.com>
 2023-07-31 12:07:46 -05:00
CuriousMagpie 652dfa6ecc feat(content): upgrade profile page 2023-07-26 16:33:05 -04:00
SabreCat 714319d67b Merge branch 'sabrecat/item-notification-url' of https://github.com/HabitRPG/habitica into sabrecat/unsociable 2023-07-25 15:37:28 -05:00
SabreCat cbaa3180cc Merge branch 'develop' into sabrecat/unsociable 2023-07-25 15:17:13 -05:00
SabreCat b4866fd3b1 chore(content): update migration for new scheme 2023-07-25 15:09:50 -05:00
SabreCat 86646bbbdb Merge branch 'develop' into sabrecat/item-notification-url 2023-07-25 14:42:21 -05:00
Natalie L 08ac059a7f feat(content): add August 2023 subscriber items (#14784) 
* feat(content): add June subscriber items

* feat(content): add August subscriber items
 2023-07-25 14:14:28 -05:00
negue ffbed3e044 remove console 2023-07-23 00:00:24 +02:00
negue 4c350b0180 update Bailey Notification Text + fix popover 2023-07-22 23:34:20 +02:00
negue c105b9ecf9 fix change password setting 2023-07-22 23:21:53 +02:00
negue 06410b4807 fix reset account texts 2023-07-22 22:50:00 +02:00
negue ccfdd9bb9c Merge remote-tracking branch 'origin/develop' into negue/ui/setting 2023-07-22 22:48:13 +02:00
SabreCat 282abecd21 fix(lint): remove whitespace 2023-07-20 16:07:16 -05:00
SabreCat ba61c91296 refactor(notifs): universal routing for migrations 2023-07-19 16:42:45 -05:00
SabreCat af04657856 feat(event): Summer Splash Orcas 2023-07-18 09:12:28 -05:00
SabreCat 08a5bff815 Merge branch 'release' into sabrecat/unsociable 2023-07-17 16:11:14 -05:00
SabreCat f3f69b1871 fix(lfp): white background for seeker card 2023-07-13 14:45:31 -05:00
SabreCat 1deb903186 Merge branch 'release' into sabrecat/chat-warning 2023-07-06 15:23:46 -05:00
SabreCat 8c00b91cc6 feat(faq): update sunset faq 2023-07-06 15:23:42 -05:00
Natalie L c562c93158 feat(content): add July 2023 backgrounds and Enchanted Armoire (#14733) 
* feat(content): add June subscriber items

* feat(content): add July backgrounds and Enchanted Armoire Items

* Update backgrounds.json

---------

Co-authored-by: SabreCat <sabe@habitica.com>
Co-authored-by: Sabe Jones <sabrecat@gmail.com>
 2023-07-04 13:23:06 -05:00
negue 35c75304f1 more fixes 2023-07-02 20:16:06 +02:00
negue 203e961464 fix notification settings 2023-07-02 19:45:17 +02:00