Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sign in with Apple #11793

Merged
merged 520 commits into from Apr 8, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
520 commits
Select commit Hold shift + click to select a range
bd0c72a
Merge branch 'develop' into onboarding-guide
paglias Dec 10, 2019
09ed903
add date check
paglias Dec 10, 2019
0201ed1
achievements modal polishing
paglias Dec 10, 2019
a9bbf13
Merge branch 'onboarding-guide' into delta
paglias Dec 10, 2019
9dd4f7b
Merge branch 'develop' into delta
SabreCat Dec 10, 2019
60bf3e8
Merge branch 'develop' into onboarding-guide
paglias Dec 11, 2019
4c25daa
refresh private-messages page when you are already on it
negue Dec 11, 2019
851ca4a
add countbadge knob to change the example
negue Dec 11, 2019
84edd06
Merge branch 'sabrecat/pm-style' into delta
negue Dec 11, 2019
14fca19
Merge branch 'develop' into onboarding-guide and fix typo
paglias Dec 13, 2019
c79b394
Merge branch 'develop' into delta
paglias Dec 13, 2019
03d2156
Merge branch 'onboarding-guide' into delta
paglias Dec 13, 2019
cc0ada5
Merge branch 'develop' into sabrecat/pm-style
paglias Dec 13, 2019
d1768bf
fix lint
paglias Dec 13, 2019
8132799
typos
paglias Dec 13, 2019
48e4fc2
Merge branch 'onboarding-guide' into delta
paglias Dec 13, 2019
96ee36f
typos
paglias Dec 13, 2019
9bfa301
typos
paglias Dec 13, 2019
af8f701
add toggle for achievements categories
paglias Dec 14, 2019
72175d5
Merge branch 'onboarding-guide' into delta
paglias Dec 14, 2019
54090dc
typo
paglias Dec 14, 2019
8a35274
Merge branch 'onboarding-guide' into delta
paglias Dec 14, 2019
4c6b6e7
fix test
paglias Dec 14, 2019
618e51c
Merge branch 'develop' into onboarding-guide
paglias Dec 16, 2019
5a838d0
fix edit avatar modal cannot be closed
paglias Dec 16, 2019
7b37dfa
Merge branch 'onboarding-guide' into delta
paglias Dec 16, 2019
a0b0c70
Merge branch 'develop' into delta
paglias Dec 16, 2019
4553146
WIP(settings): subscriber page improvements
SabreCat Dec 17, 2019
8b4b6e7
Merge branch 'develop' into delta
SabreCat Dec 17, 2019
eaa55ac
Merge branch 'release' into sabrecat/subscription-page
SabreCat Dec 17, 2019
b04732e
WIP(subscriptions): more design build-out
SabreCat Dec 17, 2019
55e3e7f
fix(css): disabled button styles
SabreCat Dec 18, 2019
ed638d7
fix(css): better Amazon targeting
SabreCat Dec 18, 2019
4308413
fix hide tooltip + align header correctly
negue Dec 18, 2019
07f9cc1
disable perfect scroll
negue Dec 18, 2019
21f3f96
Merge branch 'sabrecat/pm-style' into delta
negue Dec 18, 2019
d1577ab
Merge branch 'develop' of https://github.com/HabitRPG/habitica into s…
negue Dec 18, 2019
a4955e6
load messages on refresh event
negue Dec 19, 2019
4a9e450
Merge branch 'sabrecat/pm-style' into delta
negue Dec 19, 2019
2d10191
Merge branch 'develop' into delta
SabreCat Dec 19, 2019
468f876
Merge branch 'develop' into delta
SabreCat Dec 20, 2019
88c2bd9
fix header label + conversation actions not breaking layout on hover
negue Dec 22, 2019
27f8a3b
Merge branch 'sabrecat/pm-style' into delta
negue Dec 22, 2019
71ed073
Merge branch 'develop' of https://github.com/HabitRPG/habitica into s…
negue Dec 22, 2019
8901cb8
Merge branch 'sabrecat/pm-style' into delta
negue Dec 22, 2019
108ecde
Merge branch 'develop' into delta
paglias Dec 23, 2019
e7b2229
Merge branch 'develop' into delta
paglias Dec 23, 2019
6536bfa
Merge branch 'develop' into delta
SabreCat Dec 23, 2019
3e17caf
Merge branch 'develop' into delta
SabreCat Dec 23, 2019
d6bd9c9
Merge branch 'develop' into delta
SabreCat Dec 26, 2019
3c0123c
WIP(g1g1): notif
SabreCat Dec 27, 2019
7bc0317
WIP(g1g1): notif cont'd
SabreCat Dec 30, 2019
15d4e1a
Merge branch 'release' into delta
SabreCat Dec 30, 2019
67e2e73
fix(test): snowball change
SabreCat Dec 30, 2019
3ac7411
fix(event): feature NYE card
SabreCat Dec 31, 2019
5e034e3
Merge branch 'develop' into delta
SabreCat Dec 31, 2019
39e1001
Merge branch 'develop' into delta
SabreCat Dec 31, 2019
5533fb3
Merge branch 'develop' into delta
SabreCat Jan 1, 2020
e9d80fb
Merge branch 'develop' of https://github.com/HabitRPG/habitica into s…
negue Jan 6, 2020
3fac7a1
Merge branch 'sabrecat/pm-style' into delta
negue Jan 6, 2020
b3f2178
Merge branch 'sabrecat/timetrav-bgs' into delta
SabreCat Jan 6, 2020
48381d8
chore(sprites): compile
SabreCat Jan 6, 2020
b6c9416
fix(bgs): include TT required field
SabreCat Jan 6, 2020
c8d7b70
Merge branch 'develop' into delta
SabreCat Jan 6, 2020
30d5229
add gifting banner to the max height calculation
negue Jan 7, 2020
d322981
Merge branch 'sabrecat/pm-style' into delta
negue Jan 7, 2020
44efc69
Merge branch 'develop' into delta
SabreCat Jan 7, 2020
0e103da
Merge branch 'develop' of https://github.com/HabitRPG/habitica into s…
negue Jan 7, 2020
174c0dd
Merge branch 'sabrecat/pm-style' into delta
negue Jan 7, 2020
d7e7f5c
Merge branch 'develop' into delta
SabreCat Jan 8, 2020
a40132f
Merge branch 'sabrecat/timetrav-bgs' into delta
SabreCat Jan 9, 2020
e60f955
Merge branch 'develop' into delta
SabreCat Jan 9, 2020
7c3cfdb
chore(event): enable winter customizations
SabreCat Jan 10, 2020
59de88b
Merge branch 'release' into sabrecat/g1g1-improve
SabreCat Jan 14, 2020
bb746df
WIP(gifting): partial modal implementation
SabreCat Jan 14, 2020
f4be9bd
Merge branch 'develop' into delta
SabreCat Jan 14, 2020
f862fc2
feat(gifting): select giftee modal
SabreCat Jan 16, 2020
c158cfb
Merge branch 'sabrecat/g1g1-improve' into delta
SabreCat Jan 16, 2020
e6d97dc
Merge branch 'sabrecat/timetrav-bgs' into delta
SabreCat Jan 16, 2020
3e9a4f8
fix(gifting): notification order, modal dismiss
SabreCat Jan 16, 2020
91e1183
Merge branch 'sabrecat/g1g1-improve' into delta
SabreCat Jan 16, 2020
1e7ac23
Merge branch 'develop' into delta
SabreCat Jan 16, 2020
224d9b4
Begin implementing sign in with apple
phillipthelen Sep 17, 2019
a940abf
Add apple sign in button to website
phillipthelen Jan 16, 2020
22fa758
fix lint errors
phillipthelen Jan 17, 2020
1247139
fix config json
phillipthelen Jan 17, 2020
9b0698d
fix(modals): correct some repops
SabreCat Jan 17, 2020
a01eb57
Merge branch 'sabrecat/dismiss-modals' into sabrecat/g1g1-improve
SabreCat Jan 17, 2020
25151a3
fix(gifting): style updates
SabreCat Jan 17, 2020
d7a05b7
Merge branch 'sabrecat/g1g1-improve' into delta
SabreCat Jan 17, 2020
2b00fca
Merge branch 'sabrecat/dismiss-modals' into sabrecat/timetrav-bgs
SabreCat Jan 17, 2020
5e7b811
fix(buy): modal style changes
SabreCat Jan 17, 2020
b6b2723
fix(modals): also clean out "prev"
SabreCat Jan 17, 2020
9a7b59f
Merge branch 'sabrecat/dismiss-modals' into sabrecat/timetrav-bgs
SabreCat Jan 17, 2020
8c57124
Merge branch 'sabrecat/timetrav-bgs' into delta
SabreCat Jan 17, 2020
8f6e500
Merge branch 'fix/pm-textarea-styling' into delta
negue Jan 18, 2020
1315d78
Attempt workaround for sign in with apple on android
phillipthelen Jan 21, 2020
2aecb9e
temporarily log everything as error
phillipthelen Jan 21, 2020
5dacd7f
refactor(modals): hide in dismiss event
SabreCat Jan 21, 2020
3bafbe7
fix temporary test failure
phillipthelen Jan 21, 2020
2325b2c
changes to sign in with apple
phillipthelen Jan 21, 2020
d79922f
fix: first batch of layout issues for private messages + auto sizing …
negue Jan 21, 2020
826ba3e
Merge branch 'fix/style/pm-issues' into delta
negue Jan 21, 2020
3fb67ec
Merge branch 'develop' into delta
SabreCat Jan 21, 2020
119b202
Merge branch 'sabrecat/dismiss-modals' into delta
SabreCat Jan 21, 2020
c8c35b5
fix(modals): new dismiss logic
SabreCat Jan 21, 2020
e10745c
Merge branch 'sabrecat/g1g1-improve' into delta
SabreCat Jan 21, 2020
3bb7237
fix(modals): new dismiss no go??
SabreCat Jan 21, 2020
7e91d7a
Merge branch 'sabrecat/g1g1-improve' into delta
SabreCat Jan 21, 2020
eb59b4d
Merge branch 'develop' into delta
SabreCat Jan 22, 2020
c91bf92
Only use email scope
phillipthelen Jan 22, 2020
e68f80a
print debugging
phillipthelen Jan 22, 2020
df68628
.
phillipthelen Jan 22, 2020
05572fd
..
phillipthelen Jan 22, 2020
edd7074
...
phillipthelen Jan 22, 2020
cc6622a
username second line - open profile on face-avatar/conversation name …
negue Jan 22, 2020
3b06a40
Merge branch 'fix/style/pm-issues' into delta
negue Jan 22, 2020
761587e
temporarily disable apple auth and just return data for debugging
phillipthelen Jan 23, 2020
28cd4f8
Hopefully this works
phillipthelen Jan 23, 2020
cda2eb0
Merge branch 'develop' into delta
SabreCat Jan 23, 2020
b9ba44c
.....
phillipthelen Jan 24, 2020
ee6d3f8
Merge branch 'develop' into sabrecat/subscription-page
SabreCat Jan 24, 2020
1f1f9b4
Merge branch 'sabrecat/g1g1-improve' into sabrecat/subscription-page
SabreCat Jan 24, 2020
d89e036
Merge branch 'sabrecat/dismiss-modals' into sabrecat/subscription-page
SabreCat Jan 24, 2020
793f13b
WIP(subscription): unsubscribed state
SabreCat Jan 24, 2020
f65a155
Merge branch 'develop' into sabrecat/subscription-page
SabreCat Jan 24, 2020
b932ce4
.
phillipthelen Jan 27, 2020
021ed78
..
phillipthelen Jan 27, 2020
a8f3226
MAYBE THIS ACTUALLY WORKS???
phillipthelen Jan 27, 2020
395d124
Implement apple sign in
phillipthelen Jan 28, 2020
ae702a8
fix some urls
phillipthelen Jan 28, 2020
31ec415
fix urls
phillipthelen Jan 28, 2020
cb5e44d
fix redirect and auth
phillipthelen Jan 28, 2020
2c3e24c
attempt to also request name
phillipthelen Jan 28, 2020
9b1aeec
fix lint error
phillipthelen Jan 28, 2020
083ddfa
WIP(subscription): partial subscribed
SabreCat Jan 28, 2020
ffcb160
Merge branch 'sabrecat/birthday-2020' into delta
SabreCat Jan 28, 2020
5240e08
chore(sprites): compile
SabreCat Jan 28, 2020
9ce8fd5
Change approach so that it actually works
phillipthelen Jan 29, 2020
082143c
fix config error
phillipthelen Jan 29, 2020
4d6b3bc
fix lint errors
phillipthelen Jan 29, 2020
d8a3ee8
Fix
phillipthelen Jan 29, 2020
bd8b049
fix lint error
phillipthelen Jan 29, 2020
6de373b
lint error
phillipthelen Jan 30, 2020
6cfe239
WIP(subscription): finish subscribed
SabreCat Jan 30, 2020
4d02923
refresh on sync
negue Jan 30, 2020
4517c25
new "you dont have any messages" style + changed min textarea height
negue Jan 30, 2020
8188109
new conversationItem style / layout
negue Jan 30, 2020
f86ceac
reset message unread on reload
negue Jan 30, 2020
9237cce
Merge branch 'fix/style/pm-issues' into delta
negue Jan 30, 2020
1897450
Merge branch 'develop' into delta
SabreCat Jan 31, 2020
78bc5a9
chore(npm): update package-locks
SabreCat Jan 31, 2020
ed097f2
Merge branch 'develop' into delta
SabreCat Feb 1, 2020
cd58a6e
Merge branch 'develop' into delta
SabreCat Feb 1, 2020
18e4b4b
Merge branch 'develop' into delta
SabreCat Feb 1, 2020
7d8d520
Merge branch 'develop' into delta
paglias Feb 1, 2020
f05ee43
Merge branch 'develop' into delta
paglias Feb 1, 2020
49c58af
Merge branch 'develop' into delta
SabreCat Feb 1, 2020
ad71220
fix styles / textarea height
negue Feb 1, 2020
388ae07
Merge branch 'fix/style/pm-issues' into delta
negue Feb 1, 2020
da3684e
Merge branch 'develop' into sabrecat/subscription-page
SabreCat Feb 3, 2020
45a30f8
feat(subscription): revised sub page RC
SabreCat Feb 3, 2020
8b4c348
Merge branch 'sabrecat/subscription-page' into delta
SabreCat Feb 3, 2020
fba754f
list optOut / chatRevoked informations for each conversation + show w…
negue Feb 3, 2020
6c2deda
Merge branch 'fix/style/pm-issues' into delta
negue Feb 3, 2020
2c42168
Merge branch 'develop' into delta
SabreCat Feb 4, 2020
81eae6e
Merge branch 'develop' into delta
SabreCat Feb 5, 2020
fc849b2
Improve apple redirect view
phillipthelen Feb 6, 2020
0eada37
Fix apple icon on group task registration page
phillipthelen Feb 6, 2020
5568833
WIP(adventure): prereqs
SabreCat Feb 6, 2020
3831389
Block / Unblock - correct disabled states - $gray-200 instead of 300/400
negue Feb 6, 2020
13726b1
Merge branch 'fix/style/pm-issues' into delta
negue Feb 6, 2020
ef0d92e
Merge branch 'develop' into delta
SabreCat Feb 6, 2020
f8ba6e6
canReceive not checking chatRevoked
negue Feb 7, 2020
43d0e99
fix: faceAvatar / userLink open the selected conversation user
negue Feb 7, 2020
0097baa
check if the target user is blocking the logged-in user
negue Feb 7, 2020
9d39508
Merge branch 'fix/style/pm-issues' into delta
negue Feb 7, 2020
06bd3f0
Merge branch 'sabrecat/valentines-2020' into delta
SabreCat Feb 7, 2020
3e8de84
Merge branch 'develop' into sabrecat/subscription-page
SabreCat Feb 11, 2020
86a8ec4
fix(subs): style tweaks
SabreCat Feb 11, 2020
a7b2b66
Merge branch 'sabrecat/subscription-page' into delta
SabreCat Feb 11, 2020
836ea2e
fix(profiles): short circuit contributor
SabreCat Feb 11, 2020
75bbb68
Merge branch 'develop' into delta
SabreCat Feb 11, 2020
8669293
Merge branch 'sabrecat/quest-202002' into delta
SabreCat Feb 11, 2020
e558fd7
chore(sprites): compile
SabreCat Feb 11, 2020
0621a6e
fix(content): missing potion data
SabreCat Feb 13, 2020
a357b6e
fix(content): missing string
SabreCat Feb 13, 2020
cd5e769
Merge branch 'develop' into sabrecat/adventure-prep
SabreCat Feb 13, 2020
6da1646
WIP(drops): new modal
SabreCat Feb 13, 2020
b6e1aa9
fix(subs): moar style tweaks
SabreCat Feb 13, 2020
014f1ee
Merge branch 'sabrecat/subscription-page' into delta
SabreCat Feb 13, 2020
fc08533
check if blocks is undefined
negue Feb 13, 2020
9111c9c
max-height instead of height
negue Feb 13, 2020
3dd055d
fix "no messages" state + canReceive on a new conversation
negue Feb 13, 2020
0468684
Merge branch 'develop' into delta
SabreCat Feb 13, 2020
2eac7ed
Merge branch 'fix/style/pm-issues' into delta
negue Feb 13, 2020
67030e4
Merge branch 'delta' of https://github.com/HabitRPG/habitica into delta
negue Feb 13, 2020
8ed8462
Merge branch 'develop' into delta
SabreCat Feb 13, 2020
9b61233
Merge branch 'sabrecat/pink-cheevos' into delta
SabreCat Feb 17, 2020
571b92e
WIP(adventure): analytics fixes etc
SabreCat Feb 18, 2020
b078602
Merge branch 'develop' into delta
SabreCat Feb 18, 2020
b8edf22
Improve apple signin handling
phillipthelen Feb 19, 2020
ffb29ef
fixed conversations width (280px on max 768 width page)
negue Feb 19, 2020
4fc416b
Merge branch 'fix/style/pm-issues' into delta
negue Feb 19, 2020
bba022f
Merge branch 'develop' into sabrecat/adventure-prep
SabreCat Feb 20, 2020
10e27da
feat(adventure): random egg+potion on 2nd task
SabreCat Feb 20, 2020
a64c05e
fix(lint): noworkies
SabreCat Feb 20, 2020
3edbeda
fix(modal): correctly construct classes
SabreCat Feb 20, 2020
af608ca
fix(tests): expectations and escape
SabreCat Feb 20, 2020
cadd194
Merge branch 'sabrecat/adventure-prep' into delta
SabreCat Feb 20, 2020
6d402f0
Fix typo
phillipthelen Feb 20, 2020
342358c
Merge branch 'develop' into delta
SabreCat Feb 20, 2020
6e7a4ea
Merge branch 'develop' into delta
SabreCat Feb 20, 2020
3ceacc8
Merge branch 'develop' into delta
paglias Feb 24, 2020
ae0dc34
Merge branch 'phillip/appleauth' into delta
paglias Feb 24, 2020
9c936bc
use base url from env variables
paglias Feb 24, 2020
0708c7d
Merge branch 'phillip/appleauth' into delta
paglias Feb 24, 2020
76b9310
fix lint
paglias Feb 24, 2020
754d602
call autosize after message is sent
negue Feb 26, 2020
7d912a9
Merge branch 'fix/style/pm-issues' into delta
negue Feb 26, 2020
20c3bd7
fix urls
phillipthelen Feb 26, 2020
39dc94d
Merge branch 'phillip/appleauth' into delta
paglias Feb 27, 2020
8ac40c7
always verify token
phillipthelen Feb 27, 2020
d36543b
throw error when social auth could not retrieve id
phillipthelen Feb 27, 2020
651c325
Store emails correctly for apple auth
phillipthelen Feb 27, 2020
2c832df
Merge branch 'develop' into delta
SabreCat Feb 27, 2020
dcb2fe4
Retrieve name when authenticating through apple
phillipthelen Feb 28, 2020
456dec6
Fix lint errors
phillipthelen Feb 28, 2020
23c7f75
fix all lint errors
phillipthelen Feb 28, 2020
3a10322
Merge branch 'develop' into delta
SabreCat Feb 28, 2020
351ebd2
Merge branch 'phillip/appleauth' into delta
paglias Feb 29, 2020
fb94b41
Merge branch 'sabrecat/armoire-202003' into delta
SabreCat Mar 2, 2020
9f91801
fix(content): missing strings
SabreCat Mar 2, 2020
d2efd25
Revert "always verify token"
phillipthelen Mar 2, 2020
575c68d
Correctly load name
phillipthelen Mar 2, 2020
4b51884
try to fix conflicts
paglias Mar 11, 2020
1bc3108
remove extra changes
paglias Mar 11, 2020
c84003e
remove extra logger call
paglias Mar 11, 2020
260b8d1
reset package and package-lock
paglias Mar 11, 2020
ee40edb
add back missing packages
paglias Mar 11, 2020
61c519c
use name from apple
paglias Mar 13, 2020
e7610de
add support for multiple apple public keys
paglias Mar 13, 2020
013861e
add some unit and integration tests
paglias Mar 16, 2020
ef370e9
Merge branch 'develop' into phillip/appleauth
paglias Mar 16, 2020
eb6fbcf
add apple auth integration test
paglias Mar 16, 2020
135cc23
Merge branch 'phillip/appleauth' of github.com:HabitRPG/habitica into…
paglias Mar 16, 2020
9757602
Merge branch 'develop' into phillip/appleauth
paglias Mar 23, 2020
e30a6e6
tweak social signup buttons
phillipthelen Mar 25, 2020
b85177b
pixel pushing
phillipthelen Mar 25, 2020
66f872c
Merge branch 'develop' into phillip/appleauth
paglias Apr 8, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -37,6 +37,7 @@ yarn.lock
.elasticbeanstalk/*
!.elasticbeanstalk/*.cfg.yml
!.elasticbeanstalk/*.global.yml
/.vscode

# webstorm fake webpack for path intellisense
webpack.webstorm.config
1 change: 1 addition & 0 deletions .nodemonignore
Expand Up @@ -9,3 +9,4 @@ test/**
*.swp
*.swx
website/raw_sprites/**
content_cache/**
4 changes: 4 additions & 0 deletions config.json.example
Expand Up @@ -75,5 +75,9 @@
"WEB_CONCURRENCY": 1,
"SKIP_SSL_CHECK_KEY": "key",
"ENABLE_STACKDRIVER_TRACING": "false",
"APPLE_AUTH_PRIVATE_KEY": "",
"APPLE_TEAM_ID": "",
"APPLE_AUTH_CLIENT_ID": "",
"APPLE_AUTH_KEY_ID": "",
"BLOCKED_IPS": ""
}