Phillip Thelen
e6ffd69148
feat(analytics): initial Habitica-owned solution
2026-04-08 15:35:47 -05:00
Fiz
74fc543ef2
Orb of Rebirth Updates (Count usage) ( #15629 )
...
* Update orb of rebirth to count every usage
* Orb of rebirth modal UI updates
* Fix rebirth modal showing again after page refresh
* remove unused MAX_LEVEL
* scale orb of rebirth on modal
* UI & wording updates for Orb of Rebirth
* UI & wording updates for Orb of Rebirth cont.
* Orb of rebirth UI tweaks
* Orb of rebirth UI tweaks
* Orb of Rebirth modal UI tweak
* Extend modal waves
* Continued Orb of Rebirth UI Updates
* Orb of rebirth margin tweak
* rebirth-orb asset
2026-03-12 14:51:48 -05:00
Fiz
42083efb7e
Emojis Update ( #15620 )
...
* Add group plan selection modal for upgrades
Allow users to select an existing group to upgrade before creating a new one.
* crlf -> lf lint
* set selection of group plan
Also tiny UI fixes
* Update group plan selection to include expired plans
* Add includeExpiredPlans option to group fetching
* force flag when fetching group plans
* Update group plan eligibility check
* Fix eslint error in push notification import
* replace chaining (?.) w/null check
* Remove comment
* set initial selected group plan, and fix card rounding
* format member count
* Show warning for pending party invites when upgrading to paid group plan
Show warning for pending party invites when upgrading to paid group plan. If user upgrades from party to group, remove any pending invites
* suppress error toasts for group modal, and UI tweaks for group modal
suppress error toast for 404 on party fetch for users without a party (for group modal), Increase check SVG size in selectableCard, and show "Previously upgraded" label for parties that were canceled group plans
* Clear upgradingGroup state after group plan payment
* Update emoji system to native Unicode rendering
* Fix line endings in habiticaMarkdown test
* fix indented code block detection for markdown-it v14
* update habitica-markdown to include v3 emoji dataset (pointed towards test branch)
* size emoji in markdown
* emoji autocomplete to chat, messages, tasks, and profile
add :emoji shortcode autocomplete dropdown (reusing existing autocomplete mixin w/new helper)
* try upping github-action fix
* trying another github actions fix
* update habitica-markdown package version (v3.0.0 -> v4.0.0)
* Fix emoji autocomplete overlapping actual text
position dropdown below text
* update group-plans info card styles
* Support Melior emoji autocomplete & more places for emoji autocomplete
Include emoji autocomplete in task checklists, tags, challenge name/summary/description
* position emoji autocomplete dropdown below text area
* fix: replace nested ternary
* Emoji autocomplete fixes
Fix emoji autocomplete overlapping checklist text, and add short name emoji autocomplete
* Have emoji autocomplete dropdown directly below text, add to task tag
* Fix emoji autocomplete starting at beginning/end initially
* lint/line length
* Add group plan selection modal for upgrades
Allow users to select an existing group to upgrade before creating a new one.
* crlf -> lf lint
* set selection of group plan
Also tiny UI fixes
* Update group plan selection to include expired plans
* Add includeExpiredPlans option to group fetching
* force flag when fetching group plans
* Update group plan eligibility check
* Fix eslint error in push notification import
* replace chaining (?.) w/null check
* Remove comment
* set initial selected group plan, and fix card rounding
* format member count
* Show warning for pending party invites when upgrading to paid group plan
Show warning for pending party invites when upgrading to paid group plan. If user upgrades from party to group, remove any pending invites
* suppress error toasts for group modal, and UI tweaks for group modal
suppress error toast for 404 on party fetch for users without a party (for group modal), Increase check SVG size in selectableCard, and show "Previously upgraded" label for parties that were canceled group plans
* Clear upgradingGroup state after group plan payment
* Update emoji system to native Unicode rendering
* Fix line endings in habiticaMarkdown test
* fix indented code block detection for markdown-it v14
* update habitica-markdown to include v3 emoji dataset (pointed towards test branch)
* size emoji in markdown
* emoji autocomplete to chat, messages, tasks, and profile
add :emoji shortcode autocomplete dropdown (reusing existing autocomplete mixin w/new helper)
* try upping github-action fix
* trying another github actions fix
* update habitica-markdown package version (v3.0.0 -> v4.0.0)
* Fix emoji autocomplete overlapping actual text
position dropdown below text
* update group-plans info card styles
* Support Melior emoji autocomplete & more places for emoji autocomplete
Include emoji autocomplete in task checklists, tags, challenge name/summary/description
* position emoji autocomplete dropdown below text area
* fix: replace nested ternary
* Emoji autocomplete fixes
Fix emoji autocomplete overlapping checklist text, and add short name emoji autocomplete
* Have emoji autocomplete dropdown directly below text, add to task tag
* Fix emoji autocomplete starting at beginning/end initially
* lint/line length
* Revert "trying another github actions fix"
This reverts commit 72fc7fc20e .
* Revert "try upping github-action fix"
This reverts commit 70e48a57aa .
* fix(git): revert ci changes
---------
Co-authored-by: Kalista Payne <kalista@habitica.com >
2026-02-26 16:36:37 -06:00
Phillip Thelen
f56708cd88
fix most customizations not being pinnable ( #15578 )
...
* fix most customizations not being pinnable
* set correct pinTypes
* fix(pinning): correct purchase types for base hair and mustaches
* automatically unpin purchased customizations
* ability to pin customization items
* Fix pin not showing on buy modal
* Pin on buy modal tweak
---------
Co-authored-by: Kalista Payne <kalista@habitica.com >
Co-authored-by: Hafiz <hafizbhamidi@gmail.com >
2026-01-21 13:57:42 -06:00
Kalista Payne
fbf69a4a34
Squashed commit of the following:
...
commit dd0a410fa6c3741dc0d6793283cf4df3c37790a5
Author: Kalista Payne <sabrecat@gmail.com >
Date: Mon Nov 4 14:24:30 2024 -0600
fix(subs): center next hourglass message
commit 72d92ffd76bb43fee8ba2bbabd211e595afbd664
Author: Kalista Payne <sabrecat@gmail.com >
Date: Fri Nov 1 14:17:59 2024 -0500
fix(subs): don't hide HG preview entirely
commit ea0ecb0c3d519ed3d5c42266367eaaa7283ac5de
Author: Kalista Payne <sabrecat@gmail.com >
Date: Fri Nov 1 13:01:06 2024 -0500
fix(subs): Google wording and HG escape
commit 2bd2c69e18e37c8c8c7106c62f186c372d25c5d2
Author: Kalista Payne <sabrecat@gmail.com >
Date: Fri Nov 1 09:25:30 2024 -0500
fix(layout): tighten cancellation note
commit eb2fc40d24
Author: Kalista Payne <sabrecat@gmail.com >
Date: Thu Oct 24 15:41:43 2024 -0500
fix(g1g1): don't try to find Gems promo during bogo
commit d3eea86bd7
Author: Kalista Payne <sabrecat@gmail.com >
Date: Thu Oct 24 15:00:09 2024 -0500
fix(subs): fix typeError
commit e3ae9a2d67
Author: Kalista Payne <sabrecat@gmail.com >
Date: Thu Oct 24 13:57:27 2024 -0500
fix(subs): also redirect to subs after gift sub
commit 690163a0de
Author: Phillip Thelen <phillip@habitica.com >
Date: Wed Oct 23 16:42:38 2024 +0200
fix test
commit 2ad7541fc0
Author: Phillip Thelen <phillip@habitica.com >
Date: Wed Oct 23 16:34:52 2024 +0200
fix test
commit 7e337a9e59
Author: Phillip Thelen <phillip@habitica.com >
Date: Wed Oct 23 11:54:15 2024 +0200
remove only
commit 7462b8a57f
Author: Phillip Thelen <phillip@habitica.com >
Date: Wed Oct 23 11:51:25 2024 +0200
fix bug with incorrectly giving HG bonus
commit acd6183e95
Author: Kalista Payne <sabrecat@gmail.com >
Date: Mon Oct 21 17:22:26 2024 -0500
fix(subs): unhovery and un-12-monthy
commit 935e9fd6ec
Author: Kalista Payne <sabrecat@gmail.com >
Date: Fri Oct 18 14:50:17 2024 -0500
fix(subs): try again on gifts
commit 6e1fb7df38
Author: Kalista Payne <sabrecat@gmail.com >
Date: Thu Oct 17 18:19:20 2024 -0500
fix(lint): do negate object ig
commit 71d434b94e
Author: Kalista Payne <sabrecat@gmail.com >
Date: Thu Oct 17 18:15:11 2024 -0500
fix(lint): unnecessary ternary
commit b90b0bb9c3
Author: Kalista Payne <sabrecat@gmail.com >
Date: Thu Oct 17 17:34:24 2024 -0500
fix(subs): gifts DON't renew
commit 19469304c5
Author: Kalista Payne <sabrecat@gmail.com >
Date: Thu Oct 17 17:13:29 2024 -0500
fix(subs): pass autoRenews through Stripe
commit 6819e7b7e5
Author: Kalista Payne <sabrecat@gmail.com >
Date: Thu Oct 17 16:03:25 2024 -0500
fix(subscriptions): minor visual updates
commit 74633b5e5e
Author: Kalista Payne <sabrecat@gmail.com >
Date: Wed Oct 16 17:27:09 2024 -0500
fix(subscriptions): more gift layout revisions
commit a90ccb89de
Author: Kalista Payne <sabrecat@gmail.com >
Date: Wed Oct 16 15:37:50 2024 -0500
fix(subscription): update layout when gifting
commit c24b2db8dc
Author: Phillip Thelen <phillip@habitica.com >
Date: Mon Oct 14 16:11:46 2024 +0200
fix issue with promo hourglasses
commit 7a61c72b47
Author: Phillip Thelen <phillip@habitica.com >
Date: Mon Oct 14 15:59:40 2024 +0200
don’t give additional HG for new sub if they already got one this month
commit f14cb09026
Author: Phillip Thelen <phillip@habitica.com >
Date: Mon Oct 14 10:38:01 2024 +0200
Admin panel display fixes
commit f4cff698cf
Author: Kalista Payne <sabrecat@gmail.com >
Date: Thu Oct 3 17:58:59 2024 -0500
fix(stripe): correct redirect after success
commit c468b58f3f
Author: Kalista Payne <sabrecat@gmail.com >
Date: Thu Oct 3 17:35:37 2024 -0500
fix(subs): correct border-radius and redirect
commit 78fb9e31d6
Author: Kalista Payne <sabrecat@gmail.com >
Date: Wed Oct 2 17:41:49 2024 -0500
fix(css): correct and refactor heights and selection states
commit e2babe8053
Author: Kalista Payne <sabrecat@gmail.com >
Date: Mon Sep 30 16:45:29 2024 -0500
feat(subscription): max Gems progress readout
commit 61af8302a3
Author: Phillip Thelen <phillip@habitica.com >
Date: Fri Sep 27 15:11:22 2024 +0200
fix test
commit ef8ff0ea9e
Author: Phillip Thelen <phillip@habitica.com >
Date: Fri Sep 27 14:14:44 2024 +0200
show date for hourglass bonus if it was received
commit 4bafafdc8d
Author: Phillip Thelen <phillip@habitica.com >
Date: Fri Sep 27 14:12:52 2024 +0200
add new field for cumulative subscription count
commit 30096247b7
Author: Phillip Thelen <phillip@habitica.com >
Date: Fri Sep 27 13:39:49 2024 +0200
fix missing transaction type
commit 70872651b0
Author: Phillip Thelen <phillip@habitica.com >
Date: Fri Sep 27 13:31:40 2024 +0200
fix admin panel strings
commit f3398db65f
Author: Kalista Payne <sabrecat@gmail.com >
Date: Thu Sep 26 23:11:16 2024 -0500
WIP(subs): extant Stripe state
commit c6b2020109
Author: Phillip Thelen <phillip@habitica.com >
Date: Thu Sep 26 11:41:55 2024 +0200
fix admin panel display
commit d9afc96d2d
Author: Phillip Thelen <phillip@habitica.com >
Date: Thu Sep 26 11:40:16 2024 +0200
Fix hourglass logic for upgrades
commit 6e2c8eeb64
Author: Phillip Thelen <phillip@habitica.com >
Date: Wed Sep 25 17:48:54 2024 +0200
fix hourglass count
commit cd752fbdce
Author: Kalista Payne <sabrecat@gmail.com >
Date: Fri Sep 20 12:24:21 2024 -0500
WIP(frontend): draft of main subs page view
commit 0102b29d59
Author: Kalista Payne <sabe@habitica.com >
Date: Wed Sep 18 15:29:08 2024 -0500
fix(admin): correct logic and style for shrimple subs
commit 5469a5c5c3
Author: Kalista Payne <sabe@habitica.com >
Date: Wed Sep 18 15:07:36 2024 -0500
fix(test): short circuit this.
commit 526193ee6c
Author: Phillip Thelen <phillip@habitica.com >
Date: Wed Sep 18 14:42:06 2024 +0200
fix gem limit
commit 19cf1636aa
Author: Phillip Thelen <phillip@habitica.com >
Date: Tue Aug 13 17:00:40 2024 +0200
return nextHourglassDate again
commit eea36e3ed5
Author: Phillip Thelen <phillip@habitica.com >
Date: Tue Aug 13 13:11:22 2024 +0200
subscription test improvements
commit ca78e74330
Author: Phillip Thelen <phillip@habitica.com >
Date: Mon Aug 12 15:46:15 2024 +0200
add more subscription tests
commit f4c4f93a08
Author: Phillip Thelen <phillip@habitica.com >
Date: Fri Aug 9 13:35:22 2024 +0200
finish basic implementation of new logic
commit e036742048
Author: Phillip Thelen <phillip@habitica.com >
Date: Fri Aug 9 11:37:44 2024 +0200
cleanup
commit 6431865688
Author: Phillip Thelen <phillip@habitica.com >
Date: Wed Aug 7 05:41:18 2024 -0400
update cron tests
commit 930d875ae9
Author: Phillip Thelen <phillip@habitica.com >
Date: Thu Aug 8 10:36:50 2024 +0200
begin refactoring
commit 96623608d0
Author: Phillip Thelen <phillip@habitica.com >
Date: Tue Aug 6 16:28:16 2024 +0200
begin removing obsolete tests
2024-11-14 12:31:57 -06:00
Sabe Jones
83a430afad
fix broken test ( #15304 )
...
Co-authored-by: Phillip Thelen <phillip@habitica.com >
2024-08-28 14:39:52 -05:00
Phillip Thelen
63918b3c20
Fix schedule using wrong month at the beginning hours of month ( #15290 )
...
* Fix schedule using wrong month at the beginning hours of month
* fix broken test
* fix switchover for time based matchers
* Fix scheduling issue related to timezones
* Fix end date creating issues
2024-08-06 12:35:05 -05:00
Phillip Thelen
fc11941186
Steampunk gear should not have an end date ( #15256 )
2024-07-29 10:29:42 -05:00
Phillip Thelen
22def5111f
fix purchasing wacky potions ( #15276 )
2024-07-24 10:35:26 -05:00
Sabe Jones
287014518d
Squashed commit of the following:
...
commit 28193f86fb
Author: Phillip Thelen <phillip@habitica.com >
Date: Fri Jun 21 11:12:18 2024 +0200
Fix serving memoized content
commit 877fe48225
Author: Phillip Thelen <phillip@habitica.com >
Date: Thu Jun 20 12:23:24 2024 +0200
correctly memoize conent api
commit e0f6f79c5b
Author: Phillip Thelen <phillip@habitica.com >
Date: Thu Jun 20 10:11:27 2024 +0200
don’t build multiple times on heroku
commit f62254d68e
Author: Phillip Thelen <phillip@habitica.com >
Date: Wed Jun 19 19:40:20 2024 +0200
fix client command
commit d054e6fc16
Author: Phillip Thelen <phillip@habitica.com >
Date: Wed Jun 19 19:36:57 2024 +0200
correct build call
commit 7231f699c1
Author: Phillip Thelen <phillip@habitica.com >
Date: Wed Jun 19 19:32:32 2024 +0200
try setting up with heroku buildpack
commit 1dae0793fd
Author: Phillip Thelen <phillip@habitica.com >
Date: Wed Jun 19 18:50:32 2024 +0200
call gulp build:prod
commit f18fbe86b6
Author: Phillip Thelen <phillip@habitica.com >
Date: Wed Jun 19 18:40:53 2024 +0200
build client
commit 61a61724ca
Author: Phillip Thelen <phillip@habitica.com >
Date: Wed Jun 19 18:33:18 2024 +0200
testing
commit 93cf30eb18
Author: Phillip Thelen <phillip@habitica.com >
Date: Wed Jun 19 18:20:25 2024 +0200
integration fix
commit cff08adcd0
Author: Phillip Thelen <phillip@habitica.com >
Date: Wed Jun 19 18:13:20 2024 +0200
specify dev docker file
commit 4da2ed4a1f
Author: Phillip Thelen <phillip@habitica.com >
Date: Wed Jun 19 18:10:07 2024 +0200
initialize stub
commit 11c5b26c59
Author: Phillip Thelen <phillip@habitica.com >
Date: Wed Jun 19 18:08:45 2024 +0200
test heroku file
commit ac85bb2e2d
Author: Phillip Thelen <phillip@habitica.com >
Date: Wed Jun 19 18:03:15 2024 +0200
fix stub reference
commit 74dfb2710f
Author: Phillip Thelen <phillip@habitica.com >
Date: Wed Jun 19 18:01:27 2024 +0200
test fixes
commit 8dbd3c3db1
Author: Phillip Thelen <phillip@habitica.com >
Date: Wed Jun 19 17:37:04 2024 +0200
fix canOwn test
commit 74b3b348ff
Author: Phillip Thelen <phillip@habitica.com >
Date: Wed Jun 19 17:32:31 2024 +0200
fix buy test
commit 3386d61fde
Author: Phillip Thelen <phillip@habitica.com >
Date: Wed Jun 19 17:30:37 2024 +0200
fix debug tests
commit 19da14531c
Author: Phillip Thelen <phillip@habitica.com >
Date: Wed Jun 19 17:05:25 2024 +0200
add chameleon to featured quests
commit 254dd80f24
Author: Phillip Thelen <phillip@habitica.com >
Date: Wed Jun 19 17:05:14 2024 +0200
fix import
commit 0bc3f16b4b
Author: Phillip Thelen <phillip@habitica.com >
Date: Wed Jun 19 16:33:22 2024 +0200
add new content to new release file
commit 5184973bd5
Author: Phillip Thelen <phillip@habitica.com >
Date: Wed Jun 19 16:33:11 2024 +0200
fix release date tests
commit b6accca5ca
Author: Phillip Thelen <phillip@habitica.com >
Date: Wed Jun 19 16:33:06 2024 +0200
fix armoire tests
commit fec68e6211
Author: Phillip Thelen <phillip@habitica.com >
Date: Wed Jun 19 16:02:03 2024 +0200
fix tests
commit fc63c906dd
Author: Phillip Thelen <phillip@habitica.com >
Date: Mon Jun 10 14:44:21 2024 +0200
Improve test coverage
commit 3333f8f0f5
Author: Phillip Thelen <phillip@habitica.com >
Date: Mon Jun 10 14:24:59 2024 +0200
allow hatching potions to have a release date
commit 89a3ac3dde
Author: Phillip Thelen <phillip@habitica.com >
Date: Mon Jun 10 14:11:38 2024 +0200
allow eggs to have a release date
# Conflicts:
# test/content/armoire.test.js
commit 16551ec83f
Merge: f5f4974a73 2645bf6023
Author: CuriousMagpie <eilatan@gmail.com >
Date: Tue Jun 18 15:03:12 2024 -0400
Merge branch '2024-07-content-prebuild' into subs-private
commit 2645bf6023
Author: CuriousMagpie <eilatan@gmail.com >
Date: Tue Jun 18 15:02:47 2024 -0400
update habitica images
commit f5f4974a73
Author: CuriousMagpie <eilatan@gmail.com >
Date: Tue Jun 18 14:58:13 2024 -0400
update habitica-images
commit 162e337d14
Merge: f2506c3231 21a7d36b7b
Author: CuriousMagpie <eilatan@gmail.com >
Date: Tue Jun 18 13:46:03 2024 -0400
Merge branch '2024-07-content-prebuild' into subs-private
commit 21a7d36b7b
Author: CuriousMagpie <eilatan@gmail.com >
Date: Tue Jun 18 13:45:09 2024 -0400
update sprites
commit f2506c3231
Author: CuriousMagpie <eilatan@gmail.com >
Date: Tue Jun 18 13:24:21 2024 -0400
updated sprites css
commit d47641e25a
Author: CuriousMagpie <eilatan@gmail.com >
Date: Tue Jun 18 12:46:59 2024 -0400
typo fix
commit fb8479ad1e
Author: CuriousMagpie <eilatan@gmail.com >
Date: Mon Jun 17 13:44:36 2024 -0400
finish July prebuild
commit 3810cf3ef3
Author: CuriousMagpie <eilatan@gmail.com >
Date: Fri Jun 14 10:42:47 2024 -0400
add chameleon quest
commit d05da3722c
Author: CuriousMagpie <eilatan@gmail.com >
Date: Thu Jun 13 17:12:43 2024 -0400
add June background notes
commit b8a3440ef2
Author: CuriousMagpie <eilatan@gmail.com >
Date: Thu Jun 13 16:40:04 2024 -0400
fix mystery item and background description
commit 44d63032d8
Author: CuriousMagpie <eilatan@gmail.com >
Date: Thu Jun 13 15:38:23 2024 -0400
add subscriber gear, enchanted armoire, and background
commit 9d7da91ec6
Author: CuriousMagpie <eilatan@gmail.com >
Date: Thu Jun 13 14:44:59 2024 -0400
add sprites
2024-06-28 09:49:08 -05:00
Phillip Thelen
544d67e7e5
lint
2024-06-10 14:53:23 +02:00
Phillip Thelen
eb3220c96b
fix lint
2024-06-10 14:46:32 +02:00
Phillip Thelen
c2b370f4d3
handle error from invalid input
2024-06-10 11:23:46 +02:00
Phillip Thelen
ea66e4e4a1
Add end dates to categories in customizationshop
2024-06-05 10:34:17 +02:00
Phillip Thelen
54b1afd5b4
make content releases use a given offset to the time.
2024-05-29 19:05:17 +02:00
Phillip Thelen
88a0b57335
add end date to seasonal gear in market
2024-05-22 15:47:02 +02:00
Phillip Thelen
2303d5de32
Fix quest premium hatching potions in market
2024-05-22 12:21:51 +02:00
Phillip Thelen
42cafbeaab
make market return unlocked quest potions
2024-05-21 15:39:59 +02:00
Phillip Thelen
57deadaa5c
Fix purchasing some hatching potions
2024-05-17 15:44:08 +02:00
Phillip Thelen
756e99c089
add more purchase related tests
2024-05-17 11:35:22 +02:00
Phillip Thelen
33181c0ac4
Add purchase related test cases
2024-05-17 10:57:33 +02:00
Phillip Thelen
ee974dfa19
fix seasonal quest purchasing
2024-05-17 10:30:15 +02:00
Phillip Thelen
b697598d75
fix showing seasonal gear in market
2024-05-17 10:03:59 +02:00
Phillip Thelen
cac0a84763
Add some tests for time travelers content
2024-05-16 20:19:26 +02:00
Phillip Thelen
c56c07a0f8
fix buying transformation items
2024-05-16 20:19:26 +02:00
Phillip Thelen
929778bdad
fix code coverage
2024-05-16 20:19:26 +02:00
Phillip Thelen
4d38880249
Refactor armoire content to be cached by day
2024-05-15 16:51:09 +02:00
Phillip Thelen
06623991b3
lint
2024-05-15 12:17:18 +02:00
Phillip Thelen
5b6cc23fb7
event code cleanup
2024-05-14 12:41:49 +02:00
Phillip Thelen
efe8cff1ad
fix seasonal gear filtering
2024-05-14 11:56:04 +02:00
Phillip Thelen
592c320d1d
remove only
2024-05-14 11:07:05 +02:00
Phillip Thelen
df641d0866
remove express.js
2024-05-14 11:06:27 +02:00
Phillip Thelen
6afdffae92
fixes
2024-05-13 14:00:44 +02:00
Phillip Thelen
ec76757f93
remove log
2024-05-09 14:38:16 +02:00
Phillip Thelen
a73abcca74
don’t return event data anymore for items
2024-05-09 13:55:24 +02:00
Phillip Thelen
d6cabeedb4
fix tests
2024-04-26 13:44:51 +02:00
Phillip Thelen
6079dd4af6
feature items according to content schedule
2024-04-23 17:20:21 +02:00
Phillip Thelen
d7dc878b1c
Cleanup pinned items that are no longer for purchase
2024-04-23 17:20:20 +02:00
Phillip Thelen
c18e06f071
changes
2024-04-01 18:38:04 -05:00
Phillip Thelen
fb56f7df20
Fix various tests
2024-04-01 18:37:46 -05:00
Sabe Jones
8fa91a3805
chore(node): upgrade to Node 20
2024-03-11 09:59:57 -05:00
Natalie
caa73057d8
update(content): March 2024 content ( #15161 )
...
* feat(content): add February subscriber item, backgrounds, and enchanted armoire gear
* feat(content): add spritesheet
* feat(content): bug smashing
* fix(file): revert package.json to release
* feat(content): add quest bundles
* feat(content): add new achievement
* feat(content): add achievement script
* fix(curlies): remove stray curly boi
* fix(date): add canonical date
* fix(dates): updated background & armoire to canonical dates
* feat(content): add armoire strings & stats
* fix(migration): Golden Squirrel
* fix(backgrounds): trim extra whitespace
* fix(test): cuddle timing
---------
Co-authored-by: Sabe Jones <sabe@habitica.com >
Co-authored-by: Sabe Jones <sabrecat@gmail.com >
2024-02-27 17:25:57 -06:00
Natalie
8db8a8267b
feat(content): December 2023 Content ( #15023 )
...
* feat(content): add December subscriber items, backgrounds, and enchanted armoire
* feat(content): correct item slot for armoire, change release dates for testing
* fix(backgrounds): correct start date
* fix(armoire): Add canonical start date
* fix(test): only count released items
---------
Co-authored-by: Sabe Jones <sabrecat@gmail.com >
Co-authored-by: SabreCat <sabe@habitica.com >
2023-11-28 15:01:27 -06:00
SabreCat
fbb9b2c65a
fix(tests): post merge cleanup
2023-10-03 15:58:31 -05:00
SabreCat
a0941ffa84
Squashed commit of the following:
...
commit 16d8b87e90
Merge: 07387faf48 6bea232d47
Author: negue <eugen.bolz@gmail.com >
Date: Thu Sep 14 22:30:00 2023 +0200
Merge remote-tracking branch 'origin/develop' into negue/ui/setting
commit 07387faf48
Author: negue <eugen.bolz@gmail.com >
Date: Wed Sep 13 23:38:37 2023 +0200
remove generate promoCode from ui
commit 6bea232d47
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon Sep 11 12:55:31 2023 -0400
build(deps): bump core-js from 3.32.1 to 3.32.2 in /website/client (#14867 )
Bumps [core-js](https://github.com/zloirock/core-js/tree/HEAD/packages/core-js ) from 3.32.1 to 3.32.2.
- [Release notes](https://github.com/zloirock/core-js/releases )
- [Changelog](https://github.com/zloirock/core-js/blob/master/CHANGELOG.md )
- [Commits](https://github.com/zloirock/core-js/commits/v3.32.2/packages/core-js )
---
updated-dependencies:
- dependency-name: core-js
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
commit cebb3f0f25
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon Sep 11 12:43:49 2023 -0400
build(deps): bump webpack from 4.46.0 to 4.47.0 in /website/client (#14868 )
Bumps [webpack](https://github.com/webpack/webpack ) from 4.46.0 to 4.47.0.
- [Release notes](https://github.com/webpack/webpack/releases )
- [Commits](https://github.com/webpack/webpack/compare/v4.46.0...v4.47.0 )
---
updated-dependencies:
- dependency-name: webpack
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
commit ea8563cd17
Merge: 3e16584dcf 6259955891
Author: negue <eugen.bolz@gmail.com >
Date: Tue Aug 29 21:23:02 2023 +0200
Merge remote-tracking branch 'origin/negue/ui/setting' into negue/ui/setting
commit 3e16584dcf
Author: negue <eugen.bolz@gmail.com >
Date: Tue Aug 29 21:22:06 2023 +0200
fix PR comments
commit 84ba44fb19
Author: negue <eugen.bolz@gmail.com >
Date: Tue Aug 29 20:38:54 2023 +0200
fix PR comments
commit 6259955891
Author: CuriousMagpie <eilatan@gmail.com >
Date: Fri Aug 25 11:20:26 2023 -0400
update form.scss
commit da82bd8e68
Author: negue <eugen.bolz@gmail.com >
Date: Thu Aug 24 21:40:02 2023 +0200
remove ending
commit 82e5fd2a83
Author: negue <eugen.bolz@gmail.com >
Date: Mon Aug 21 22:25:41 2023 +0200
fix spacing
commit 9ad06ea88b
Author: negue <eugen.bolz@gmail.com >
Date: Mon Aug 21 22:09:22 2023 +0200
clean up debug row for login methods
commit 41cde37675
Merge: 8c568060f9 82ebe71eb4
Author: negue <eugen.bolz@gmail.com >
Date: Mon Aug 21 21:51:22 2023 +0200
Merge remote-tracking branch 'origin/develop' into negue/ui/setting
commit 8c568060f9
Author: negue <eugen.bolz@gmail.com >
Date: Mon Aug 21 21:49:31 2023 +0200
fix PR comments
commit 36f7a4711d
Merge: d279af7897 647b27c55f
Author: negue <eugen.bolz@gmail.com >
Date: Fri Aug 11 20:04:15 2023 +0200
Merge remote-tracking branch 'origin/develop' into negue/ui/setting
commit d279af7897
Merge: ffbed3e044 b20ea44d49
Author: negue <eugen.bolz@gmail.com >
Date: Wed Aug 9 21:13:37 2023 +0200
Merge branch 'negue/refactor/routes' into negue/ui/setting
commit b20ea44d49
Author: negue <eugen.bolz@gmail.com >
Date: Wed Aug 9 21:04:12 2023 +0200
Split Vue.Router routes
commit ffbed3e044
Author: negue <eugen.bolz@gmail.com >
Date: Sun Jul 23 00:00:24 2023 +0200
remove console
commit 4c350b0180
Author: negue <eugen.bolz@gmail.com >
Date: Sat Jul 22 23:34:20 2023 +0200
update Bailey Notification Text + fix popover
commit c105b9ecf9
Author: negue <eugen.bolz@gmail.com >
Date: Sat Jul 22 23:21:53 2023 +0200
fix change password setting
commit 06410b4807
Author: negue <eugen.bolz@gmail.com >
Date: Sat Jul 22 22:50:00 2023 +0200
fix reset account texts
commit ccfdd9bb9c
Merge: 35c75304f1 8558dcc3a8
Author: negue <eugen.bolz@gmail.com >
Date: Sat Jul 22 22:48:13 2023 +0200
Merge remote-tracking branch 'origin/develop' into negue/ui/setting
commit 35c75304f1
Author: negue <eugen.bolz@gmail.com >
Date: Sun Jul 2 20:16:06 2023 +0200
more fixes
commit 203e961464
Author: negue <eugen.bolz@gmail.com >
Date: Sun Jul 2 19:45:17 2023 +0200
fix notification settings
commit ec94604791
Author: negue <eugen.bolz@gmail.com >
Date: Sun Jun 25 22:00:45 2023 +0200
applied same styling to promoCode.vue
commit 0177b3a76b
Author: negue <eugen.bolz@gmail.com >
Date: Sun Jun 25 21:41:05 2023 +0200
move promoCode.vue to pages/settings
commit 8fbb600273
Author: negue <eugen.bolz@gmail.com >
Date: Sun Jun 25 21:40:35 2023 +0200
saveCancelButtons.vue allow to hide the cancel part
commit 4915f2a3fb
Author: negue <eugen.bolz@gmail.com >
Date: Sun Jun 25 21:09:07 2023 +0200
Hide Transactions Page again
commit 8b5ae17f02
Author: negue <eugen.bolz@gmail.com >
Date: Sun Jun 25 20:52:03 2023 +0200
also check for invalid arguments in the password settings
commit aa97ed5299
Author: negue <eugen.bolz@gmail.com >
Date: Sun Jun 25 20:25:53 2023 +0200
fix localhost externalLinks check
commit 87a4e4931b
Author: negue <eugen.bolz@gmail.com >
Date: Sun Jun 25 20:01:31 2023 +0200
show notification on username change + fix userEmail checks
commit 6a6f55f6fc
Merge: f9ff5e5c55 e49d26eacd
Author: negue <eugen.bolz@gmail.com >
Date: Sat Jun 24 22:54:00 2023 +0200
Merge remote-tracking branch 'origin/develop' into negue/ui/setting
commit f9ff5e5c55
Author: negue <eugen.bolz@gmail.com >
Date: Tue May 30 22:41:42 2023 +0200
check password inputs and mark invalid for "password change" setting
commit 4497514eeb
Author: negue <eugen.bolz@gmail.com >
Date: Tue May 30 21:59:21 2023 +0200
show notification when chaning display name
commit 3232f12f0d
Author: negue <eugen.bolz@gmail.com >
Date: Tue May 30 21:55:25 2023 +0200
check current password valid style in "delete account" and "reset account"
commit 582a2f1304
Author: negue <eugen.bolz@gmail.com >
Date: Tue May 30 21:27:20 2023 +0200
mark password field of email setting as invalid on wrong password
commit 8e3b8a962a
Author: negue <eugen.bolz@gmail.com >
Date: Tue May 30 21:24:46 2023 +0200
refactor currentPasswordInput.vue to use validatedTextInput.vue
commit 61521507a4
Author: negue <eugen.bolz@gmail.com >
Date: Tue May 30 20:20:56 2023 +0200
fix username setting:
- unsaved values check
- @ char must be first in input, otherwise not remove it for checks
commit f74c29a065
Merge: c4b6f0c39c d4a5823916
Author: negue <eugen.bolz@gmail.com >
Date: Tue May 30 19:54:06 2023 +0200
Merge remote-tracking branch 'origin/develop' into negue/ui/setting
commit c4b6f0c39c
Merge: 37eee140ad 6e3a367832
Author: negue <eugen.bolz@gmail.com >
Date: Fri May 12 22:08:08 2023 +0200
Merge remote-tracking branch 'origin/develop' into negue/ui/setting
commit 37eee140ad
Author: negue <eugen.bolz@gmail.com >
Date: Fri May 12 21:57:27 2023 +0200
delete account without password
commit 48a6801f4e
Author: negue <eugen.bolz@gmail.com >
Date: Mon May 8 22:06:29 2023 +0200
fix duplicate json entry
commit 47a2189f49
Merge: a56b4a4457 49f45d27e3
Author: negue <eugen.bolz@gmail.com >
Date: Mon May 8 21:48:21 2023 +0200
Merge remote-tracking branch 'origin/release' into negue/ui/setting
commit a56b4a4457
Author: negue <eugen.bolz@gmail.com >
Date: Mon May 8 21:37:31 2023 +0200
show current class on setting panel
commit 9c973cca2a
Author: negue <eugen.bolz@gmail.com >
Date: Mon May 8 21:15:46 2023 +0200
fix selectDifficulty.vue - refactor selectList.vue
commit 95b37b3ba3
Author: negue <eugen.bolz@gmail.com >
Date: Mon May 8 20:45:09 2023 +0200
migrate restoreValues fix to new setting component
commit 7947b1c67d
Merge: ad3e4d604a 71e165433a
Author: negue <eugen.bolz@gmail.com >
Date: Mon May 8 20:41:31 2023 +0200
Merge remote-tracking branch 'origin/develop' into negue/ui/setting
commit ad3e4d604a
Author: negue <eugen.bolz@gmail.com >
Date: Sat Apr 29 01:18:25 2023 +0200
style fixes
commit cea13d5bc3
Merge: 73a5e5fcab b159182188
Author: negue <eugen.bolz@gmail.com >
Date: Fri Apr 28 23:58:09 2023 +0200
Merge remote-tracking branch 'origin/develop' into negue/ui/setting
commit 73a5e5fcab
Author: negue <eugen.bolz@gmail.com >
Date: Tue Apr 25 20:51:14 2023 +0200
style / padding issues
commit 0a10eb32cc
Author: negue <eugen.bolz@gmail.com >
Date: Sat Apr 15 20:54:08 2023 +0200
fix "setting new password" invalid check
commit a79bec3fa5
Author: negue <eugen.bolz@gmail.com >
Date: Tue Apr 11 23:15:15 2023 +0200
add password for other logins
commit 9ff17fd6dd
Author: negue <eugen.bolz@gmail.com >
Date: Tue Apr 11 23:05:19 2023 +0200
"fix values" use keydown event to mark as change
commit 1f470942a9
Author: negue <eugen.bolz@gmail.com >
Date: Thu Apr 6 00:19:18 2023 +0200
delete old api.vue
commit b4904a8b84
Merge: b5da7ccc70 c8b98678d0
Author: negue <eugen.bolz@gmail.com >
Date: Thu Apr 6 00:18:07 2023 +0200
Merge remote-tracking branch 'origin/develop' into negue/ui/setting
commit b5da7ccc70
Author: negue <eugen.bolz@gmail.com >
Date: Thu Apr 6 00:11:36 2023 +0200
refactor webhook ui to use save/cancel buttons
commit f49f67ff5c
Author: negue <eugen.bolz@gmail.com >
Date: Wed Apr 5 22:56:37 2023 +0200
remove unused settings
commit cc73b44b25
Author: negue <eugen.bolz@gmail.com >
Date: Wed Mar 29 23:40:30 2023 +0200
remove advancedCollapsed settings to start it opened
commit e0300e8710
Author: negue <eugen.bolz@gmail.com >
Date: Wed Mar 29 22:58:09 2023 +0200
remove displayInviteToPartyWhenPartyIs1 setting
commit 1741ddfc64
Author: negue <eugen.bolz@gmail.com >
Date: Mon Mar 20 23:00:17 2023 +0100
webhook margins
commit 24a43d027c
Author: negue <eugen.bolz@gmail.com >
Date: Mon Mar 20 22:40:19 2023 +0100
userid tooltip
commit 42fcb20bc4
Author: negue <eugen.bolz@gmail.com >
Date: Thu Mar 16 00:51:10 2023 +0100
remove balance for choosing class
commit 160848473d
Author: negue <eugen.bolz@gmail.com >
Date: Thu Mar 16 00:20:56 2023 +0100
show real class setting modal if enough gems available
commit f74ba9738d
Author: negue <eugen.bolz@gmail.com >
Date: Thu Mar 16 00:10:53 2023 +0100
update apple icon and size
commit bf961bc728
Author: negue <eugen.bolz@gmail.com >
Date: Wed Mar 15 23:59:42 2023 +0100
Copied API Token Notification
commit 28f0220b4e
Author: negue <eugen.bolz@gmail.com >
Date: Wed Mar 15 23:53:33 2023 +0100
remove blue color of setting links
commit b53ccace95
Author: negue <eugen.bolz@gmail.com >
Date: Wed Mar 15 23:43:06 2023 +0100
fix username/email setting input width
commit 1dfa5b275d
Author: negue <eugen.bolz@gmail.com >
Date: Wed Mar 15 23:11:32 2023 +0100
developer mode
commit 776618d2db
Author: negue <eugen.bolz@gmail.com >
Date: Tue Mar 14 21:11:52 2023 +0100
Add new Pause Dailies Setting
commit 576c80af7e
Merge: dec1a1159d 377b152ffd
Author: negue <eugen.bolz@gmail.com >
Date: Tue Mar 14 21:04:05 2023 +0100
Merge remote-tracking branch 'origin/develop' into negue/ui/setting
commit dec1a1159d
Author: negue <eugen.bolz@gmail.com >
Date: Tue Mar 14 21:00:52 2023 +0100
developer mode dummy row
commit 1e80a7d145
Author: negue <eugen.bolz@gmail.com >
Date: Sat Mar 11 00:03:33 2023 +0100
WIP webhook row
commit cc4bedbe2d
Author: negue <eugen.bolz@gmail.com >
Date: Fri Mar 10 20:28:57 2023 +0100
add spritely login creds message to the new api-row / redirect old url to the new one
commit f9833aa78a
Author: negue <eugen.bolz@gmail.com >
Date: Thu Mar 9 02:23:39 2023 +0100
API Token Row
commit 123c9b9bb1
Author: negue <eugen.bolz@gmail.com >
Date: Mon Mar 6 22:46:50 2023 +0100
"Your User Data" Row instead of Page
commit 0ade5663ae
Author: negue <eugen.bolz@gmail.com >
Date: Fri Mar 3 22:43:03 2023 +0100
userid row
commit b4f2236ab8
Author: negue <eugen.bolz@gmail.com >
Date: Fri Mar 3 22:22:32 2023 +0100
rename folder of setting rows
commit 3b050861c4
Author: negue <eugen.bolz@gmail.com >
Date: Tue Feb 21 21:11:48 2023 +0100
move remaining setting to generalSettings.vue - delete site.vue - start with siteData.vue
commit b09298fb01
Author: negue <eugen.bolz@gmail.com >
Date: Tue Feb 21 20:56:03 2023 +0100
move taskSettings.vue and add it to the settings list
commit 5ed25066ec
Author: negue <eugen.bolz@gmail.com >
Date: Tue Feb 21 20:06:13 2023 +0100
size/margin for transactions
commit 25e77cbd95
Author: negue <eugen.bolz@gmail.com >
Date: Tue Feb 21 19:52:12 2023 +0100
move purchaseHistory.vue
commit 8e4e1bcb0f
Merge: bb14d09aa4 85c50d50e9
Author: negue <eugen.bolz@gmail.com >
Date: Tue Feb 21 19:04:31 2023 +0100
Merge remote-tracking branch 'origin/negue/ui/setting' into negue/ui/setting
commit 85c50d50e9
Author: SabreCat <sabe@habitica.com >
Date: Thu Feb 16 14:23:27 2023 -0600
fix(css): remove redundant formatting for a elements
commit bb14d09aa4
Author: negue <eugen.bolz@gmail.com >
Date: Thu Feb 16 01:34:09 2023 +0100
remove console
commit 8c5e722c72
Author: negue <eugen.bolz@gmail.com >
Date: Thu Feb 16 01:26:43 2023 +0100
first try with the refactored UI of Login Methods
commit 9c8770051d
Author: negue <eugen.bolz@gmail.com >
Date: Sat Feb 11 19:13:16 2023 +0100
fix dayStartAdjustmentSetting.vue for 0 value
commit ee2ff3881b
Author: negue <eugen.bolz@gmail.com >
Date: Sat Feb 11 18:37:46 2023 +0100
fix color after refactor
commit 121e7485ca
Author: negue <eugen.bolz@gmail.com >
Date: Sat Feb 11 18:29:00 2023 +0100
mark audioThemeSetting as changed
commit 98c6570003
Author: negue <eugen.bolz@gmail.com >
Date: Sat Feb 11 18:05:55 2023 +0100
fix ul/li style in resetAccount.vue
commit fed824f705
Author: negue <eugen.bolz@gmail.com >
Date: Sat Feb 11 17:49:36 2023 +0100
fix color of gem price
commit 80365e537d
Author: negue <eugen.bolz@gmail.com >
Date: Sat Feb 11 17:44:55 2023 +0100
fix "fixValuesSetting.vue"
commit d3e15c5413
Author: negue <eugen.bolz@gmail.com >
Date: Wed Feb 8 01:06:27 2023 +0100
open forgot password in new tab
commit 31edec9ec5
Author: negue <eugen.bolz@gmail.com >
Date: Wed Feb 8 01:03:19 2023 +0100
move validatedTextInput.vue to shared components + fix check pos/size + input-error cleanup
commit 2adfd8c259
Author: negue <eugen.bolz@gmail.com >
Date: Sun Feb 5 20:19:30 2023 +0100
hide class setting until level 10
commit 64fb4c0cf9
Author: negue <eugen.bolz@gmail.com >
Date: Sun Feb 5 19:32:40 2023 +0100
delete old modals (refactored into new settings ui)
commit b5be137a8d
Author: negue <eugen.bolz@gmail.com >
Date: Sun Feb 5 19:27:26 2023 +0100
enable forgot password link in settings
commit bec75c6e12
Author: negue <eugen.bolz@gmail.com >
Date: Sun Feb 5 18:52:54 2023 +0100
reset account + password required in api
commit 64f7e7a1d9
Author: negue <eugen.bolz@gmail.com >
Date: Mon Jan 30 23:22:55 2023 +0100
fix compile
commit 7ffb5101be
Merge: 2bfb130b92 9f64633a57
Author: negue <eugen.bolz@gmail.com >
Date: Mon Jan 30 22:47:05 2023 +0100
Merge remote-tracking branch 'origin/develop' into negue/ui/setting
commit 2bfb130b92
Author: negue <eugen.bolz@gmail.com >
Date: Mon Jan 30 22:44:23 2023 +0100
remove restore-modal and replace it with the finished fix values setting
commit 89530a133c
Author: negue <eugen.bolz@gmail.com >
Date: Wed Jan 18 19:22:36 2023 +0100
wip fix values
commit 428647fc71
Author: negue <eugen.bolz@gmail.com >
Date: Sat Jan 14 21:50:22 2023 +0100
refactor change class to design update + clean up old site.vue settings
commit 1f16819bc1
Author: negue <eugen.bolz@gmail.com >
Date: Wed Jan 11 22:41:05 2023 +0100
WIP fix values
commit 6fef3d0579
Author: negue <eugen.bolz@gmail.com >
Date: Sat Jan 7 22:51:30 2023 +0100
check for unsaved changes when pressing cancel
commit bef8a4cdfc
Merge: 494f32c3e3 c7aadede4d
Author: negue <eugen.bolz@gmail.com >
Date: Sat Jan 7 22:10:53 2023 +0100
Merge remote-tracking branch 'origin/develop' into negue/ui/setting
commit 494f32c3e3
Author: negue <eugen.bolz@gmail.com >
Date: Wed Dec 21 00:55:31 2022 +0100
Class Setting
commit bda210cfbb
Author: negue <eugen.bolz@gmail.com >
Date: Tue Dec 20 23:01:41 2022 +0100
removes username, email and display name from site.vue
commit 38198d7df6
Author: negue <eugen.bolz@gmail.com >
Date: Tue Dec 20 22:36:27 2022 +0100
WIP class setting
commit dddcfa637f
Author: negue <eugen.bolz@gmail.com >
Date: Tue Dec 20 22:31:36 2022 +0100
fix styles
commit ce0a5cf974
Author: negue <eugen.bolz@gmail.com >
Date: Sun Dec 11 23:57:07 2022 +0100
Scroll into opened Setting
commit 7e0a95ddff
Author: negue <eugen.bolz@gmail.com >
Date: Sun Dec 11 23:43:44 2022 +0100
Audio Theme Setting
commit 9c556662fe
Author: negue <eugen.bolz@gmail.com >
Date: Sun Dec 11 00:25:30 2022 +0100
prepare header settings but still hidden
commit 30d8b27534
Merge: a1d1a788b2 580139ff69
Author: negue <eugen.bolz@gmail.com >
Date: Sat Dec 10 23:36:36 2022 +0100
Merge remote-tracking branch 'origin/develop' into negue/ui/setting
commit a1d1a788b2
Author: negue <eugen.bolz@gmail.com >
Date: Sat Dec 10 23:34:33 2022 +0100
DayStartAdjustmentSetting
commit ddee94a393
Author: negue <eugen.bolz@gmail.com >
Date: Sat Dec 10 20:00:12 2022 +0100
disable reset account button when password empty
commit 30a6db4c2d
Author: negue <eugen.bolz@gmail.com >
Date: Sat Dec 10 19:54:21 2022 +0100
hide & reset previous setting when switching to a different one
commit 78093848d7
Author: negue <eugen.bolz@gmail.com >
Date: Wed Dec 7 22:19:15 2022 +0100
validated text input (in/valid border color + icon)
commit e1b444ea63
Author: negue <eugen.bolz@gmail.com >
Date: Tue Dec 6 22:09:54 2022 +0100
re-enable box-shadow on hover
commit 96dc4e47ae
Author: negue <negue@users.noreply.github.com >
Date: Mon Nov 28 01:13:47 2022 +0100
remove console log
commit 69ad07daad
Author: negue <negue@users.noreply.github.com >
Date: Mon Nov 28 01:01:17 2022 +0100
dateFormatSetting
commit bc11c0cf75
Author: negue <negue@users.noreply.github.com >
Date: Mon Nov 28 00:49:24 2022 +0100
move shared components / mixins
commit 0d1a189c64
Author: negue <negue@users.noreply.github.com >
Date: Mon Nov 28 00:44:21 2022 +0100
language Setting + imports cleanup
commit 29ebd89030
Author: negue <negue@users.noreply.github.com >
Date: Sun Nov 27 23:23:02 2022 +0100
fix icon size + fix display name valid checks
commit 5c7747517b
Merge: fd5cbc3026 90b34c4dac
Author: negue <negue@users.noreply.github.com >
Date: Sun Nov 27 23:08:35 2022 +0100
Merge remote-tracking branch 'origin/release' into negue/ui/setting
commit fd5cbc3026
Author: negue <negue@users.noreply.github.com >
Date: Wed Nov 23 00:14:21 2022 +0100
fix conflicts
commit 49361217b0
Merge: edb427158f 04e2a39a9f
Author: negue <negue@users.noreply.github.com >
Date: Wed Nov 23 00:12:38 2022 +0100
Merge remote-tracking branch 'origin/develop' into negue/ui/setting
commit edb427158f
Author: negue <negue@users.noreply.github.com >
Date: Wed Nov 23 00:03:19 2022 +0100
disable save button if nothing was changed
commit c7e40e9446
Author: negue <negue@users.noreply.github.com >
Date: Tue Nov 22 23:36:37 2022 +0100
delete account row
commit 4bf740c531
Author: negue <negue@users.noreply.github.com >
Date: Tue Nov 22 23:14:24 2022 +0100
Shared Modal Visible State
commit d718153717
Author: negue <negue@users.noreply.github.com >
Date: Sun Nov 20 18:06:20 2022 +0100
resetAccount
commit e25922f8b3
Author: negue <negue@users.noreply.github.com >
Date: Wed Nov 16 23:39:26 2022 +0100
rename functional components for compiler
commit fdbc2c0eee
Author: negue <negue@users.noreply.github.com >
Date: Wed Nov 16 01:44:50 2022 +0100
password setting row
commit 5fd5e6275a
Author: negue <negue@users.noreply.github.com >
Date: Tue Nov 15 17:35:44 2022 +0100
update package-lock.json again
commit 9d742fd9a1
Author: negue <negue@users.noreply.github.com >
Date: Tue Nov 15 17:24:15 2022 +0100
update package-lock.json
commit cd588e74d5
Author: negue <negue@users.noreply.github.com >
Date: Mon Nov 14 02:12:39 2022 +0100
displayNameSetting.vue
commit 265970c5ef
Author: negue <negue@users.noreply.github.com >
Date: Mon Nov 14 02:09:47 2022 +0100
fix lint
commit a2b510caca
Merge: 0bae5fbe02 4dca69f14b
Author: negue <negue@users.noreply.github.com >
Date: Mon Nov 14 01:15:02 2022 +0100
Merge remote-tracking branch 'origin/develop' into negue/ui/setting
commit 0bae5fbe02
Author: negue <negue@users.noreply.github.com >
Date: Sun Nov 13 22:00:34 2022 +0100
userEmailSetting
commit 23da70fa2e
Author: negue <negue@users.noreply.github.com >
Date: Sun Nov 13 20:38:14 2022 +0100
extract save / cancel buttons and the shared inlineSetting "logic"
commit 82047380f3
Author: negue <negue@users.noreply.github.com >
Date: Sun Nov 13 20:18:21 2022 +0100
first setting (username) in the new layout
commit 39150349c7
Author: negue <negue@users.noreply.github.com >
Date: Wed Nov 2 21:42:12 2022 +0100
Working on M1 - will be reverted on full merge
commit f7787b318c
Merge: 4c0ecc9938 53fb28cc48
Author: negue <negue@users.noreply.github.com >
Date: Tue Nov 1 14:20:24 2022 +0100
Merge remote-tracking branch 'origin/develop' into negue/ui/setting
commit 4c0ecc9938
Merge: 2f53613a45 62b4315b3d
Author: negue <negue@users.noreply.github.com >
Date: Sun Oct 30 12:49:34 2022 +0100
Merge remote-tracking branch 'origin/develop' into negue/ui/setting
commit 2f53613a45
Author: negue <eugen.bolz@gmail.com >
Date: Mon Oct 10 22:54:41 2022 +0200
split routes for ease of dev
commit 390f0fc69d
Merge: cf222ee63a 137f7d53dc
Author: negue <eugen.bolz@gmail.com >
Date: Mon Oct 10 22:50:43 2022 +0200
Merge remote-tracking branch 'origin/develop' into negue/ui/setting
commit cf222ee63a
Author: negue <eugen.bolz@gmail.com >
Date: Sun Oct 2 23:15:35 2022 +0200
Update remaining Notification labels
commit f837cce125
Author: negue <eugen.bolz@gmail.com >
Date: Sun Oct 2 22:45:12 2022 +0200
move site popup settings to notifications
commit fc5181c3a7
Author: negue <eugen.bolz@gmail.com >
Date: Sun Oct 2 21:12:24 2022 +0200
fix styling in notification settings
commit 7b5568ed23
Author: negue <eugen.bolz@gmail.com >
Date: Sat Sep 10 16:00:56 2022 +0200
wip notification settings
2023-10-03 13:30:44 -05:00
Natalie
f72eef6bff
feat(content): prebuild Fall Festival ( #14869 )
...
* feat(content): prebuild Fall Festival
* fix(typos): because 2023 is not the same as 2024
* feat(css): having stylesheets is important
* feat(content): ready for review & testing
* fix(tests): account for Sept 09 bundle
* fix(gala): use multi event list more
fix a couple of strings too
* feat(content): Warrior and Rogue text
also fix timing of quest bundle feature
* fix(strings): correct stat boosts
* fix(content): missing mage
also adds missing margin to purchase gems button in buy modal
---------
Co-authored-by: SabreCat <sabe@habitica.com >
2023-09-20 19:46:34 -05:00
SabreCat
ce70c73d49
fix(test): temporarily use real timer
2023-09-12 09:45:40 -05:00
Phillip Thelen
d69de2948b
fix import
2023-02-16 09:58:09 +01:00
Phillip Thelen
2d5dcae406
fix tests
2023-02-16 09:37:00 +01:00
Phillip Thelen
41cdab1672
adjust tests
2023-02-10 17:13:10 +01:00