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 eb2fc40d24sabrecat@gmail.com >
Date: Thu Oct 24 15:41:43 2024 -0500
fix(g1g1): don't try to find Gems promo during bogo
commit d3eea86bd7sabrecat@gmail.com >
Date: Thu Oct 24 15:00:09 2024 -0500
fix(subs): fix typeError
commit e3ae9a2d67sabrecat@gmail.com >
Date: Thu Oct 24 13:57:27 2024 -0500
fix(subs): also redirect to subs after gift sub
commit 690163a0dephillip@habitica.com >
Date: Wed Oct 23 16:42:38 2024 +0200
fix test
commit 2ad7541fc0phillip@habitica.com >
Date: Wed Oct 23 16:34:52 2024 +0200
fix test
commit 7e337a9e59phillip@habitica.com >
Date: Wed Oct 23 11:54:15 2024 +0200
remove only
commit 7462b8a57fphillip@habitica.com >
Date: Wed Oct 23 11:51:25 2024 +0200
fix bug with incorrectly giving HG bonus
commit acd6183e95sabrecat@gmail.com >
Date: Mon Oct 21 17:22:26 2024 -0500
fix(subs): unhovery and un-12-monthy
commit 935e9fd6ecsabrecat@gmail.com >
Date: Fri Oct 18 14:50:17 2024 -0500
fix(subs): try again on gifts
commit 6e1fb7df38sabrecat@gmail.com >
Date: Thu Oct 17 18:19:20 2024 -0500
fix(lint): do negate object ig
commit 71d434b94esabrecat@gmail.com >
Date: Thu Oct 17 18:15:11 2024 -0500
fix(lint): unnecessary ternary
commit b90b0bb9c3sabrecat@gmail.com >
Date: Thu Oct 17 17:34:24 2024 -0500
fix(subs): gifts DON't renew
commit 19469304c5sabrecat@gmail.com >
Date: Thu Oct 17 17:13:29 2024 -0500
fix(subs): pass autoRenews through Stripe
commit 6819e7b7e5sabrecat@gmail.com >
Date: Thu Oct 17 16:03:25 2024 -0500
fix(subscriptions): minor visual updates
commit 74633b5e5esabrecat@gmail.com >
Date: Wed Oct 16 17:27:09 2024 -0500
fix(subscriptions): more gift layout revisions
commit a90ccb89desabrecat@gmail.com >
Date: Wed Oct 16 15:37:50 2024 -0500
fix(subscription): update layout when gifting
commit c24b2db8dcphillip@habitica.com >
Date: Mon Oct 14 16:11:46 2024 +0200
fix issue with promo hourglasses
commit 7a61c72b47phillip@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 f14cb09026phillip@habitica.com >
Date: Mon Oct 14 10:38:01 2024 +0200
Admin panel display fixes
commit f4cff698cfsabrecat@gmail.com >
Date: Thu Oct 3 17:58:59 2024 -0500
fix(stripe): correct redirect after success
commit c468b58f3fsabrecat@gmail.com >
Date: Thu Oct 3 17:35:37 2024 -0500
fix(subs): correct border-radius and redirect
commit 78fb9e31d6sabrecat@gmail.com >
Date: Wed Oct 2 17:41:49 2024 -0500
fix(css): correct and refactor heights and selection states
commit e2babe8053sabrecat@gmail.com >
Date: Mon Sep 30 16:45:29 2024 -0500
feat(subscription): max Gems progress readout
commit 61af8302a3phillip@habitica.com >
Date: Fri Sep 27 15:11:22 2024 +0200
fix test
commit ef8ff0ea9ephillip@habitica.com >
Date: Fri Sep 27 14:14:44 2024 +0200
show date for hourglass bonus if it was received
commit 4bafafdc8dphillip@habitica.com >
Date: Fri Sep 27 14:12:52 2024 +0200
add new field for cumulative subscription count
commit 30096247b7phillip@habitica.com >
Date: Fri Sep 27 13:39:49 2024 +0200
fix missing transaction type
commit 70872651b0phillip@habitica.com >
Date: Fri Sep 27 13:31:40 2024 +0200
fix admin panel strings
commit f3398db65fsabrecat@gmail.com >
Date: Thu Sep 26 23:11:16 2024 -0500
WIP(subs): extant Stripe state
commit c6b2020109phillip@habitica.com >
Date: Thu Sep 26 11:41:55 2024 +0200
fix admin panel display
commit d9afc96d2dphillip@habitica.com >
Date: Thu Sep 26 11:40:16 2024 +0200
Fix hourglass logic for upgrades
commit 6e2c8eeb64phillip@habitica.com >
Date: Wed Sep 25 17:48:54 2024 +0200
fix hourglass count
commit cd752fbdcesabrecat@gmail.com >
Date: Fri Sep 20 12:24:21 2024 -0500
WIP(frontend): draft of main subs page view
commit 0102b29d59sabe@habitica.com >
Date: Wed Sep 18 15:29:08 2024 -0500
fix(admin): correct logic and style for shrimple subs
commit 5469a5c5c3sabe@habitica.com >
Date: Wed Sep 18 15:07:36 2024 -0500
fix(test): short circuit this.
commit 526193ee6cphillip@habitica.com >
Date: Wed Sep 18 14:42:06 2024 +0200
fix gem limit
commit 19cf1636aaphillip@habitica.com >
Date: Tue Aug 13 17:00:40 2024 +0200
return nextHourglassDate again
commit eea36e3ed5phillip@habitica.com >
Date: Tue Aug 13 13:11:22 2024 +0200
subscription test improvements
commit ca78e74330phillip@habitica.com >
Date: Mon Aug 12 15:46:15 2024 +0200
add more subscription tests
commit f4c4f93a08phillip@habitica.com >
Date: Fri Aug 9 13:35:22 2024 +0200
finish basic implementation of new logic
commit e036742048phillip@habitica.com >
Date: Fri Aug 9 11:37:44 2024 +0200
cleanup
commit 6431865688phillip@habitica.com >
Date: Wed Aug 7 05:41:18 2024 -0400
update cron tests
commit 930d875ae9phillip@habitica.com >
Date: Thu Aug 8 10:36:50 2024 +0200
begin refactoring
commit 96623608d0phillip@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
f8d315ff6e
Upgrade to mongoose 7 ( #14971 )
...
* remove some unused dependencies
* update mongoose version
* make common tests pass
* Make unit tests pass
* make api v3 integration tests pass
* fix lint issues
* fix issue with package-lock
* fix(lint): we don't need no .js
* fix(lint): update to latest config-habitrpg
* chore(npm): update package locks
* fix(test): replace deprecated fn
* chore(package): update eslint-habitrpg again
* fix(lint): server linting
* fix(lint): client linting
* fix(client): correct mangled common imports
* chore(npm): update package-locks
* fix(lint): punctuation, module
---------
Co-authored-by: SabreCat <sabrecat@gmail.com >
Co-authored-by: SabreCat <sabe@habitica.com >
2024-01-16 15:18:47 -06:00
Phillip Thelen
d0e4b533e3
Add new fields to admin panel ( #14943 )
...
* Add new fields to admin panel
* fix lint
* Update hall.js
* fix(plab): plab
* fix(lint): destructure assignment
* fix(subs): coerce offset to number
---------
Co-authored-by: SabreCat <sabe@habitica.com >
2024-01-16 14:45:57 -06:00
Phillip Thelen
58f4dd0c43
fix typo
2023-02-10 17:13:04 +01:00
Phillip Thelen
0ce64a0197
fix next hourglass calculation
2023-02-09 16:20:46 +01:00
SabreCat
f75a6eb11d
fix(hourglass): handle missing planId
2022-09-20 15:25:37 -05:00
SabreCat
1a86943711
fix(subscriptions): better next-hourglass logic
2022-09-12 15:17:39 -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
Bart Enkelaar
234258b41e
Move from deprecated moment#zone to moment#utcOffset ( #12207 )
...
* Issue 10209 - Remove read usages of zone
* Issue 10209 - Add coverage on daysSince and startOfDay cron utility functions
* Issue 10209 - Add unit test for daysUserHasMissed method
* Issue 10209 - Remove usages of deprecated `moment.js#zone` method.
* Issue 10209 - Add helper function to centralise logic
Also simplify timezoneOffsetToUtc function in site.vue
* Issue 10209 - Also add getUtcOffset as method on user
Co-authored-by: Matteo Pagliazzi <matteopagliazzi@gmail.com >
2020-07-25 13:22:41 +02:00
Yo
04a9c97393
Fix Typos ( #11644 )
...
* Fix Typos
* Fix More Typos
2019-12-23 17:52:55 +01:00
Matteo Pagliazzi
ce4729f069
fixes and start client
2019-10-10 22:15:58 +02:00
Matteo Pagliazzi
e0e9811ab6
lint common
2019-10-09 20:08:36 +02:00
Matteo Pagliazzi
0c27fb24a5
start fixing commong
2019-10-09 16:51:17 +02:00
Matteo Pagliazzi
621787915c
start upgrading eslint
2019-10-08 16:57:10 +02:00
Keith Holliday
05640f513e
Added test to recreate early cron issue ( #9668 )
...
* Added test to recreate early cron issue
* Gave user extra time based on reverse timezone change
2017-12-14 09:09:11 -06:00
Keith Holliday
20a99e526d
Should do diff week fix ( #9551 )
...
* Fixed week difference when changing year
* Added year switchover test
* Fixed start date setting
2017-11-20 12:22:01 -06:00
Sabe Jones
3f92317b9e
Revert "Implements repeat every X days since last completion ( Fixes #6941 ) ( #8962 )"
...
This reverts commit 9d69d4b863
2017-11-09 22:13:34 +00:00
Asif Mallik
9d69d4b863
Implements repeat every X days since last completion ( Fixes #6941 ) ( #8962 )
...
* Implemented repeat after completion
* Added tests for repeat after completion in shouldDo.test.js
* Remove lastTicked
* Undoes removal of website/client/README.md
2017-11-07 12:56:46 -06:00
Keith Holliday
3fa0b72ffe
Added assumption when no time is supplied ( #8855 )
...
* Added assumption when no time is supplied
* Changed format of date
* Set now options when date is specified
2017-07-07 18:46:54 -07:00
Keith Holliday
7fd2522e93
Merged in develop
2017-06-27 22:23:13 -06:00
Keith Holliday
ca8541e8c4
Added needsCron field
2017-06-21 13:28:12 -06:00
Keith Holliday
f7ce269f3c
Add false return when repeats are empty ( #8777 )
...
* Add false return when repeats are empty
* Added front end check for repeats on monthly-daysOfWeek
* Fixed tests with static date
2017-06-14 11:27:50 -07:00
joe-salomon
0be681b7a2
Dailies performance fix - fixes #8756 ( #8767 )
...
* Changed recurring logic to not use moment-recur plugin for performance reasons
* change only nextDue calculations
add tests to make sure proper nextDue values are calculated
revert schedule.matches logic to original
revert shouldDo.test.js to original
* fix monthly nextDue logic
move tests to shouldDo.test.js
* typos
* revert to original logic. change not needed
* add failure cases
2017-06-08 10:34:05 -07:00
Keith Holliday
6f034bb5dd
Fixed issue when repeat object is malformed ( #8765 )
...
* Fixed issue when repeat object is malformed
* Removed only
* Changed numeric check to lodash isFinite
* Removed newer lodash function
2017-05-28 20:07:29 -05:00
Keith Holliday
280b720c13
Allow user to deselect all days during week
2017-05-22 08:37:45 -06:00
Keith Holliday
f49d21d7b4
added next due date as today for weekly
2017-05-20 18:38:53 -06:00
Keith Holliday
c08c0685f3
Fixed broken tests
2017-05-20 17:19:35 -06:00
Keith Holliday
99a2013767
Fixed display of next due dates
2017-05-18 14:12:36 -06:00
Keith Holliday
7f2719a75c
Fixed every x weekly
2017-05-18 10:11:29 -06:00
Keith Holliday
a82b60f144
Removed extra codes
2017-05-12 09:21:29 -06:00
Keith Holliday
f192ca4c6f
Abstracted set next due logic, set offset, and mapped to ISO
2017-05-12 07:39:32 -06:00
Keith Holliday
1292f9a3d5
Added nextDue field
2017-05-11 13:11:16 -06:00
Keith Holliday
850f332ddc
MErged in develop
2017-05-10 15:51:50 -06:00
Keith Holliday
59fb32ea2e
Moved back to zone function
2017-05-10 15:47:32 -06:00
SabreCat
15d4f7d6ab
Revert "Add tests for shouldDo - fixes #8585 ( #8660 )"
...
This reverts commit 4bbebdd237
2017-05-08 22:08:24 +00:00
Keith Holliday
76222ac344
Added custom day start support
2017-05-08 10:20:47 -06:00
Keith Holliday
a0ee73e944
Updated new recur logic to work with tests
2017-05-08 09:39:50 -06:00
Keith Holliday
6174624b89
Merged develop
2017-05-08 08:32:03 -06:00
Grace Chen
4bbebdd237
Add tests for shouldDo - fixes #8585 ( #8660 )
...
* Fix #8585 - Add shouldDo CDS and timezone variation test suite
* Fix #8585 - resolve feedback
2017-05-08 07:32:38 -06:00
Keith Holliday
8c68f450c6
Enabled repeatables
2017-03-15 14:13:15 -06:00
Keith Holliday
bde41699ee
Reverted should do file ( #8556 )
2017-03-10 17:37:52 -06:00
Keith Holliday
1082359f2c
Repeatables fixes ( #8538 )
...
* Prevented watch functions from being called when task._edit is removed
* Added start date support on the UI task summary
* Fixed setting of monthly and calculations
* Fixed linting issues
* Added check for existence
* Added existence check
* Ensured correct start date is used on update
* Hid repeat options from anything not a daily
* Added missing locales
* Moved repeatables out of advance options
2017-03-08 16:48:30 -07:00
Matteo Pagliazzi
98c019a0b6
Upgrade lodash to v4 and lint more files ( #8495 )
...
* common: import lodash modules separately
* remove test/content from .eslintignore, fix with eslint --fix content/index
* lint test/content
* lint content/index except for lodash methods
* upgrade server/models
* upgrade server/middlewares and server/libs
* port server/controllers/top-level
* port server/controllers/api-v3
* port views and tests
* client old port lodash and _(, missing _.
* upgrade client-old
* port common/script (root level files only)
* port common/script/fns
* port common/libs
* port common/script/ops
* port common/script/content and common/script/libs/shops.js
* misc fixes
* misc fixes
* misc fixes
* more tests fixes
* fix payments test stubbing, down to 2 failing tests
* remove more instances of lodash wrapping
* fix bug where toObject does not clone object
* fix tests
* upgrade migration or add lodash 4 note
* update shrinkwrap
* fix linting
* upgrade eslint-config-habitrpg
* update shrinkwrap
* recompile shrinkwrap
2017-03-01 17:10:48 +01:00
Keith Holliday
ef02e59590
Repeatables ( #8444 )
...
* Added initial should do weekly tests
* Added support back in for days of the week and every x day
* Added better week day mapper
* Added initial monthly
* Added every x months
* Added yearlies
* Fixed every nth weekdy of month
* Fixed tests to check every x week on weekday
* Began combining x month with nth weekday
* Added every x month combined with date and weekday
* Fixed lint issues
* Saved moment-recurr to package.json
* Added new repeat fields
* Added UI for repeatables
* Ensured only dalies are affected by summary
* Added local strings
* Updated npm shrinkwrap
* Shared day map constant
* Updated shrinkwrap
* Added ui back
* Updated copy of test cases
* Added new translation strings
* Updated shrinkwrap
* Fixed broken test
* Made should do tests static for better consitency
* Fixed issue with no repeat
* Fixed line endings
* Added frequency enum values
* Fixed spacing
2017-02-27 15:41:21 -07:00
Blade Barringer
81b7eeeb71
Common reorg ( #8025 )
...
* Re-organize common folder
* fix: Correct paths in tests
* fix: move new content to proper folder
* chore: Move audio folder to assets
* Move sprites to sprites assets directory
* Move css sprites to assets directory
* Split out readmes for common code and sprites
* Move images to assets directory
* Move destinatin of shared browserified file
* remove unused file
* move compiled js to client-old
* Fix karma tests
* fix: Correct paths for sprites
2016-09-16 17:18:07 +02:00
