029e41472f
fix(teams): filter further to hide team tasks, don't override
2022-02-17 15:49:19 -06:00
395d9e7650
fix(teams): maybe goodish style?
2022-02-17 15:49:18 -06:00
61d396204f
fix(teams): more layout tweakage
2022-02-17 15:49:17 -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
dcaba7f186
fix(teams): update beta banner wording
2022-02-17 15:47:55 -06:00
59dc97b75f
WIP(teams): fixes, beta banner
2022-02-17 15:47:37 -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
99bf6349e1
fix(assignment): update single select dropdown style
2022-02-17 15:46:44 -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
bb9ba61d12
feat(teams): show team name
2022-02-17 15:44:58 -06:00
a88f97831a
fix(teams): update single select style and correct create/edit issue
2022-02-17 15:44:58 -06:00
ae0528e5cd
WIP(teams): fix initially unassigned task, add completedBy data
2022-02-17 15:44:57 -06:00
74345adf6b
fix(teams): make selectSingle workflows functional
2022-02-17 15:44:56 -06:00
7dbee4caed
clone selectMulti to selectSingle for assignedMember
2022-02-17 15:44:55 -06:00
6cddb3bf82
WIP(teams): more partial fixing
2022-02-17 15:44:36 -06:00
248e1c6fe9
WIP(teams): reimplement open tasking
2022-02-17 15:43:28 -06:00
6e39c79cff
WIP(teams): simplify task footers
2022-02-17 15:41:07 -06:00
cab4a2a8fa
WIP(teams): begin simplification
2022-02-17 15:41:05 -06:00
81363feb26
revert Bailey datetime PR
2022-02-09 11:17:15 -06:00
9e740e7092
fix(heroes): still more indents
2022-02-08 11:10:39 -06:00
169634f205
fix(heroes): remove broken td and correct indentation
2022-02-08 11:09:05 -06:00
094cf899d8
fix(heroes): remove duplicated column
2022-02-08 10:39:11 -06:00
fd4d139fc2
Merge remote-tracking branch 'CuriousMagpie/2022-02-backgrounds-armoire' into develop
2022-02-07 10:51:23 -06:00
ca4df96902
Merge branch 'release' into develop
2022-02-01 15:29:35 -06:00
9e5948df64
chore(sprites): compile
2022-02-01 15:21:03 -06:00
83c2e1774b
Merge remote-tracking branch 'CuriousMagpie/zodiac-zookeeper' into release
2022-02-01 14:30:02 -06:00
fb73ec3ad9
Merge remote-tracking branch 'Lyqst/news-post-datetime' into develop
2022-01-31 15:41:33 -06:00
e7dc233fc9
Merge remote-tracking branch 'origin/feature/sprites-cdn' into develop
2022-01-31 15:40:27 -06:00
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
5beb29305d
Fix selection highlight in avatar editor ( #13746 )
2022-01-31 15:35:17 -06:00
de477ebb4a
Revert "Revert "Revert "Prerequisites to removing Facebook authentication ( #13683 )"""
...
This reverts commit e3ffd7acbc
2022-01-31 14:52:22 -06:00
ba9a65c500
chore(sprites): compile
2022-01-31 10:58:02 -06:00
f2f3a1f0eb
added Zodiac Zookeeper achievement
2022-01-28 17:14:50 -05:00
1a76ad5dca
fix(news): use Moment timezone package
2022-01-27 15:54:03 -06:00
988f594298
Merge branch 'develop' into news-post-datetime
2022-01-27 15:34:18 -06:00
e3ffd7acbc
Revert "Revert "Prerequisites to removing Facebook authentication ( #13683 )""
...
This reverts commit b3c466ad5a
2022-01-27 14:50:04 -06:00
8637d55d2b
changed a few stray 2021s to 2022
2022-01-26 16:45:54 -05:00
b3c466ad5a
Revert "Prerequisites to removing Facebook authentication ( #13683 )"
...
This reverts commit 1177ad8b8c
2022-01-25 09:30:37 -06:00
1177ad8b8c
Prerequisites to removing Facebook authentication ( #13683 )
...
* Don't sign in user when trying to connect a social account that was already created
* Log social users into matching local auth accounts
If the social account has an email that already exists as a local user, instead of creating a new account log them into their account and add the social auth to the account
* If possible set local authentication email for social users
* Allow password reset emails to be sent to social login users
* lint fixes
* Fix issues and tests
* fix tests
* Fix lint error.
2022-01-21 15:15:58 -06:00
f01c352969
fix(chat): Enter key improvement by @maryketa
2022-01-21 14:55:34 -06:00
21a3a81d5b
Sprites: only create the css which points to the CDN
2022-01-07 22:12:43 +01:00
586801a1cf
chore(sprites): compile
2022-01-06 16:28:29 -06:00
82ad85e564
feat(content): Armoire and Backgrounds Jan 2022
2022-01-06 16:28:16 -06:00
8824f6ac16
fix(sprites): add habitica-images as submodule
2021-12-31 13:03:02 -06:00
2e09f2d4fb
chore(sprites): compile
2021-12-30 13:34:11 -06:00
e2b506eb3c
chore(sprites): compile
2021-12-28 14:38:54 -06:00
Sabe Jones