1
0
Fork 0
mirror of synced 2024-07-06 15:11:21 +12:00
Commit graph

263 commits

Author SHA1 Message Date
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 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
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
Torsten Dittmann 5604a6837f Merge branch '0.16.x' of https://github.com/appwrite/appwrite into origin/datetime-attributes 2022-07-14 14:14:05 +02:00
fogelito 45ac40cc85 change function names 2022-07-13 17:02:49 +03:00
Aditya Oberai 313fd5582a
Set $from to use env variable + update ref link 2022-07-12 22:03:54 +05:30
Aditya Oberai f63c1c95fe Create Vonage phone auth adapter 2022-07-12 15:45:22 +00:00
fogelito f384a3352b change class from database:: to dateTime:: 2022-07-12 16:32:39 +03:00
Bishwajeet Parhi 40b2bd2595 Merge branch 'master' into feat-disqus-Oauth-provider 2022-07-11 13:41:07 +00:00
Bishwajeet Parhi 68616957ab tiny code quality 2022-07-11 13:32:46 +00:00
Bishwajeet Parhi d96be650e4 change to name 2022-07-11 12:40:17 +00:00
Bishwajeet Parhi 122a59c723
Update src/Appwrite/Auth/OAuth2/Disqus.php
Co-authored-by: Matej Bačo <matejbaco2000@gmail.com>
2022-07-11 17:55:06 +05:30
Bishwajeet Parhi 3ee7ccff48 commented unused code 2022-07-11 11:27:17 +00:00
Bishwajeet Parhi 9f5fec7135 emailVerified should return false now 2022-07-11 11:22:40 +00:00
Bishwajeet Parhi 163a013e1f fix double quotes to single quotes for strings 2022-07-11 11:15:53 +00:00
Torsten Dittmann 2652fbc1cb
Merge pull request #3514 from iamdineshkumar/feat-phoneauth-msg91flow
Feat phoneauth msg91flow
2022-07-11 13:15:48 +02:00
Dineshkumar 020bb160b9 changed payload encodings 2022-07-09 20:12:48 +05:30
Dineshkumar 817524de4b Renamed Msg91Flow to Msg91 2022-07-09 19:34:57 +05:30
Bishwajeet Parhi 4adc0eb563 fix urls get user method 2022-07-08 18:18:40 +00:00
Aditya Oberai 5d70a4749a
Correct TeleSign reference material link 2022-07-08 23:14:09 +05:30
Bishwajeet Parhi 2d8ddfedfa update comment 2022-07-08 16:02:24 +00:00
Bishwajeet Parhi 16c1b0bc2a feat-disqus 2022-07-08 15:57:51 +00:00
Dineshkumar b5b5abdc82
Updated Functional Document Provider name as msg91 2022-07-07 20:59:34 +05:30
Dineshkumar d2bf2f8f5a
Added Msg91 Adaptor Using Flow 2022-07-07 16:41:50 +05:30