Commit Graph

819 Commits

Author SHA1 Message Date
Chirag Aggarwal a98f32b5e1 merge with 1.7.x 2025-02-04 16:56:14 +00:00
Jake Barnby a7f1cc128a Validate cursor queries to avoid getDocument type error 2024-10-17 18:41:24 +13:00
Jake Barnby 8bc37026cd Revert "Feat adding coroutines" 2024-10-08 20:54:40 +13:00
Binyamin Yawitz c34f8afa81 fix: wrong document check 2024-10-07 20:34:27 -04:00
Binyamin Yawitz 16835f96bf chore: merge 2024-10-07 11:02:18 -04:00
Torsten Dittmann ec77ab1007 Merge branch '1.6.x' of https://github.com/appwrite/appwrite into migrations-backups 2024-10-03 11:13:44 +02:00
Binyamin Yawitz 671f801cd5 fix: missing protocol 2024-10-02 13:27:02 -04:00
Binyamin Yawitz 2703ca1106 chore: merge 2024-10-01 11:44:01 -04:00
Binyamin Yawitz d14edf4207 reverting: to set coroutines as head 2024-10-01 10:30:47 -04:00
fogelito 54f55f65f4 deletes-worker-set-project 2024-10-01 17:17:36 +03:00
Binyamin Yawitz 5512340cdd Revert "Feat eldad4 coroutines" 2024-09-20 12:30:05 -04:00
Damodar Lohani 413f3c20ab use proper scope for platforms and keys endpoint 2024-09-04 01:51:32 +00:00
Binyamin Yawitz 7d6eac4ddb Merge branch '1.6.x' into feat-eldad4-coroutines
# Conflicts:
#	app/cli.php
#	app/controllers/api/account.php
#	app/controllers/api/functions.php
#	app/controllers/api/projects.php
#	app/controllers/general.php
#	app/controllers/shared/api.php
#	app/http.php
#	app/init.php
#	app/realtime.php
#	app/worker.php
#	composer.json
#	composer.lock
#	src/Appwrite/Migration/Migration.php
#	src/Appwrite/Platform/Tasks/Migrate.php
#	src/Appwrite/Platform/Tasks/ScheduleExecutions.php
#	src/Appwrite/Platform/Workers/Builds.php
#	src/Appwrite/Platform/Workers/Deletes.php
#	src/Appwrite/Specification/Format/Swagger2.php
#	src/Appwrite/Utopia/Response.php
2024-09-03 19:06:48 -04:00
Torsten Dittmann 6ef600deb9 Merge branch '1.6.x' of https://github.com/appwrite/appwrite into feat-react-native-platform 2024-08-23 21:44:58 +02:00
Binyamin Yawitz 5cdb8388a1 chore: versions update 2024-08-23 13:02:54 -04:00
Torsten Dittmann f3874e680b fix: react native platform for ios adn android 2024-08-20 13:03:03 +02:00
Torsten Dittmann f065022cab feat: react native platform 2024-08-20 12:01:20 +02:00
Matej Bačo d5db9253cd Fix breaking changes in lib 2024-08-16 11:25:01 +00:00
Christy Jacob bfa253297b Merge branch 'main' of https://github.com/appwrite/appwrite into sync-1.6-main 2024-08-13 15:36:13 +00:00
Binyamin Yawitz e672a0ebe2 Merge branch 'refs/heads/1.6.x' into feat-eldad4-coroutines
# Conflicts:
#	src/Appwrite/Auth/Validator/MockNumber.php
2024-08-07 14:01:46 -04:00
Christy Jacob eb4e259be5 chore: linter 2024-07-22 13:08:02 +04:00
Christy Jacob 7614a356a2 feat: address review comments 2024-07-22 12:55:15 +04:00
Bradley Schofield 3792f816ad Add new audit events 2024-07-22 17:03:53 +09:00
Christy Jacob 98b8e13add feat: address review comments 2024-07-21 23:45:39 +04:00
Christy Jacob 711ca8801a feat: address review comments 2024-07-21 23:30:06 +04:00
Binyamin Yawitz 916f58cd9d fixes: Logger and Abuse timelimit 2024-07-19 14:19:30 -04:00
Binyamin Yawitz 927dbc7e11 Merge branch 'refs/heads/1.6.x' into feat-eldad4-coroutines
# Conflicts:
#	app/console
#	app/controllers/api/account.php
#	app/controllers/api/functions.php
#	app/controllers/api/projects.php
#	app/controllers/api/users.php
#	app/controllers/api/vcs.php
#	app/controllers/general.php
#	app/controllers/mock.php
#	app/controllers/shared/api.php
#	app/init.php
#	composer.json
#	composer.lock
#	src/Appwrite/Platform/Tasks/Doctor.php
#	src/Appwrite/Platform/Tasks/ScheduleMessages.php
#	src/Appwrite/Platform/Workers/Builds.php
#	src/Appwrite/Utopia/Response.php
2024-07-17 14:31:13 -04:00
Damodar Lohani 0374711298 Update projects.php 2024-07-16 06:53:21 +05:45
Damodar Lohani f4a4ec1def Merge branch '1.6.x' into feat-project-accessed-at 2024-07-10 13:01:00 +05:45
Damodar Lohani 61333908a5 set project accessed at while creating 2024-07-08 01:11:09 +00:00
Binyamin Yawitz 664c3ad466 chore: Cleanup 2024-07-04 15:04:20 -04:00
Binyamin Yawitz a3682b72e1 Merge remote-tracking branch 'refs/remotes/origin/main' into feat-eldad4-coroutines
# Conflicts:
#	app/cli.php
#	app/console
#	app/controllers/api/projects.php
#	app/controllers/general.php
#	app/init.php
#	app/realtime.php
#	app/worker.php
#	composer.json
#	composer.lock
2024-07-03 17:03:24 -04:00
Matej Bačo 2262d516f1 Merge remote-tracking branch 'origin/1.6.x' into mock-numbers 2024-07-03 09:30:11 +00:00
Matej Bačo 3a570b1f73 PR review changes 2024-07-03 08:27:54 +00:00
Matej Bačo 5ef196ec9a PR review changes 2024-07-03 07:11:15 +00:00
loks0n d0125398f1 fix: test 2024-06-26 15:46:12 +01:00
Luke B. Silver ecf761beab Merge branch '1.6.x' into feat-new-session-alert 2024-06-26 12:44:49 +01:00
Christy Jacob 7cec278d27 Merge branch '1.6.x' of https://github.com/appwrite/appwrite into mock-numbers 2024-06-25 15:17:22 +00:00
loks0n 0ea2438069 fix: implementation 2024-06-24 14:12:09 +01:00
loks0n f3f233eb14 feat: new session alert 2024-06-21 19:21:05 +01:00
Christy Jacob a2f27ec15f Merge branch '1.5.x' of https://github.com/appwrite/appwrite into sync-with-main 2024-06-21 13:11:35 +00:00
Christy Jacob fdf44c7bab Merge branch 'main' of https://github.com/appwrite/appwrite into sync-with-main 2024-06-20 15:26:17 +00:00
Christy Jacob c5fa7eb7dc Merge branch '1.6.x' of github.com:appwrite/appwrite into mock-numbers 2024-06-20 20:53:06 +05:30
Christy Jacob 9e1541d96a Merge branch 'main' of https://github.com/appwrite/appwrite into mock-numbers 2024-06-16 07:28:22 +00:00
Binyamin Yawitz d0a55e266c lint: Linting 2024-06-06 20:54:51 -04:00
Jake Barnby 9e487b8ccf Revert "Merge pull request #8237 from appwrite/revert-8193-feat-remove-random-shared-tables"
This reverts commit 930ae6ded0, reversing
changes made to 1f6417b156.
2024-06-06 20:11:19 +12:00
Binyamin Yawitz 6b0892a495 refactor: Adjusting to merge and some code cleanups 2024-06-05 20:41:23 -04:00
Binyamin Yawitz b5a241db8d merge: Main into Coroutines 2024-06-05 18:38:39 -04:00
Christy Jacob ff6efc2855 Revert "Feat remove random shared tables" 2024-06-06 00:11:56 +05:30
Jake Barnby f459a5c458 Merge remote-tracking branch 'origin/refactor-usage-sn' into feat-remove-random-shared-tables
# Conflicts:
#	docker-compose.yml
2024-06-04 17:43:14 +12:00