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

611 commits

Author SHA1 Message Date
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
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
fogelito 974783f54a Increase labels max value 2024-01-28 12:51:05 +02:00
shimon 7a2ee683e3 refactor usage poc 2024-01-28 11:28:59 +02:00
fogelito 789e19d26a Merge branch '1.5.x' of github.com:appwrite/appwrite into json-parsing 2024-01-25 19:06:18 +02:00
fogelito 998c4d282d Fix failing tests 2024-01-25 18:53:51 +02:00
fogelito a782e20315 Merge branch '1.5.x' of github.com:appwrite/appwrite into json-parsing
 Conflicts:
	app/controllers/api/account.php
	composer.json
	composer.lock
	src/Appwrite/Platform/Tasks/CalcTierStats.php
	tests/e2e/Services/Account/AccountBase.php
2024-01-25 17:44:05 +02:00
Jake Barnby 52a9b31521
Trigger deletes worker when target is deleted 2024-01-25 20:01:15 +13:00
Torsten Dittmann 9070dce6ac Merge branch 'main' of https://github.com/appwrite/appwrite into 1.5.x 2024-01-24 16:32:12 +01:00
Torsten Dittmann 88cf7ea9e8 fix: race condition with creating a user with targets 2024-01-24 15:31:58 +01:00
Torsten Dittmann 9f5a0312cf Merge branch 'main' of https://github.com/appwrite/appwrite into 1.5.x 2024-01-24 11:24:59 +01:00
Matej Bačo eb597b2bd2 Try to fix targets bug 2024-01-20 13:07:53 +00:00
Matej Bačo 42eb051368 QA bug fixes 2024-01-20 10:06:30 +00:00
Matej Bačo 311e9a75dd Allow empty values in PATH user service 2024-01-20 09:43:31 +00:00
Torsten Dittmann 057496dbaa feat: mfa users endpoints 2024-01-18 14:56:58 +01:00
shimon a0b38a5a7c Merge branch 'main' of github.com:appwrite/appwrite into refactor-usage-sn 2024-01-18 14:19:19 +02:00
loks0n bc1858c516 chore: do not auto create accounts in users endpoints 2024-01-17 11:03:04 +00:00
loks0n a8adfe8f8a fix: users create session event 2024-01-16 11:13:42 +00:00
loks0n 77b1762514 chore: fix token event 2024-01-16 10:40:49 +00:00
loks0n 07da41bd69 docs: better descriptions for create token params 2024-01-12 17:35:16 +00:00
loks0n c8ce360ce9 chore: remove 'universal' references 2024-01-12 17:30:36 +00:00
loks0n 02b83bf26e chore: changes to expire param create token 2024-01-12 17:28:56 +00:00
loks0n ca511bd459 chore: use customId validators 2024-01-12 17:26:01 +00:00