31cac936c8
Sprites: re-add previous offsets to sprites ( #13933 )
...
* Sprites: re-add previous offsets to sprites
* fix lint
2022-04-15 14:14:48 -05:00
90375e3bc4
Merge branch 'develop' into sabrecat/teams-rebase
2022-04-14 15:36:26 -05:00
8b17ebd1f1
fix(settings): don't show email change without email, refresh page
2022-04-14 14:51:11 -05:00
1c4c7b9f1e
fix(settings): correct show/hide for email and pass scenarios
2022-04-14 14:21:39 -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
dfe53e8b68
Hide Locked Background Year Tab
2022-04-13 17:14:14 -04:00
c4a92ba384
Merge branch 'develop' into sabrecat/teams-rebase
2022-04-12 14:48:45 -05:00
afa9a65933
Merge branch 'release' into develop
2022-04-12 14:41:03 -05:00
8f7e5d544e
Merge branch 'develop' into sabrecat/teams-rebase
2022-04-07 14:55:16 -05:00
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
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
da3e6f96ba
fix(sprites): move more heavy assets to s3
2022-04-06 14:54:19 -05:00
aaba400d36
fix(quest): remove static PNG
2022-04-06 12:42:51 -05:00
c086d7b91d
update sprites
2022-04-06 12:15:39 -05:00
5b93199f35
fix(quest): moving gif into right folder /facepalm
2022-04-06 12:15:05 -05:00
3b82bb9494
Update sprites.css
2022-04-06 12:14:52 -05:00
1c347fc4b8
fix(quest): virtualPet.gif to virtualpet.gig
2022-04-06 12:14:42 -05:00
fb017e1f08
fix(pets): various quest and animation corrections
2022-04-05 16:03:46 -05:00
1ca528eb95
Merge branch 'develop' into 2022-04-wacky-potion-quest
2022-04-05 15:08:18 -05:00
40113b0458
Merge branch 'develop' into sabrecat/teams-rebase
2022-04-05 13:56:25 -05:00
202d74b8c4
Virtual Pet animated images
2022-04-04 17:37:09 -04:00
39b39387d3
chore(sprites): compile CSS
2022-04-04 14:54:09 -05:00
34d0922bcc
Merge remote-tracking branch 'rarysson/update-year-on-footer' into develop
2022-04-01 16:28:04 -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
140372a70d
Update faceAvatar.vue so snowman ACTUALLY shows up ( #13911 )
2022-03-31 15:39:53 -05:00
48be0a38bf
Merge branch 'develop' into sabrecat/teams-rebase
2022-03-31 14:49:35 -05:00
459b327e2d
feat(nav): clicking "Group" goes to first group
2022-03-30 15:53:48 -05:00
608ae5fc43
feat(event): April Fooly 2022
2022-03-30 15:31:17 -05:00
aa81c330af
Merge branch 'develop' into sabrecat/teams-rebase
2022-03-30 11:35:33 -05:00
2b93ea3740
chore(sprites): compile
2022-03-30 09:44:36 -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
d6e64482d6
chore(sprites): update CSS
2022-03-22 16:52:48 -05:00
c5ef803458
Merge branch 'develop' into sabrecat/teams-rebase
2022-03-22 16:29:47 -05:00
47dd711ab9
Merge branch 'release' into develop
2022-03-22 10:37:51 -05:00
ad9c468e77
fix(event): CSS build, small fixes
2022-03-22 10:34:44 -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
52d1480844
chore(sprites): build CSS
2022-03-09 16:16:44 -06:00
7fa4e6f791
fix(teams): don't show status footer for Habits or Rewards
2022-03-09 11:24:19 -06:00
aa1b9a5e94
added achievement Birds of a Feather
2022-03-08 12:43:38 -05:00
9d4bf22720
fix(teams): Close button and padding fix
2022-03-04 15:15:50 -06:00
24349bed0a
fix(teams): display and logic adjustments
2022-03-01 16:18:57 -06:00
17b93322aa
fix(teams): reload completed To Do
2022-02-28 16:28:54 -06:00
ef6d92e7af
Merge branch 'develop' into sabrecat/teams-rebase
2022-02-28 09:50:07 -06:00
080f7ece30
Merge branch 'release' into develop
2022-02-28 09:49:44 -06:00
05a54e505c
chore(mystery): update images, run sprites
2022-02-28 09:49:21 -06:00
35ed158dd9
WIP(teams): updated completion states
...
and fixed an issue with cron saving
2022-02-24 16:23:46 -06:00
3a2fd28199
WIP(tasks): start task refresh process
2022-02-22 16:50:35 -06:00
1473408752
Merge branch 'develop' into sabrecat/teams-rebase
2022-02-22 12:18:59 -06:00
negue