1
0
Fork 0
mirror of synced 2024-06-18 18:54:55 +12:00
Commit graph

292 commits

Author SHA1 Message Date
Bradley Schofield 94676a6c16 Alter sessionVerify to remove expire 2022-11-04 09:50:59 +00:00
Damodar Lohani 185b206076 fix moved constant 2022-10-14 11:23:20 +00:00
Christy Jacob 7abb426e3f fix: hash phone auth code 2022-09-23 03:55:17 +05:30
Jake Barnby 381a26fa4c
Assign verified/unverified role to users 2022-09-14 00:44:55 +12:00
Jake Barnby 7132e3a7f6
Assign member role for all of a users confirmed team memberships 2022-09-09 11:58:54 +12:00
Bradley Schofield b16053bbdf Merge branch '0.16.x' into fix-unaccepted-invitation-access 2022-08-31 18:29:38 +01:00
Bradley Schofield 9b3e333134 Fix unaccepted invitations giving access to projects 2022-08-30 16:53:57 +01:00
Jake Barnby 44970cc628 Sync master 2022-08-28 11:01:46 +12:00
Jake Barnby cb6fc7f618 Merge branch 'origin/datetime-attributes' into refactor-permissions-inc-console-fix
# Conflicts:
#	.gitignore
#	app/config/collections.php
#	app/controllers/api/account.php
#	app/controllers/api/databases.php
#	app/controllers/api/storage.php
#	app/controllers/api/users.php
#	composer.lock
#	tests/e2e/Services/Account/AccountCustomClientTest.php
2022-08-19 16:49:34 +12:00
Jake Barnby 7019be987c Merge remote-tracking branch 'origin/0.16.x' into origin/datetime-attributes
# Conflicts:
#	app/config/specs/open-api3-latest-client.json
#	app/config/specs/open-api3-latest-console.json
#	app/config/specs/open-api3-latest-server.json
#	app/config/specs/swagger2-latest-client.json
#	app/config/specs/swagger2-latest-console.json
#	app/config/specs/swagger2-latest-server.json
#	app/controllers/api/account.php
#	app/controllers/api/users.php
#	app/controllers/shared/api.php
#	app/workers/deletes.php
#	composer.lock
#	docker-compose.yml
#	phpunit.xml
#	src/Appwrite/Event/Delete.php
2022-08-19 16:20:19 +12:00
Jake Barnby 66539bbe3a Review updates for role helper usage 2022-08-19 16:04:33 +12:00
fogelito f52d28e75f Auth tests 2022-08-15 22:18:37 +03:00
Jake Barnby 33970276b2 Self review 2022-08-15 19:20:10 +12:00
Eldad Fux 6f74c565e8 Fixed docblock 2022-08-15 09:55:37 +03:00
Eldad Fux f88a64df1c Fix for linter 2022-08-14 22:01:58 +03:00
Eldad Fux 9b897629ba Fixed code generator 2022-08-14 21:57:23 +03:00
Eldad Fux 22c38a484f Merge branch 'feat-password-hash-algos' of https://github.com/appwrite/appwrite into feat-missing-phone-param 2022-08-14 19:43:53 +03:00
Eldad Fux 98fc8669e1 Merge branch '0.16.x' of https://github.com/appwrite/appwrite into feat-password-hash-algos 2022-08-14 19:23:30 +03:00
Eldad Fux b36c24c508 Decouple Auth code from SMS provider adapter 2022-08-14 17:19:58 +03:00
Eldad Fux 25f176875d Changed provider name from phone to sms 2022-08-14 16:43:41 +03:00
Jake Barnby 6a5de3e0b6 Merge remote-tracking branch 'origin/fix-datetime-attributes' into refactor-permissions-inc-queries-update-datetime-fixes
# Conflicts:
#	app/config/collections.php
#	app/controllers/api/databases.php
#	app/controllers/api/projects.php
#	app/controllers/api/teams.php
#	composer.json
#	composer.lock
#	tests/e2e/Services/Account/AccountBase.php
#	tests/e2e/Services/Databases/DatabasesBase.php
#	tests/e2e/Services/Functions/FunctionsCustomServerTest.php
#	tests/e2e/Services/Projects/ProjectsConsoleClientTest.php
#	tests/e2e/Services/Storage/StorageBase.php
#	tests/e2e/Services/Storage/StorageCustomClientTest.php
#	tests/e2e/Services/Storage/StorageCustomServerTest.php
#	tests/e2e/Services/Teams/TeamsBase.php
#	tests/e2e/Services/Webhooks/WebhooksBase.php
#	tests/e2e/Services/Webhooks/WebhooksCustomClientTest.php
#	tests/e2e/Services/Webhooks/WebhooksCustomServerTest.php
#	tests/unit/Auth/AuthTest.php
2022-08-14 23:11:05 +12:00
Jake Barnby ed712fb196 Merge remote-tracking branch 'origin/0.16.x' into refactor-permissions-inc-console-fix
# Conflicts:
#	app/controllers/general.php
#	composer.lock
2022-08-14 02:31:06 +12:00
Eldad A. Fux 5b4a3805bf
Merge pull request #3522 from wess/feat-etsy-auth
Adds Etsy to OAuth providers
2022-08-13 13:05:43 +03:00
Eldad Fux 3c7a7f0fa4 Merge branch '0.16.x' of https://github.com/appwrite/appwrite into origin/datetime-attributes 2022-08-13 06:21:50 +03:00
Steven 1abe9d4c01 Merge branch '0.16.x' into fix-datetime-attributes 2022-08-12 22:54:33 +00:00
Wess Cope c6fc2a98ae
Update src/Appwrite/Auth/OAuth2/Etsy.php
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2022-08-09 10:14:40 -04:00
Wess Cope a079284729
Update src/Appwrite/Auth/OAuth2/Etsy.php
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2022-08-09 10:14:30 -04:00
Wess Cope f0d4f43dba
Update src/Appwrite/Auth/OAuth2/Etsy.php
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2022-08-09 10:14:19 -04:00
Wess Cope fe2fe1e08a
Update src/Appwrite/Auth/OAuth2/Etsy.php
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2022-08-09 08:15:46 -04:00
Wess Cope 97117f2fde
Update src/Appwrite/Auth/OAuth2/Etsy.php
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2022-08-09 08:15:38 -04:00
Wess Cope 27e54fae4c
Update src/Appwrite/Auth/OAuth2/Etsy.php
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2022-08-09 08:15:28 -04:00
Wess Cope f1887449ab
Update src/Appwrite/Auth/OAuth2/Etsy.php
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2022-08-09 08:15:19 -04:00
fogelito 82a240998b Merge branch '0.16.x' of github.com:appwrite/appwrite into origin/datetime-attributes
 Conflicts:
	composer.lock
	src/Appwrite/Stats/Usage.php
