negue
6fdc072ec3
reset the ApiToken on password changes/resets ( #15433 )
...
* reset the ApiToken on password changes/resets
* fix/add tests
* fix(typo): test grammar
* update new API Token Strings, removed unused one
---------
Co-authored-by: Kalista Payne <sabrecat@gmail.com>
2025-07-01 12:30:34 -05:00
Kalista Payne
2a4239bf3c
fix(links): next round of wiki revisions
2025-02-05 09:18:22 -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 eb2fc40d241b18d4ffff04c35e744f05e6e9ff52
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 d3eea86bd773c5236e8a0f619639e49db846c2ba
Author: Kalista Payne <sabrecat@gmail.com>
Date: Thu Oct 24 15:00:09 2024 -0500
fix(subs): fix typeError
commit e3ae9a2d6736f238c6aaaec37a5bf38d64afafe8
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 690163a0dec3a45329062905c90454c7cd7c83fd
Author: Phillip Thelen <phillip@habitica.com>
Date: Wed Oct 23 16:42:38 2024 +0200
fix test
commit 2ad7541fc0de429c152e6824f65d2b11b84a9809
Author: Phillip Thelen <phillip@habitica.com>
Date: Wed Oct 23 16:34:52 2024 +0200
fix test
commit 7e337a9e591f2e8b27684567290a70f1b2d58aa0
Author: Phillip Thelen <phillip@habitica.com>
Date: Wed Oct 23 11:54:15 2024 +0200
remove only
commit 7462b8a57f852ecfc52e74fb50d6cff1751bef74
Author: Phillip Thelen <phillip@habitica.com>
Date: Wed Oct 23 11:51:25 2024 +0200
fix bug with incorrectly giving HG bonus
commit acd6183e95a5783dfa29e6c2b142f965c3c67411
Author: Kalista Payne <sabrecat@gmail.com>
Date: Mon Oct 21 17:22:26 2024 -0500
fix(subs): unhovery and un-12-monthy
commit 935e9fd6ec2688ac7339c56ce0ff03bfdae30c77
Author: Kalista Payne <sabrecat@gmail.com>
Date: Fri Oct 18 14:50:17 2024 -0500
fix(subs): try again on gifts
commit 6e1fb7df38d90e5c3ccebee9bb86dbb8f8a4678f
Author: Kalista Payne <sabrecat@gmail.com>
Date: Thu Oct 17 18:19:20 2024 -0500
fix(lint): do negate object ig
commit 71d434b94ea3b1a2c9381fd70f2e637473e00cac
Author: Kalista Payne <sabrecat@gmail.com>
Date: Thu Oct 17 18:15:11 2024 -0500
fix(lint): unnecessary ternary
commit b90b0bb9c39b931714526a9d20910968b055038d
Author: Kalista Payne <sabrecat@gmail.com>
Date: Thu Oct 17 17:34:24 2024 -0500
fix(subs): gifts DON't renew
commit 19469304c5a5881329ea1682e2070f9666d49ee4
Author: Kalista Payne <sabrecat@gmail.com>
Date: Thu Oct 17 17:13:29 2024 -0500
fix(subs): pass autoRenews through Stripe
commit 6819e7b7e518969c58ebab4400f3147f0ddea1b3
Author: Kalista Payne <sabrecat@gmail.com>
Date: Thu Oct 17 16:03:25 2024 -0500
fix(subscriptions): minor visual updates
commit 74633b5e5ea71d66681ad0e84873f3080ab5d361
Author: Kalista Payne <sabrecat@gmail.com>
Date: Wed Oct 16 17:27:09 2024 -0500
fix(subscriptions): more gift layout revisions
commit a90ccb89de36a85acc214bb0b88479e0b78f1660
Author: Kalista Payne <sabrecat@gmail.com>
Date: Wed Oct 16 15:37:50 2024 -0500
fix(subscription): update layout when gifting
commit c24b2db8dc6642669068f0a79d9b0990d43decb9
Author: Phillip Thelen <phillip@habitica.com>
Date: Mon Oct 14 16:11:46 2024 +0200
fix issue with promo hourglasses
commit 7a61c72b47cd3403fe0f3edf91522277738068cc
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 f14cb090265ed830eb76c7f452e806257312370e
Author: Phillip Thelen <phillip@habitica.com>
Date: Mon Oct 14 10:38:01 2024 +0200
Admin panel display fixes
commit f4cff698cfb80f9ad2da7ecb626f84277f97eb7c
Author: Kalista Payne <sabrecat@gmail.com>
Date: Thu Oct 3 17:58:59 2024 -0500
fix(stripe): correct redirect after success
commit c468b58f3f783c58e9b48f9698b45473b526d3d4
Author: Kalista Payne <sabrecat@gmail.com>
Date: Thu Oct 3 17:35:37 2024 -0500
fix(subs): correct border-radius and redirect
commit 78fb9e31d64f25aa091e24f95f25dc6dedc844a6
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 e2babe8053a778b64d51bd3d18866e69fb326a3c
Author: Kalista Payne <sabrecat@gmail.com>
Date: Mon Sep 30 16:45:29 2024 -0500
feat(subscription): max Gems progress readout
commit 61af8302a349f70d60886492b3d4f05dd5463a51
Author: Phillip Thelen <phillip@habitica.com>
Date: Fri Sep 27 15:11:22 2024 +0200
fix test
commit ef8ff0ea9eebcbd682a34fd7f52722b92fdfae16
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 4bafafdc8d493aad960dcf0d4957d3dad2d5e8da
Author: Phillip Thelen <phillip@habitica.com>
Date: Fri Sep 27 14:12:52 2024 +0200
add new field for cumulative subscription count
commit 30096247b73bdb76aa5b10dd4c964a78d2511e69
Author: Phillip Thelen <phillip@habitica.com>
Date: Fri Sep 27 13:39:49 2024 +0200
fix missing transaction type
commit 70872651b09613a8fe1a19ee2e19dac398b3134d
Author: Phillip Thelen <phillip@habitica.com>
Date: Fri Sep 27 13:31:40 2024 +0200
fix admin panel strings
commit f3398db65f26db558f38ecce8fe4795ff73650cb
Author: Kalista Payne <sabrecat@gmail.com>
Date: Thu Sep 26 23:11:16 2024 -0500
WIP(subs): extant Stripe state
commit c6b2020109b2cdbc7dd8579c884c65f81e757c25
Author: Phillip Thelen <phillip@habitica.com>
Date: Thu Sep 26 11:41:55 2024 +0200
fix admin panel display
commit d9afc96d2db8021db7e6310a009c15004ccc5c38
Author: Phillip Thelen <phillip@habitica.com>
Date: Thu Sep 26 11:40:16 2024 +0200
Fix hourglass logic for upgrades
commit 6e2c8eeb649481afc349e6eb7741bcc82909c3c4
Author: Phillip Thelen <phillip@habitica.com>
Date: Wed Sep 25 17:48:54 2024 +0200
fix hourglass count
commit cd752fbdce79f24bbdbaf6fd9558f207754c5cc3
Author: Kalista Payne <sabrecat@gmail.com>
Date: Fri Sep 20 12:24:21 2024 -0500
WIP(frontend): draft of main subs page view
commit 0102b29d599e47192d7346180ecd549c79177156
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 5469a5c5c3fddcf611018c1de077de3499df787a
Author: Kalista Payne <sabe@habitica.com>
Date: Wed Sep 18 15:07:36 2024 -0500
fix(test): short circuit this.
commit 526193ee6c9d07915d0373d07bb8ee0554fe2614
Author: Phillip Thelen <phillip@habitica.com>
Date: Wed Sep 18 14:42:06 2024 +0200
fix gem limit
commit 19cf1636aa1371147ea92478485a653d612d9755
Author: Phillip Thelen <phillip@habitica.com>
Date: Tue Aug 13 17:00:40 2024 +0200
return nextHourglassDate again
commit eea36e3ed54633c345d628d1d3d08e03a3e416a3
Author: Phillip Thelen <phillip@habitica.com>
Date: Tue Aug 13 13:11:22 2024 +0200
subscription test improvements
commit ca78e7433031e79c61aba67235481e0b1c569a55
Author: Phillip Thelen <phillip@habitica.com>
Date: Mon Aug 12 15:46:15 2024 +0200
add more subscription tests
commit f4c4f93a081a89d4c79aec1e87dac97d90c1d587
Author: Phillip Thelen <phillip@habitica.com>
Date: Fri Aug 9 13:35:22 2024 +0200
finish basic implementation of new logic
commit e036742048b92c2e2f29724fb02462f117d91aea
Author: Phillip Thelen <phillip@habitica.com>
Date: Fri Aug 9 11:37:44 2024 +0200
cleanup
commit 643186568866ddea0a234b68d37ad4ab634bd147
Author: Phillip Thelen <phillip@habitica.com>
Date: Wed Aug 7 05:41:18 2024 -0400
update cron tests
commit 930d875ae9d518b0b504ec97638e94c7296ad388
Author: Phillip Thelen <phillip@habitica.com>
Date: Thu Aug 8 10:36:50 2024 +0200
begin refactoring
commit 96623608d064b94cfa40e5da736f13c696995df9
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
Phillip Thelen
67a6e6f8ac
Add Content Release notification type ( #15101 )
2024-02-06 14:06:44 -06:00
Phillip Thelen
1ade4c6b3e
Fix resetting account for social accounts ( #15087 )
...
* Fix resetting account for social accounts
* added integration tests
* chore(packages): reinstall modules
* only enable reset button if user typed RESET
* fix enabling reset button
---------
Co-authored-by: negue <eugen.bolz@gmail.com>
Co-authored-by: Sabe Jones <sabe@habitica.com>
2024-01-18 15:51:36 -06:00
SabreCat
a9f3360890
Squashed commit of the following:
...
commit 9d99b6b3d7bab73fb7ae6a06b23db624a96535cb
Author: SabreCat <sabe@habitica.com>
Date: Thu Sep 14 09:57:42 2023 -0500
fix(string): just Bank
commit a4d34d487aa2d180beaac39fc616feb83940d473
Author: CuriousMagpie <eilatan@gmail.com>
Date: Wed Sep 13 14:50:14 2023 -0400
fix(strings): remove/change "guild" to "group"
commit dee572cd6336d3b119ab58dd3ff4a7a1cf9c98dd
Merge: aefd8ec6c4 e332876d30
Author: CuriousMagpie <eilatan@gmail.com>
Date: Wed Sep 13 13:54:50 2023 -0400
Merge branch 'develop' into misc-string-fixes
commit aefd8ec6c46d28e3b918e68e81b73c2b24448abc
Author: Sabe Jones <sabrecat@gmail.com>
Date: Tue Jul 25 14:10:25 2023 -0500
fix(config): correct habitica url format too
commit 990da1c8f2015468f9b1e4360268f0a023fcbd10
Merge: c1d6e0b580 8558dcc3a8
Author: CuriousMagpie <eilatan@gmail.com>
Date: Mon Jul 24 15:54:49 2023 -0400
Merge branch 'develop' into misc-string-fixes
commit c1d6e0b580a47758f2dafb20e5ea0e2ee797ca99
Author: CuriousMagpie <eilatan@gmail.com>
Date: Mon Jul 24 15:53:28 2023 -0400
fix(trusted_domains): removed https:// from the beginning of localhost
commit b77cb874c96eb7f2fa051cd99505a9d36a0f2981
Merge: 7285aa36bd 71e165433a
Author: CuriousMagpie <eilatan@gmail.com>
Date: Thu May 11 16:26:17 2023 -0400
Merge branch 'develop' into misc-string-fixes
commit 7285aa36bdaa901668598d1e5d47f0614b106856
Author: CuriousMagpie <eilatan@gmail.com>
Date: Thu Feb 9 15:31:41 2023 -0500
fix(typo): correct February backgrounds release date to 2023, not 2022
commit 7aca2ee908064ead5ff7dd6e499ac300fc9c5dd0
Merge: 30edc124ac 0b8f2bc58e
Author: CuriousMagpie <eilatan@gmail.com>
Date: Thu Feb 9 15:30:34 2023 -0500
Merge branch 'develop' into misc-string-fixes
commit 30edc124ac8481f23c3749cbec2a447e4252ca4c
Author: CuriousMagpie <eilatan@gmail.com>
Date: Mon Jan 30 13:27:10 2023 -0500
chore(fix): correct name of Fabulous Party Hat
commit 20e336b7493df28220c0822f5f150ea5857d2c0d
Author: CuriousMagpie <eilatan@gmail.com>
Date: Fri Jan 20 14:46:27 2023 -0500
couple small changes to the footer as pointed out by users
commit 16a02553731839f851b690714845c303c517aba8
Merge: e9a1450b57 d85436afbf
Author: CuriousMagpie <eilatan@gmail.com>
Date: Fri Jan 20 14:43:16 2023 -0500
Merge branch 'develop' into misc-string-fixes
commit e9a1450b5702218b72e99ab68defce94ff831a7c
Author: CuriousMagpie <eilatan@gmail.com>
Date: Wed Jan 4 11:02:56 2023 -0500
chore(string): clarify polar pets requirements
commit 9d25e07a4bb7af82fe136376e4902cc6845642f4
Merge: 906b7fcd43 c7aadede4d
Author: CuriousMagpie <eilatan@gmail.com>
Date: Wed Jan 4 11:01:16 2023 -0500
Merge branch 'develop' into misc-string-fixes
commit 906b7fcd430bd8cf958717dd22e333afff3f7caf
Author: CuriousMagpie <eilatan@gmail.com>
Date: Fri Dec 16 13:00:59 2022 -0500
chore(typo): fix text in questBewilderNotes
commit d0de66f3780a345a73dfd01f23013d48ab352105
Author: CuriousMagpie <eilatan@gmail.com>
Date: Tue Nov 8 16:32:26 2022 -0500
chore(typo): who knew, that Y was actually important...
commit c0a93ae202ebc18424b2d23414247196bd591d7b
Merge: dbae5fb36b 978e8c4320
Author: CuriousMagpie <eilatan@gmail.com>
Date: Tue Nov 8 16:30:52 2022 -0500
Merge branch 'develop' into misc-string-fixes
commit dbae5fb36b3125a7eca516f0f1cb0cbbaff912b3
Author: CuriousMagpie <eilatan@gmail.com>
Date: Mon Nov 7 13:06:54 2022 -0500
chore(fix): comma dangle
commit 9365be609f923de05df3ec3c43712f1879b368c4
Merge: 8f2af4a7ea f6e5360bdd
Author: CuriousMagpie <eilatan@gmail.com>
Date: Mon Nov 7 12:35:56 2022 -0500
Merge branch 'develop' into misc-string-fixes
commit 8f2af4a7ea7523d98a557638087317ec192c1eb6
Author: CuriousMagpie <eilatan@gmail.com>
Date: Mon Nov 7 12:35:04 2022 -0500
chore(fix): restore string inadvertently removed during a refactor
commit 77fe9450cb84afb974ef4a31965a66c44d6a590c
Merge: 5780b71ef8 13c0d12045
Author: CuriousMagpie <eilatan@gmail.com>
Date: Mon Sep 19 15:07:41 2022 -0400
Merge branch 'develop' into misc-string-fixes
commit 5780b71ef8812b8a7e72aa0a88bb4ef36db0deb8
Author: SabreCat <sabe@habitica.com>
Date: Wed Sep 14 16:27:21 2022 -0500
fix(payments): remove duplicate entry from another modal
commit f36d0ca0e2c6f57b077d6bed173210a2e2a5943b
Merge: 92b26fdecd 5f440f1bfa
Author: SabreCat <sabe@habitica.com>
Date: Wed Sep 14 16:15:01 2022 -0500
Merge branch 'develop' into misc-string-fixes
commit 92b26fdecdf2598e047ce692448b0294520e4c21
Author: CuriousMagpie <eilatan@gmail.com>
Date: Wed Jul 27 18:05:53 2022 -0400
fix(style): set border radii to 8px on upgrading-group id
commit f359142aa50bd5b59f92524e8401557afa9fad53
Author: CuriousMagpie <eilatan@gmail.com>
Date: Wed Jul 27 17:47:19 2022 -0400
fix: remove duplicated string and adjust upgrade button style
commit b67ef33b63b95408d637c17c9d51bbd957b514de
Merge: bd736235cc c09f078409
Author: CuriousMagpie <eilatan@gmail.com>
Date: Wed Jul 27 17:09:23 2022 -0400
Merge branch 'misc-string-fixes' of https://github.com/CuriousMagpie/habitica into misc-string-fixes
commit c09f0784098b600520d2e6ac8e0446c559fd56a3
Merge: 05811e3c70 ef3767f80b
Author: Natalie L <78037386+CuriousMagpie@users.noreply.github.com>
Date: Wed Jul 27 17:05:52 2022 -0400
Merge branch 'HabitRPG:develop' into misc-string-fixes
commit bd736235cc4fe1e205e566260c8ce8b874754ad6
Merge: 88368a8c21 ef3767f80b
Author: CuriousMagpie <eilatan@gmail.com>
Date: Wed Jul 27 17:03:30 2022 -0400
Merge remote-tracking branch 'upstream/develop' into misc-string-fixes
commit 05811e3c70b89e6671bd16876fec7e3b1358e3cb
Author: CuriousMagpie <eilatan@gmail.com>
Date: Fri Jun 24 15:01:23 2022 -0400
fix(string): corrected armorSpecialSummer2022MageNotes
commit 4031c972538f3e660697957ed4696895130af782
Author: CuriousMagpie <eilatan@gmail.com>
Date: Thu Jun 23 12:26:51 2022 -0400
fix(string): remove extra word from headSpecialSummer2022WarriorNotes
commit e4af5c250f2e9542367b7a519adaeec8f59c5e93
Merge: 88368a8c21 76de241675
Author: CuriousMagpie <eilatan@gmail.com>
Date: Thu Jun 23 11:27:04 2022 -0400
Merge branch 'develop' into misc-string-fixes
commit 88368a8c211a54ccddb5e16195429ad835868a70
Author: CuriousMagpie <eilatan@gmail.com>
Date: Tue Jun 21 13:49:46 2022 -0400
fix(strings): updated limited.json with "dateEnd" & "monthYYYY" months & put in chronological order
commit 6ee08377e9b8a7585d0d053e3553e2c03595b679
Author: CuriousMagpie <eilatan@gmail.com>
Date: Mon Jun 20 15:36:58 2022 -0400
fix(string): questVice1Notes html changed to a mobile-device friendly format
2023-10-03 13:32:11 -05:00
SabreCat
a0941ffa84
Squashed commit of the following:
...
commit 16d8b87e90655c5444d0138e3c9df432b6dab8d9
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 07387faf48c0060c493904a3d4639a20e6358b62
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 ea8563cd17bb2a60c74eb518bbce105b66a8ecd5
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 3e16584dcf70dc844d806f5f487bf94c171f91ad
Author: negue <eugen.bolz@gmail.com>
Date: Tue Aug 29 21:22:06 2023 +0200
fix PR comments
commit 84ba44fb192c1e6ccd895beae067468285f438a3
Author: negue <eugen.bolz@gmail.com>
Date: Tue Aug 29 20:38:54 2023 +0200
fix PR comments
commit 6259955891a6469760768dcc5e6ae204fa3b44bd
Author: CuriousMagpie <eilatan@gmail.com>
Date: Fri Aug 25 11:20:26 2023 -0400
update form.scss
commit da82bd8e68fb1d6567b987a61c2d15176ffa81c2
Author: negue <eugen.bolz@gmail.com>
Date: Thu Aug 24 21:40:02 2023 +0200
remove ending
commit 82e5fd2a83e9df85e0268e0937dd83be62bcc73d
Author: negue <eugen.bolz@gmail.com>
Date: Mon Aug 21 22:25:41 2023 +0200
fix spacing
commit 9ad06ea88bbb6b806823184a370366392ff7ad01
Author: negue <eugen.bolz@gmail.com>
Date: Mon Aug 21 22:09:22 2023 +0200
clean up debug row for login methods
commit 41cde37675d6132425b3bb4bb0ac5badb9ba0447
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 8c568060f93bf43b3dc82e1e02944bc4b86d5cce
Author: negue <eugen.bolz@gmail.com>
Date: Mon Aug 21 21:49:31 2023 +0200
fix PR comments
commit 36f7a4711da5a9da0e39d284500572f38a57d383
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 d279af7897179dd9c020a795f535dcd25b50dfc0
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 b20ea44d495fe9675360856a6f30c39cd9d3a1bd
Author: negue <eugen.bolz@gmail.com>
Date: Wed Aug 9 21:04:12 2023 +0200
Split Vue.Router routes
commit ffbed3e0447fb9e3475a21d67ddb014e5b05aabf
Author: negue <eugen.bolz@gmail.com>
Date: Sun Jul 23 00:00:24 2023 +0200
remove console
commit 4c350b01803797308bca78970077e9031175529d
Author: negue <eugen.bolz@gmail.com>
Date: Sat Jul 22 23:34:20 2023 +0200
update Bailey Notification Text + fix popover
commit c105b9ecf97dda77ec5374f5bec21dff39efb161
Author: negue <eugen.bolz@gmail.com>
Date: Sat Jul 22 23:21:53 2023 +0200
fix change password setting
commit 06410b4807710af4cbb0ee714c692484a8d003fd
Author: negue <eugen.bolz@gmail.com>
Date: Sat Jul 22 22:50:00 2023 +0200
fix reset account texts
commit ccfdd9bb9c4217dbbd6c9cd0677e9125daf0daa9
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 35c75304f1ff8ee317499c177a7ddd840468952e
Author: negue <eugen.bolz@gmail.com>
Date: Sun Jul 2 20:16:06 2023 +0200
more fixes
commit 203e961464330eeb232e28773e2f57869be0507e
Author: negue <eugen.bolz@gmail.com>
Date: Sun Jul 2 19:45:17 2023 +0200
fix notification settings
commit ec946047918bfbd9976529792a7251b934761afb
Author: negue <eugen.bolz@gmail.com>
Date: Sun Jun 25 22:00:45 2023 +0200
applied same styling to promoCode.vue
commit 0177b3a76b140157d999b8d7e1d26c90efd79fc4
Author: negue <eugen.bolz@gmail.com>
Date: Sun Jun 25 21:41:05 2023 +0200
move promoCode.vue to pages/settings
commit 8fbb600273d3e52a39ae75d277067d64e526f5a9
Author: negue <eugen.bolz@gmail.com>
Date: Sun Jun 25 21:40:35 2023 +0200
saveCancelButtons.vue allow to hide the cancel part
commit 4915f2a3fb0b7b7747b7a98fbb69d2270c41b418
Author: negue <eugen.bolz@gmail.com>
Date: Sun Jun 25 21:09:07 2023 +0200
Hide Transactions Page again
commit 8b5ae17f02095cf85988fadc4fd1e36dc26f4005
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 aa97ed5299de6dd2dd19182a5cd2fd2c24705d2d
Author: negue <eugen.bolz@gmail.com>
Date: Sun Jun 25 20:25:53 2023 +0200
fix localhost externalLinks check
commit 87a4e4931bd0230b3af07574c7e2771c87becf2f
Author: negue <eugen.bolz@gmail.com>
Date: Sun Jun 25 20:01:31 2023 +0200
show notification on username change + fix userEmail checks
commit 6a6f55f6fcdb69e1ca0dcfb63ea7dc96c764cda9
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 f9ff5e5c55dbc8e519304308adde14748f878a0a
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 4497514eebcb0ae168b385774ca47da654bb9e71
Author: negue <eugen.bolz@gmail.com>
Date: Tue May 30 21:59:21 2023 +0200
show notification when chaning display name
commit 3232f12f0dc39a71cc05a2d5c4b3f0c465383577
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 582a2f1304dcad57cb26da6211d81a278c0fcd53
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 8e3b8a962a8da871825b894776e567ea739635fc
Author: negue <eugen.bolz@gmail.com>
Date: Tue May 30 21:24:46 2023 +0200
refactor currentPasswordInput.vue to use validatedTextInput.vue
commit 61521507a49f9a2998668a9ca2a9b2274b6d944d
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 f74c29a065126e802d1301602d1f7aa2164644f6
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 c4b6f0c39c0526458faf0e5baed9999dfdacdd8b
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 37eee140ad20f453350b718d5ed149de4905c61b
Author: negue <eugen.bolz@gmail.com>
Date: Fri May 12 21:57:27 2023 +0200
delete account without password
commit 48a6801f4e606388cbecca124bc7a3c28a969ac3
Author: negue <eugen.bolz@gmail.com>
Date: Mon May 8 22:06:29 2023 +0200
fix duplicate json entry
commit 47a2189f497ac548f1aee184a4ea9faaad29e91f
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 a56b4a445734c9d069ab7f476e15fabd644a9127
Author: negue <eugen.bolz@gmail.com>
Date: Mon May 8 21:37:31 2023 +0200
show current class on setting panel
commit 9c973cca2a92918a36d2a7578bae64169a6167a9
Author: negue <eugen.bolz@gmail.com>
Date: Mon May 8 21:15:46 2023 +0200
fix selectDifficulty.vue - refactor selectList.vue
commit 95b37b3ba3f74e9b2b14fdc991f79dee44d68ce9
Author: negue <eugen.bolz@gmail.com>
Date: Mon May 8 20:45:09 2023 +0200
migrate restoreValues fix to new setting component
commit 7947b1c67d4324166b3e044a2e880c5104cb0beb
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 ad3e4d604a21dcfad410cd77c31b4fc58cddd6a3
Author: negue <eugen.bolz@gmail.com>
Date: Sat Apr 29 01:18:25 2023 +0200
style fixes
commit cea13d5bc3782b6e3f8a7ffae9c74a5da43cca6a
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 73a5e5fcabccf6a0909d0be5a81d8df95a2fd7ef
Author: negue <eugen.bolz@gmail.com>
Date: Tue Apr 25 20:51:14 2023 +0200
style / padding issues
commit 0a10eb32ccbea0963dc35467314d877ed4beb458
Author: negue <eugen.bolz@gmail.com>
Date: Sat Apr 15 20:54:08 2023 +0200
fix "setting new password" invalid check
commit a79bec3fa5979df9415ad57421afa05ed701bbfc
Author: negue <eugen.bolz@gmail.com>
Date: Tue Apr 11 23:15:15 2023 +0200
add password for other logins
commit 9ff17fd6ddca543846140f5eaf8046d457dd8dbb
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 1f470942a95466adb27450600f61992bcb005237
Author: negue <eugen.bolz@gmail.com>
Date: Thu Apr 6 00:19:18 2023 +0200
delete old api.vue
commit b4904a8b84d273e73014659c5f15821deb7e26a7
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 b5da7ccc70cbad6a3c769f63f6b220a0f8f5e105
Author: negue <eugen.bolz@gmail.com>
Date: Thu Apr 6 00:11:36 2023 +0200
refactor webhook ui to use save/cancel buttons
commit f49f67ff5cd6e0a46b2343e871bbaa168768f12d
Author: negue <eugen.bolz@gmail.com>
Date: Wed Apr 5 22:56:37 2023 +0200
remove unused settings
commit cc73b44b25d1f3dd6507754d2a68652e111d8703
Author: negue <eugen.bolz@gmail.com>
Date: Wed Mar 29 23:40:30 2023 +0200
remove advancedCollapsed settings to start it opened
commit e0300e87104f36d3e57809b570cd314319b027d5
Author: negue <eugen.bolz@gmail.com>
Date: Wed Mar 29 22:58:09 2023 +0200
remove displayInviteToPartyWhenPartyIs1 setting
commit 1741ddfc6484ae2f7da26050a8453c89e9925229
Author: negue <eugen.bolz@gmail.com>
Date: Mon Mar 20 23:00:17 2023 +0100
webhook margins
commit 24a43d027c9847663db4255d2b2cd472c8ce02c7
Author: negue <eugen.bolz@gmail.com>
Date: Mon Mar 20 22:40:19 2023 +0100
userid tooltip
commit 42fcb20bc4a06d8d6cb72263481c1127a7fac51d
Author: negue <eugen.bolz@gmail.com>
Date: Thu Mar 16 00:51:10 2023 +0100
remove balance for choosing class
commit 160848473d5bf24fe3b6bf327ff698584120b18c
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 f74ba9738dad0171136b8e3c1e5c3eee5a7630a0
Author: negue <eugen.bolz@gmail.com>
Date: Thu Mar 16 00:10:53 2023 +0100
update apple icon and size
commit bf961bc7283b3ba05011b5d3ca50127da5bc9850
Author: negue <eugen.bolz@gmail.com>
Date: Wed Mar 15 23:59:42 2023 +0100
Copied API Token Notification
commit 28f0220b4ea889bf841c8ca542eb23af3bd22cab
Author: negue <eugen.bolz@gmail.com>
Date: Wed Mar 15 23:53:33 2023 +0100
remove blue color of setting links
commit b53ccace9593e32ecd3ed5df28d81b3c899f31fc
Author: negue <eugen.bolz@gmail.com>
Date: Wed Mar 15 23:43:06 2023 +0100
fix username/email setting input width
commit 1dfa5b275dabe4baf7c887e2eb5c42e864a2e8a9
Author: negue <eugen.bolz@gmail.com>
Date: Wed Mar 15 23:11:32 2023 +0100
developer mode
commit 776618d2db3d95d29bb8a49171740267b0238861
Author: negue <eugen.bolz@gmail.com>
Date: Tue Mar 14 21:11:52 2023 +0100
Add new Pause Dailies Setting
commit 576c80af7ef75a8d2ebb2c2ddb34fb4c32eed122
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 dec1a1159df17325c23718b929edf3244e033284
Author: negue <eugen.bolz@gmail.com>
Date: Tue Mar 14 21:00:52 2023 +0100
developer mode dummy row
commit 1e80a7d145e6fce8a95a98645728d548cc9d4a51
Author: negue <eugen.bolz@gmail.com>
Date: Sat Mar 11 00:03:33 2023 +0100
WIP webhook row
commit cc4bedbe2d40811724a98dd8191bb551af884c70
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 f9833aa78a2cdd6aa08cfd72aa6ef2e7815f4b62
Author: negue <eugen.bolz@gmail.com>
Date: Thu Mar 9 02:23:39 2023 +0100
API Token Row
commit 123c9b9bb1706041b2a73b254a80db6f5b6a07c8
Author: negue <eugen.bolz@gmail.com>
Date: Mon Mar 6 22:46:50 2023 +0100
"Your User Data" Row instead of Page
commit 0ade5663ae6d83967876b66075411752c29454c9
Author: negue <eugen.bolz@gmail.com>
Date: Fri Mar 3 22:43:03 2023 +0100
userid row
commit b4f2236ab8d54b6d89066abaee4d087d0a92e570
Author: negue <eugen.bolz@gmail.com>
Date: Fri Mar 3 22:22:32 2023 +0100
rename folder of setting rows
commit 3b050861c45d8680d62894b652cd60912bbb3480
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 b09298fb0171ccf70e63b56d2a6a9ef054719597
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 5ed25066ecaca2a42c7e80163968ec6912d710a5
Author: negue <eugen.bolz@gmail.com>
Date: Tue Feb 21 20:06:13 2023 +0100
size/margin for transactions
commit 25e77cbd9559e75813f2a925cf743b69321ba91c
Author: negue <eugen.bolz@gmail.com>
Date: Tue Feb 21 19:52:12 2023 +0100
move purchaseHistory.vue
commit 8e4e1bcb0f3d960edc1b9dadc71cd9e4be615024
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 85c50d50e9606b8518584d9924620262a018a520
Author: SabreCat <sabe@habitica.com>
Date: Thu Feb 16 14:23:27 2023 -0600
fix(css): remove redundant formatting for a elements
commit bb14d09aa494954f47a6f0cce000aedd6eea4668
Author: negue <eugen.bolz@gmail.com>
Date: Thu Feb 16 01:34:09 2023 +0100
remove console
commit 8c5e722c7215928701a01207a29fbe560bcc2c4d
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 9c8770051db4ac3acf0c79eb9c10b966590748b6
Author: negue <eugen.bolz@gmail.com>
Date: Sat Feb 11 19:13:16 2023 +0100
fix dayStartAdjustmentSetting.vue for 0 value
commit ee2ff3881b0a914a0858940088e345a2a38a4c25
Author: negue <eugen.bolz@gmail.com>
Date: Sat Feb 11 18:37:46 2023 +0100
fix color after refactor
commit 121e7485ca075f5a8cf5f5ef5072b8221ba6521a
Author: negue <eugen.bolz@gmail.com>
Date: Sat Feb 11 18:29:00 2023 +0100
mark audioThemeSetting as changed
commit 98c65700039cd86f571f35fd534b472659b767ff
Author: negue <eugen.bolz@gmail.com>
Date: Sat Feb 11 18:05:55 2023 +0100
fix ul/li style in resetAccount.vue
commit fed824f7052a971a8f40b55ebc2c3937953b3af2
Author: negue <eugen.bolz@gmail.com>
Date: Sat Feb 11 17:49:36 2023 +0100
fix color of gem price
commit 80365e537d6eeee28c94dc82a0ca4234b5245362
Author: negue <eugen.bolz@gmail.com>
Date: Sat Feb 11 17:44:55 2023 +0100
fix "fixValuesSetting.vue"
commit d3e15c541325d911b9db746246f047231df385a1
Author: negue <eugen.bolz@gmail.com>
Date: Wed Feb 8 01:06:27 2023 +0100
open forgot password in new tab
commit 31edec9ec55d77840e8c991fcc53572efc2354d6
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 2adfd8c2593e6a5b75ab2f29b88858a5e9d7a6dc
Author: negue <eugen.bolz@gmail.com>
Date: Sun Feb 5 20:19:30 2023 +0100
hide class setting until level 10
commit 64fb4c0cf9c4cfbca8733966cc72ca7a6c1ab742
Author: negue <eugen.bolz@gmail.com>
Date: Sun Feb 5 19:32:40 2023 +0100
delete old modals (refactored into new settings ui)
commit b5be137a8d072c483d06466773c82c1a469ece51
Author: negue <eugen.bolz@gmail.com>
Date: Sun Feb 5 19:27:26 2023 +0100
enable forgot password link in settings
commit bec75c6e129b8dfe0d429a60e4f92b2562b0843d
Author: negue <eugen.bolz@gmail.com>
Date: Sun Feb 5 18:52:54 2023 +0100
reset account + password required in api
commit 64f7e7a1d9b06fe9bb56a8b729e7c88a3732926e
Author: negue <eugen.bolz@gmail.com>
Date: Mon Jan 30 23:22:55 2023 +0100
fix compile
commit 7ffb5101beca7246f1563d589bb85e14b85367ae
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 2bfb130b92f350667b9be682e80cb02499e9034b
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 89530a133ce8e58228edeb44be34d8b5db80248f
Author: negue <eugen.bolz@gmail.com>
Date: Wed Jan 18 19:22:36 2023 +0100
wip fix values
commit 428647fc71e35a9112d69282694da4ce2dbb408d
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 1f16819bc140e727d35ac81f97fa9f917602db14
Author: negue <eugen.bolz@gmail.com>
Date: Wed Jan 11 22:41:05 2023 +0100
WIP fix values
commit 6fef3d057958e6f79ff369fc68267d84679ad086
Author: negue <eugen.bolz@gmail.com>
Date: Sat Jan 7 22:51:30 2023 +0100
check for unsaved changes when pressing cancel
commit bef8a4cdfc79d60548bdb86b73654d11d4a7559c
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 494f32c3e3f68334199846049ee4f12cecb1e011
Author: negue <eugen.bolz@gmail.com>
Date: Wed Dec 21 00:55:31 2022 +0100
Class Setting
commit bda210cfbb8b8bb19ba01cd5e87dff859b0f0306
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 38198d7df6e6dd3fa01c709d29627610373c9d7c
Author: negue <eugen.bolz@gmail.com>
Date: Tue Dec 20 22:36:27 2022 +0100
WIP class setting
commit dddcfa637f5bbb5da9a2a8c3454edcc26b13dee9
Author: negue <eugen.bolz@gmail.com>
Date: Tue Dec 20 22:31:36 2022 +0100
fix styles
commit ce0a5cf97417487b1fb2b7a3aa6b489b61966c0c
Author: negue <eugen.bolz@gmail.com>
Date: Sun Dec 11 23:57:07 2022 +0100
Scroll into opened Setting
commit 7e0a95ddff3a4f12f71ba2aaa1a5c603015a9925
Author: negue <eugen.bolz@gmail.com>
Date: Sun Dec 11 23:43:44 2022 +0100
Audio Theme Setting
commit 9c556662fe98ca3d664a86b5ff669b127de8fc32
Author: negue <eugen.bolz@gmail.com>
Date: Sun Dec 11 00:25:30 2022 +0100
prepare header settings but still hidden
commit 30d8b27534080c55fff532ca2b0cb11a6c9bd713
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 a1d1a788b26eff59d9494905083606ad13994279
Author: negue <eugen.bolz@gmail.com>
Date: Sat Dec 10 23:34:33 2022 +0100
DayStartAdjustmentSetting
commit ddee94a3939c9e36541f1f5ffcc58a0de4c3b93a
Author: negue <eugen.bolz@gmail.com>
Date: Sat Dec 10 20:00:12 2022 +0100
disable reset account button when password empty
commit 30a6db4c2dee2f902fea3c5b8522c0efe8cf230b
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 78093848d7ee76c7c9be187896ed10fd941491cb
Author: negue <eugen.bolz@gmail.com>
Date: Wed Dec 7 22:19:15 2022 +0100
validated text input (in/valid border color + icon)
commit e1b444ea63bf41d33d5d36fc330158aeecd262ae
Author: negue <eugen.bolz@gmail.com>
Date: Tue Dec 6 22:09:54 2022 +0100
re-enable box-shadow on hover
commit 96dc4e47aeae0d7c86f756cea9c370c2d0e02c77
Author: negue <negue@users.noreply.github.com>
Date: Mon Nov 28 01:13:47 2022 +0100
remove console log
commit 69ad07daadfa42635137640c7e4d5df1a7756223
Author: negue <negue@users.noreply.github.com>
Date: Mon Nov 28 01:01:17 2022 +0100
dateFormatSetting
commit bc11c0cf759eb8f64c6eb0bede7a2b9456b93c5a
Author: negue <negue@users.noreply.github.com>
Date: Mon Nov 28 00:49:24 2022 +0100
move shared components / mixins
commit 0d1a189c6449f0019c744788b9176b05b6e21039
Author: negue <negue@users.noreply.github.com>
Date: Mon Nov 28 00:44:21 2022 +0100
language Setting + imports cleanup
commit 29ebd89030eef3810654c5b683c3905dc58f1222
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 5c7747517b89e24a0dab0330f9c71bd5c3f7c14e
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 fd5cbc30260d574455ad3014e64c0994accf4f89
Author: negue <negue@users.noreply.github.com>
Date: Wed Nov 23 00:14:21 2022 +0100
fix conflicts
commit 49361217b0c55efedb15c154b8c121e68c40d94f
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 edb427158fd69213eb34c57cd156de1ba08ba8bc
Author: negue <negue@users.noreply.github.com>
Date: Wed Nov 23 00:03:19 2022 +0100
disable save button if nothing was changed
commit c7e40e9446f67dbdd8e12ee81d94d069f60278c8
Author: negue <negue@users.noreply.github.com>
Date: Tue Nov 22 23:36:37 2022 +0100
delete account row
commit 4bf740c531b6917a283c7278dc391fd014cbc26d
Author: negue <negue@users.noreply.github.com>
Date: Tue Nov 22 23:14:24 2022 +0100
Shared Modal Visible State
commit d718153717c84bc8bd861e5e7eb303333f22bbbf
Author: negue <negue@users.noreply.github.com>
Date: Sun Nov 20 18:06:20 2022 +0100
resetAccount
commit e25922f8b33f3dad2b13110d6fdbaba2a67d87f0
Author: negue <negue@users.noreply.github.com>
Date: Wed Nov 16 23:39:26 2022 +0100
rename functional components for compiler
commit fdbc2c0eee04146cf7ca8a458b9acc28c01bacbf
Author: negue <negue@users.noreply.github.com>
Date: Wed Nov 16 01:44:50 2022 +0100
password setting row
commit 5fd5e6275aebce235cd7ced7bfc1d57b8b9cd8df
Author: negue <negue@users.noreply.github.com>
Date: Tue Nov 15 17:35:44 2022 +0100
update package-lock.json again
commit 9d742fd9a1ae3b99dbeec48a24007473ae59d696
Author: negue <negue@users.noreply.github.com>
Date: Tue Nov 15 17:24:15 2022 +0100
update package-lock.json
commit cd588e74d5fbbb3a7e0da68f0850dbb542c7aa57
Author: negue <negue@users.noreply.github.com>
Date: Mon Nov 14 02:12:39 2022 +0100
displayNameSetting.vue
commit 265970c5efd001dbbd4957a122efdd7e8b278f3e
Author: negue <negue@users.noreply.github.com>
Date: Mon Nov 14 02:09:47 2022 +0100
fix lint
commit a2b510caca7ec873c5ea5a694fec6904779b9085
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 0bae5fbe0234841a4e58a78fcc8aaaa01196853b
Author: negue <negue@users.noreply.github.com>
Date: Sun Nov 13 22:00:34 2022 +0100
userEmailSetting
commit 23da70fa2e8d759db5222aac659ed12436fecee2
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 82047380f3ff60e293fad8843547665c1128f681
Author: negue <negue@users.noreply.github.com>
Date: Sun Nov 13 20:18:21 2022 +0100
first setting (username) in the new layout
commit 39150349c7a37108da06aa4928284164197cb355
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 f7787b318c43948176b6fb7e29bd971683d33c36
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 4c0ecc99380cd67b7ae5c40fb1ff27981c80c4a9
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 2f53613a459639f9e9e314a1bd77459225392efa
Author: negue <eugen.bolz@gmail.com>
Date: Mon Oct 10 22:54:41 2022 +0200
split routes for ease of dev
commit 390f0fc69df10e90161d7f7bf1cb1e70c637d592
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 cf222ee63af051fbc9d7aee2a1ba7322ae9c56f6
Author: negue <eugen.bolz@gmail.com>
Date: Sun Oct 2 23:15:35 2022 +0200
Update remaining Notification labels
commit f837cce125ad77465c2812615456dcf1c2111371
Author: negue <eugen.bolz@gmail.com>
Date: Sun Oct 2 22:45:12 2022 +0200
move site popup settings to notifications
commit fc5181c3a7670eb97918f4d30c3327a5ed8c090a
Author: negue <eugen.bolz@gmail.com>
Date: Sun Oct 2 21:12:24 2022 +0200
fix styling in notification settings
commit 7b5568ed2343d7c7fc427ba53d9cbb684d0c907c
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
CuriousMagpie
c91d115793
WIP(string-sweep): guild/s complete
2023-06-15 13:47:14 -04:00
CuriousMagpie
80e7fda8ef
WIP(string-sweep): de-guildify more strings
2023-06-14 18:05:29 -04:00
negue
e3a1ea6180
save task column filter ( #14587 )
...
* save task column filter
* remove old setting
* fix tests
2023-05-15 16:01:32 -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
Sabe Jones
82c5e40b92
Enforce maximum password length ( #14290 )
...
* fix(auth): enforce maximum password length
* fix(auth): line length and better error message
* fix(auth): correctly import/export constant
Co-authored-by: SabreCat <sabe@habitica.com>
2022-11-18 16:49:10 -06:00
SabreCat
259131ee3f
feat(transactions): UI updates
...
by @negue
2022-11-15 19:28:36 -06:00
SabreCat
0081bad831
feat(admin): track hourglasses as transactions
2022-09-06 16:15:04 -05:00
negue
0b4059aab0
Transaction Logs - Backend Changes ( #14113 )
...
* Transaction Logs - Backend Changes
* filter out bank challenge if is not userSupport
2022-07-13 14:18:59 -05:00
Natalie L
3aa7b8b447
Gifting modal design ( #14124 )
...
* update selectUserModal.vue
* more updates to selectUserModal.vue, typo fix in subscriber.json
* remove exact sizing for selectUserModal.vue
* update to size for selectUserModal.vue
* added sendGiftModal.vue file
* updates to selectUser & sendGift modals
* making the modals go & position cursor
* working working working
* added a return to method
* avatar display & placeholder profile.name and username
* subscription-options added
* added menu row & started on gem options
* Added selectPage function, have not tested.
* updated habitica-images
* state changes
* bringing in gem counter
* arranging elements
* state changes, gem input boxes
* styling sendGiftModal.vue
* more sendGiftModal.vue styling and new close.svg icon
* more styling!
* and more styling of send own gems part of page
* images update
* more styling of own gems & some attempts to adjust :class on the menu
* styling styling styling
* replace +/- svg, styling
* styling, mostly
* new SVGs
* stylin'
* reverting svg changes
* no more stylin'
* finally got the +/- icons to show up...but they're the wrong color
* solved svg icon color problem! :)
* habitica-images
* working on sendGift part of button
* trying to make it do math, failing
* more attempts at math
* +/- buttons work on gem pages & cost calculation on buyGems
* trying to get hover colors working on +/- svgs
* formatted dollar amount as currency
* css/html for subscription-options & payments-buttons simplified
* swag at payments-buttons parameter (not tested)
* send gems from own balance works!
* working on starting page
* increment gem amount limited to maxGems and not < 0
* uncommented onHide()
* got bg color on sub options to work! yay!
* payment buttons!
* making g1g1 look good
* position modal on page properly & code clean-up
* Changes as requested!
* small color update
* fixed ternary function
* chore(html): indentation and comments
* fix(fn): correct catch for under-0
* chore(json): whitespace
* update gem styling; add linebreak to notifications.vue bc linter
* updating subscriptionOptions
* snackbar css fix
* reverting commit e16c12f
* removing merge conflict markers
* just a little comment
* fixed some navigation, clear input field on selectPage, cleaned up code; another try at subscriptionOption.vue
* merge upstream/develop
* update selectPage() to disable Gems menu items when on 'ownGems' or 'buyGems' states
* working on subscriptionOptions.vue logic
* fix(script): changed props & added updateSubscriptionData()
* fix(script): forgot to call updateSubscriptionData()
* fix(scripts): corrected :userReceivingGift on sendGiftModal.vue
* fix(scripts): correct props userReceivingGift to an Object
* fix(scripts): corrected v-if & revised props
* fix(style/html/whitespace): updated css for close.svg and added missing </div>
* style(radio-buttons): updated focus states and added hover states
* style(radio-buttons): refined focus and hover states
* fix(function): changed buyGemsLink to buyGems; still working on menu
* style(radio buttons): ensured consistent display of radio buttons through-out site; still struggling with hover states
* style(radio buttons): updated focus/active/hover to match design & removed unnecessary code
* fix: set default subscription option to 1 month
* fix(function): add default amounts to gem states when modal selected from user profile
* fix(build): use develop package json
* fix: SCSS commenting & abstracted setGemsDefault()
* fix(packages): revert to develop
* fix: remove unnecessary console.log statement
Co-authored-by: SabreCat <sabe@habitica.com>
2022-07-13 14:17:28 -05:00
darkarchana
b04df06a37
Fix no response when password changed ( #14054 )
...
* Fix no response when password changed
* Update website/client/src/components/settings/site.vue
update the spacing in website/client/src/components/settings/site.vue
Co-authored-by: Panu Valtanen <p4nu@users.noreply.github.com>
* Update website/client/src/components/settings/site.vue
change to single quote
* Fix success change password response using internationalization
* fix(i18n): remove translations other than US English
Partial revert of #1a198677bd
Co-authored-by: Panu Valtanen <p4nu@users.noreply.github.com>
Co-authored-by: SabreCat <sabe@habitica.com>
2022-07-08 15:42:18 -05:00
sau226
a0884b5d24
Remove QR code feature ( #14038 )
2022-06-10 14:06:25 -05:00
negue
2181ab9713
Redesign: "Day Start Adjustment" ( #13910 )
...
* Merge Custom Day Start and Timezone into one Component
* ui changes
* change translation text
* typo
2022-04-07 14:37:07 -05:00
negue
8cb8411cc6
Show "Next Hourglass" Month ( #13860 )
...
* Show "Next Hourglass" Month
* fix lint
* lint,
* lint
* lint..
* linting bad
* ui fixes
* remove additional margin
* show next hourglass date to debug further
* WIP tests - maybe broken logic
* flex:1 doesn't work - so stats columns now at 33% width
* fix(cron): lint and short circuit
* refactor logic
* update test dates using timezone
* also check for the timezone date
* fix timezone for tests
* fixing the test dates?
* fixing the test dates?
* change nextHourglass logic + update gem cap label / value
* fix lint
* dont add gemsBought to it
* remove tooltip
Co-authored-by: SabreCat <sabe@habitica.com>
2022-04-06 16:30:13 -05:00
Phillip Thelen
55cf2f9795
Improve flows for social auth users ( #13862 )
...
* Multiple fixes for social authentication flows
* frontend changes
* add missing computed property
* Improvements to social flows
* fix existing email error
* minor fixes
* fix space
* fix test
* fix lint
Co-authored-by: SabreCat <sabe@habitica.com>
2022-03-31 16:43:16 -05:00
Basrara
d44b2fe785
Minor fixes ( #13909 )
...
Updated "resetText2", "transaction_rebirth", and "transaction_reroll" to correct capitalization and eliminate a double space.
2022-03-29 12:30:16 -04:00
Phillip Thelen
6e43d4dc79
Add Transaction log for gem and hourglass changes ( #13589 )
...
* Log all gem transactions to database
* Also store hourglass transactions
* Fix tests
* Display transaction history in hall of heroes for admins
* add tests to new API call
* hide transaction settings tab for non admins
* fix(lint): remove console
* fix(lint): various automatic corrections
* fix(transactions): use enum expected pluralizations
* fix api unit tests
* fix lint
* fix failing test
* Fix minor inconsistencies
* Log all gem transactions to database
* Also store hourglass transactions
* Fix tests
* Display transaction history in hall of heroes for admins
* add tests to new API call
* hide transaction settings tab for non admins
* fix(lint): remove console
* fix(lint): various automatic corrections
* fix(transactions): use enum expected pluralizations
* fix api unit tests
* fix lint
* Fix minor inconsistencies
Co-authored-by: Sabe Jones <sabrecat@gmail.com>
2022-01-31 15:36:15 -06:00
Aleksander Pentchev
b3925d6c7a
#13731 - Changed account reset button pop-up text ( #13751 )
...
Co-authored-by: Aleksander Pentchev <aleksander.pentchev@roche.com>
2022-01-31 15:33:28 -06:00
Seth Falco
72fc134a88
chore: replace http wiki links with https ( #13528 )
2021-10-01 17:58:09 -05:00
Carlton McFarlane
a53355872b
Add checks for profanity to profile updates ( #12445 )
...
* fix(profile): detect attempt to use banned words as display name. refactor profanity detection method.
* fix(profile): detect attempt to use banned words in blurb. further refactor profanity detection. inform the user their chat privileges have been revoked.
* refactor: add function to normalize Unicode strings and remove diacritics
* fix: improve regEx to prevent false partial matches e.g. 'hello' being recognised as banned words. porting fix from #12309
* fix(profile): refactor of profanity detection for #12445
* fix(profile): add test for swear words in new profile. fix existing tests
* fix(profile): show different error message for attempted slur use in username by new users.
* fix(profile): remove incorrect slur test
* fix(profile): fix slurs not caught at start of end of strings connect by punctuation
* tests(profile): fix tests for profanity checking
* remove exclusive test
* 11865 - update text for slur warnings
* 11865 - remove unused string from locale files
* 11865 - improve naming of banned word usage locale string
* 11865 - improve logic so that differentiated warnings are shown depending on whether a slur or other profanity has been used in a display name
* 11865 - construct slur regexes outside the validation function in which they are used
* 11865 - fix tests
2021-04-30 15:47:39 -05:00
Sabe Jones
53f19c4da3
feat(event): Winter Wonderland 2021 and Gift-One-Get-One Promotion
2020-12-10 16:53:37 -06:00
Matteo Pagliazzi
70661da94d
fix(settings.json): add back resetAccount string
2020-09-19 15:45:23 +02:00
Raithe Of Dureya
731b241b46
Remove couponText (duplicated) from locales/en
...
Note: "...coupon codes..."
2020-09-08 19:18:28 +02:00
Raithe Of Dureya
912fef88a0
Removed unused I18N strings from the settings.json file (locales/en)
2020-09-08 19:12:51 +02:00
Matteo Pagliazzi
9a07ba7417
Better XSS Fix ( #12483 )
...
* Revert "fix(test): adjust expectations"
This reverts commit 205436d5b1 .
* Revert "fix(escaping): global inoffensive apostrophe"
This reverts commit 2b8f94b244 .
* change <%- to <%=
* fix interpolation only where necessary
* remove unused variable
2020-08-20 13:41:46 -05:00
Matteo Pagliazzi
b7964a411c
fix(i18n): html-escape all interpolated strings where html is not necessary
2020-08-11 21:33:24 +02:00
Amber
ead0b6c56f
PR to fix: Disallow line breaks in display names ( #12380 )
...
* Update settings.json
* Update index.js
* Update validation.js
* Update validation.js
* Update validation.js
Removes the second check
* Update tests and validation
Added tests, and updated validation
2020-07-18 22:41:19 +02:00
Matteo Pagliazzi
39427a75db
To-Dos -> To Do's ( #12290 )
...
* To-Dos -> To Do's
* To-Do -> To Do
2020-06-17 17:33:30 +02:00
Sabe Jones
c421da34cc
chore(feedback): replace Trello links
2020-05-19 15:15:21 -05:00
Joanna Cholewa
effb66a089
Replace setUsernameNotificationBody setting with changeUsernameDisclaimer and alter disclaimer text ( #11953 )
2020-03-09 15:48:54 +01:00
Sabe Jones
9a6f8021e3
Subscription Page Overhaul ( #11823 )
...
* WIP(settings): subscriber page improvements
* WIP(subscriptions): more design build-out
* fix(css): disabled button styles
* fix(css): better Amazon targeting
* WIP(g1g1): notif
* WIP(g1g1): notif cont'd
* WIP(gifting): partial modal implementation
* feat(gifting): select giftee modal
* fix(gifting): notification order, modal dismiss
* fix(modals): correct some repops
* fix(gifting): style updates
* fix(modals): also clean out "prev"
* refactor(modals): hide in dismiss event
* fix(modals): new dismiss logic
* fix(modals): new dismiss no go??
* WIP(subscription): unsubscribed state
* WIP(subscription): partial subscribed
* WIP(subscription): finish subscribed
* feat(subscription): revised sub page RC
* fix(subs): style tweaks
* fix(subs): moar style tweaks
2020-02-13 13:12:45 -06:00
Glendon Solsberry
b9af3fb40e
Updates notifications screen to a more consistent UI ( #11635 )
2019-12-23 17:45:42 +01:00
Matteo Pagliazzi
0e679f0fea
settings fixes: show description for other extensions and remove unwanted changes from locales
2019-11-16 17:38:48 +01:00
Markkop
f15a32255b
fix(settings): fix settings.json
2019-11-03 16:49:04 -03:00
Phillip Thelen
77b188833e
Merge branch 'develop' of https://github.com/HabitRPG/habitica into autocomplete-username
...
# Conflicts:
# website/server/controllers/api-v3/chat.js
# website/server/libs/pushNotifications.js
# website/server/models/user/schema.js
2019-10-01 12:55:41 +02:00
Phillip Thelen
17e8b0a0fd
Improve wording for push notifications ( #11378 )
2019-09-29 18:45:30 +02:00
Phillip Thelen
6523b6b342
Merge branch 'develop' of https://github.com/HabitRPG/habitica into autocomplete-username
...
# Conflicts:
# package.json
# website/client/components/chat/autoComplete.vue
# website/client/components/chat/chatCard.vue
# website/client/components/groups/chat.vue
# website/server/controllers/api-v3/chat.js
# website/server/controllers/api-v3/members.js
# website/server/controllers/api-v4/members.js
2019-09-19 16:08:13 +02:00
Matteo Pagliazzi
3c31945524
Email subs reminders release ( #11216 )
...
* add subscriptions reminders emails
* add field to record the last sub reminder
2019-06-10 22:37:30 +02:00
Sabe Jones
4a66e2fbe0
fix(mentioning): change default, adapt settings control to checkbox
2019-03-01 07:05:06 -06:00
Phillip Thelen
be5137d14d
Merge branch 'develop' into phillip/autocomplete-username
2019-02-12 14:40:47 +01:00
Phillip Thelen
8618913a75
Merge branch 'develop' of https://github.com/HabitRPG/habitica into autocomplete-username
...
# Conflicts:
# package.json
2019-02-05 16:48:06 +01:00
Giacomo Lawrance
9e6394c38c
changed wikia links to fandom
...
Fixes issue #10954
2019-01-24 11:21:52 +00:00
Matteo Pagliazzi
0667695390
Payments: Success Messages ( #10903 )
...
* fix v-once
* gems purchase success dialog
* amazon and stripe support for gems message, translations
* subscriptions success message
* subscriptions success message
* group plans success message and many fixes
* finish success messages for payments
* add success modal when gifting from balance
2018-12-09 20:08:01 +01:00
Phillip Thelen
0271d98b91
Add Test to opt out of username being searchable
2018-11-27 13:20:26 +01:00