90375e3bc4
Merge branch 'develop' into sabrecat/teams-rebase
2022-04-14 15:36:26 -05:00
664f960a8b
Pull in missing changes from FB removal PR ( #13931 )
...
* fix(auth): hide post hoc Facebook reg
* Pull in missing changes
* fix(lint): whitespace
* fix(strings): missing error message
* fix(tests): update to match functionality
Co-authored-by: SabreCat <sabe@habitica.com >
2022-04-14 12:58:37 -05:00
8f7e5d544e
Merge branch 'develop' into sabrecat/teams-rebase
2022-04-07 14:55:16 -05:00
e17b86a1f6
fix(bug-report): relevant change from #13922
2022-04-07 14:48:26 -05:00
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
40113b0458
Merge branch 'develop' into sabrecat/teams-rebase
2022-04-05 13:56:25 -05:00
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
9ff0766910
Fix cron not running if previous run failed ( #13892 )
...
* catch issue where cron wouldn’t run bc previous run failed
* add some more tests for cron middleware
* fix lint
2022-03-31 16:32:59 -05:00
f1b0aa2e7c
Merge branch 'develop' into sabrecat/teams-rebase
2022-03-28 16:34:31 -05:00
966cc64396
Merge branch 'release' into develop
2022-03-28 16:33:35 -05:00
0a2eceaa73
fix(achievement): correct string for Birds and add to user schema
2022-03-28 16:26:37 -05:00
354f3578a2
Merge branch 'develop' into sabrecat/teams-rebase
2022-03-23 20:23:29 -05:00
5890b04e30
Merge branch 'release' into develop
2022-03-23 20:21:13 -05:00
f7f928d1bd
On-the-fly fix for tasks missing from tasksOrder ( #13900 )
...
* fix(tasks): revised fix logic, accounting for groups/challenges
* fix(tasks): don't grab individual user tasks in shared list
Co-authored-by: SabreCat <sabe@habitica.com >
2022-03-23 20:17:49 -05:00
33da6b7959
revert of hotfix for further review
2022-03-21 16:28:41 -05:00
9a454daef1
partial revert of hotfix for further review
2022-03-21 16:28:20 -05:00
2828ae660c
fix(tasks): correct list repair query
2022-03-18 17:40:09 -05:00
fa27aa8fe7
fix(tasks): self-healing for missing tasksOrder entries
2022-03-18 17:15:20 -05:00
e9ca17bbd8
Merge branch 'develop' into sabrecat/teams-rebase
2022-03-14 14:33:36 -05:00
a0cb9da64b
Merge branch 'release' into develop
2022-03-14 14:31:36 -05:00
3e082fe127
chore(event): Pi Day 2022
2022-03-14 14:29:57 -05:00
5a638ab4b8
Merge branch 'develop' into sabrecat/teams-rebase
2022-03-09 16:37:31 -06:00
5320de93a8
Merge branch 'release' into develop
2022-03-09 16:18:08 -06:00
aa1b9a5e94
added achievement Birds of a Feather
2022-03-08 12:43:38 -05:00
8cfb2a05ef
add banned word - TRIGGER / CONTENT WARNING: assault, slurs, swearwords, etc
2022-03-06 16:38:41 +10:00
61be42bf05
WIP(teams): data migration draft
2022-03-04 18:17:43 -06:00
1473408752
Merge branch 'develop' into sabrecat/teams-rebase
2022-02-22 12:18:59 -06:00
08352c5f49
fix(subs): correct cancellation check logic and test
2022-02-22 11:26:15 -06:00
c6d07983b2
Fix issue with validating android sub cancellation
2022-02-22 10:12:10 -06:00
7e73c336dd
WIP(teams): stylish and functional multi assign checkboxes
2022-02-17 15:51:28 -06:00
82d3545c08
WIP(teams): various fixes
2022-02-17 15:51:28 -06:00
13e645fa4b
fix(teams): correct some unassignment bugs
2022-02-17 15:51:27 -06:00
9e527f4f35
WIP(teams): can do To Do's
2022-02-17 15:51:09 -06:00
eaa5f821a4
WIP(multi-assign): functioning multi
2022-02-17 15:50:44 -06:00
a495db8480
WIP(assignment): change to object style
...
to do--let assignment API accept an array
2022-02-17 15:50:42 -06:00
fa99458ca4
WIP(multiassign): resume shared completion implementation
2022-02-17 15:50:23 -06:00
1f81e1971b
fix(cron): remove now redundant logic
2022-02-17 15:49:56 -06:00
45fc2b62e3
fix(cron): process team board tasks assigned to the user
2022-02-17 15:49:56 -06:00
63e0875f32
fix(teams): allow ticking team checklists
2022-02-17 15:49:34 -06:00
1752c08fd9
fix(teams): allow managers to reorder tasks
2022-02-17 15:49:19 -06:00
f233c511cc
fix(teams): layout issues, error, change timezone format
2022-02-17 15:49:16 -06:00
0806391ab8
feat(teams): Day Start and adjust uncheck wording
2022-02-17 15:48:55 -06:00
59dc97b75f
WIP(teams): fixes, beta banner
2022-02-17 15:47:37 -06:00
85a9ea726c
WIP(teams): draft of server literal-actual-cron script
2022-02-17 15:47:23 -06:00
d53813adc7
WIP(teams): add some analytics, remove extraneous logic
2022-02-17 15:47:02 -06:00
221dd7a81e
fix(tasks): more lock icon revision, no error on manager uncheck
2022-02-17 15:46:45 -06:00
801b902bb8
fix(tasks): manager lock icon, coerce task value to Number
2022-02-17 15:46:43 -06:00
072b09e030
feat(teams): quick add
...
Also fixes issue with lock icons
Also hides task copies from personal task board
2022-02-17 15:46:42 -06:00
a5680836bd
feat(teams): new disapproval workflow, managers can uncheck tasks
2022-02-17 15:46:23 -06:00
ae0528e5cd
WIP(teams): fix initially unassigned task, add completedBy data
2022-02-17 15:44:57 -06:00
SabreCat