2022-08-09 14:20:26 +03:00
Bishwajeet Parhi f4c5b4c11d lints fixed 2022-08-08 12:44:11 +00:00
Bishwajeet Parhi 6c653d8f2a remove whitespace 2022-08-05 16:21:47 +00:00
Bishwajeet Parhi 999962d161 add comments denoting return type and parameters if any 2022-08-05 16:09:38 +00:00
Bishwajeet Parhi 9cd10686bb
Update src/Appwrite/Auth/OAuth2/Disqus.php
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2022-08-05 21:25:41 +05:30
Bishwajeet Parhi 6fdf578919
Update src/Appwrite/Auth/OAuth2/Disqus.php
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2022-08-05 21:25:34 +05:30
Bishwajeet Parhi dab0a8ec27
Update src/Appwrite/Auth/OAuth2/Disqus.php
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2022-08-05 21:25:21 +05:30
Bishwajeet Parhi 3f15035c1a
Merge branch 'appwrite:master' into feat-disqus-Oauth-provider 2022-08-05 21:24:19 +05:30
Matej Bačo 6c21723ecb
Merge branch 'appwrite:master' into shiftra 2022-08-05 13:32:06 +02:00
Christy Jacob 78d02f50af
Merge pull request #3180 from Aragur/feat-XXX-authentik-oauth
feat: Add authentik as a OAuth provider
2022-08-05 13:06:05 +05:30
Jake Barnby 7b9fb32fae Update role references 2022-08-03 21:52:34 +12:00
Matej Bačo dbccf39a9f Merge branch 'master' into feat-password-hash-algos 2022-07-25 12:37:07 +00:00
Wess Cope 0653d99e4d
Update Etsy.php
- Reduces scope to only profile and email
- Updates comment for isEmailVerified informing that etsy.com handles verification itself.
2022-07-21 12:18:38 -04:00
Wess Cope 6b089d35a9
Update src/Appwrite/Auth/OAuth2/Etsy.php
Co-authored-by: Torsten Dittmann <torsten.dittmann@googlemail.com>
2022-07-21 09:28:42 -04:00
Wess Cope 0c38f1db08
Delete etsy.php 2022-07-18 10:14:51 -04:00
wess e1df9faad7 case fixed 2022-07-14 13:01:50 -04:00
wess bb51393332 Fixes file case 2022-07-14 11:57:08 -04:00
wess 52f5d7d346 Fixes issue where isEmailVerified was not included 2022-07-14 11:52:23 -04:00