1
0
Fork 0
mirror of synced 2024-06-14 00:34:51 +12:00
Commit graph

632 commits

Author SHA1 Message Date
Torsten Dittmann dfef0e732c sync: main -> 1.5.x 2024-03-07 17:16:39 +01:00
Torsten Dittmann 0a1d572c72 chore: run formatter 2024-03-06 18:34:21 +01:00
Torsten Dittmann 4d873eb5a2 fix: stats collection name 2024-03-05 10:36:23 +01:00
Torsten Dittmann a53e630536 Merge branch 'main' of https://github.com/appwrite/appwrite into sync-main-1.5.x-2 2024-03-05 10:31:51 +01:00
Matej Bačo d4e4337c57 PR review changes 2024-03-04 08:50:50 +00:00
Matej Bačo c4bd61cdc8 QA changes 2024-03-03 18:11:55 +00:00
Matej Bačo 9bcad451f2 Add recovery codes to users API 2024-03-03 15:17:38 +00:00
Matej Bačo 7a29c79fb1 Fix bugs during QA 2024-03-01 17:04:09 +00:00
Matej Bačo 5cefca1c22 Fix MFA flows and docs 2024-03-01 16:22:51 +00:00
Torsten Dittmann dd13d17377 feat: const for totp values 2024-03-01 03:07:58 +01:00
Torsten Dittmann b7d3996960 feat: mfa collection restructure 2024-02-29 21:59:49 +01:00
Jake Barnby d7a16ae7b0
Merge branch '1.5.x' into fix-password-validation 2024-02-26 17:52:41 +13:00
Jake Barnby d3cf892001
Named params 2024-02-26 17:50:52 +13:00
Jake Barnby 19d7e533fa
Usage desc updates 2024-02-26 15:44:20 +13:00
Torsten Dittmann 3963b65f68 fix: mfa delete 2024-02-25 11:21:56 +01:00
Matej Bačo cb7da26d53 Fix empty pass with personal data check 2024-02-25 09:19:30 +00:00
Christy Jacob 7ae09ba795
Revert "Revert "usage/usage-dump queue health endpoints"" 2024-02-25 13:42:28 +05:30
Jake Barnby 0d62ecf90f
Merge pull request #7625 from appwrite/provider-null
Provider null
2024-02-24 01:17:58 +13:00
Christy Jacob a8098831a3
Revert "usage/usage-dump queue health endpoints" 2024-02-22 12:21:48 +05:30
Jake Barnby 942847cf3a
Merge remote-tracking branch 'origin/main' into 1.5.x
# Conflicts:
#	app/config/collections.php
#	app/config/errors.php
#	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/teams.php
#	app/controllers/api/users.php
#	app/controllers/shared/api.php
#	app/init.php
#	app/worker.php
#	composer.json
#	composer.lock
#	docker-compose.yml
#	src/Appwrite/Extend/Exception.php
#	src/Appwrite/Platform/Services/Tasks.php
#	src/Appwrite/Platform/Tasks/Maintenance.php
#	src/Appwrite/Platform/Workers/Certificates.php
#	src/Appwrite/Platform/Workers/Deletes.php
#	src/Appwrite/Platform/Workers/Messaging.php
#	src/Appwrite/Platform/Workers/Usage.php
#	src/Appwrite/Platform/Workers/UsageHook.php
#	src/Appwrite/Specification/Format/OpenAPI3.php
#	src/Appwrite/Specification/Format/Swagger2.php
#	tests/e2e/Services/Account/AccountConsoleClientTest.php
2024-02-22 01:29:28 +13:00
fogelito b762a9cedd Check user false 2024-02-21 11:48:16 +02:00
fogelito a851a5f244 providerInternalId nulls 2024-02-21 11:43:04 +02:00
Jake Barnby 14a243cc37
Merge pull request #7457 from appwrite/1.5.x-response-request-models
Update Response and Request filters aswell as Migrations for 1.5.x
2024-02-16 20:58:08 +13:00
Jake Barnby 3c727861bb
Fix target permissions 2024-02-16 17:07:16 +13:00
Torsten Dittmann 14ecbd6658 fix: 2fa endpoint params 2024-02-15 11:26:34 +00:00
shimon dac0e2a543 Merge branch 'main' of github.com:appwrite/appwrite into refactor-cache-poc
 Conflicts:
	src/Appwrite/Platform/Workers/UsageHook.php
2024-02-13 10:48:47 +02:00
Jake Barnby 66e51c0f18
Merge remote-tracking branch 'origin/1.5.x' into 1.5.x-response-request-models
# Conflicts:
#	src/Appwrite/Platform/Workers/Usage.php
#	src/Appwrite/Platform/Workers/UsageHook.php
2024-02-13 15:07:16 +13:00
Jake Barnby 06b15c79ff
Merge pull request #7572 from appwrite/attributes-query-fix
fix Indexes
2024-02-13 12:37:59 +13:00
Christy Jacob c076dfe6f1
Merge pull request #7576 from appwrite/refactor-usage-sn
Refactor usage sn
2024-02-12 23:05:56 +05:30
fogelito ace75b0786 parseQueries 2024-02-12 18:02:04 +02:00
fogelito e5bada0493 typo 2024-02-12 12:03:31 +02:00
fogelito adbe11fd50 fix Indexes 2024-02-12 11:55:45 +02:00
shimon e7ace61273 Sync against main 2024-02-12 11:10:52 +02:00
Souptik Datta 8d7be399d3
fix: Fix project user activity log's missing fields and total count
Signed-off-by: Souptik Datta <souptikdatta2001@gmail.com>
2024-02-09 00:15:48 +05:30
shimon 790cdc297b composer update 2024-02-08 10:26:45 +02:00
Jake Barnby 7014b2c2cd
Fix user API mfa route auth 2024-02-07 18:08:51 +13:00
Bradley Schofield 559fa924c0 Merge branch '1.5.x' into 1.5.x-response-request-models 2024-02-06 17:10:43 +00:00
Matej Bačo 25f8702429 Fix formatting 2024-02-05 10:40:53 +00:00
Matej Bačo 7beb9080fa Merge remote-tracking branch 'origin/1.5.x' into fix-empty-user-updates 2024-02-05 10:38:48 +00:00
shimon 6a6c3445fa updates 2024-02-04 20:02:01 +02:00
shimon a63977455f Merge branch '1.5.x' of github.com:appwrite/appwrite into 1.5.x-response-request-models
 Conflicts:
	.gitmodules
2024-02-04 09:27:08 +02:00
Torsten Dittmann 75fc59931a Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mfa 2024-02-02 13:30:11 +01:00
Jake Barnby d1bad7c3cd
Remove redundant usage labels 2024-02-02 17:16:31 +13:00
shimon a254bb7edb Merge branch '1.5.x' of github.com:appwrite/appwrite into 1.5.x-response-request-models 2024-02-01 17:13:38 +02:00
Torsten Dittmann ceb868c9d7 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mfa 2024-02-01 11:57:32 +01:00
shimon 350d72eb1f updates 2024-02-01 12:21:50 +02:00
loks0n d84cfab244 feat: remove users.createSession 2024-02-01 10:21:38 +00:00
shimon 5518ca165e remarks 2024-01-30 13:24:57 +02:00
Jake Barnby ee4b50ce51
Merge pull request #7504 from appwrite/labels-limit
Labels limit
2024-01-30 19:43:32 +13:00
shimon 44ed6826a9 refactor usage poc 2024-01-28 15:33:04 +02:00