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

413 commits

Author SHA1 Message Date
Jake Barnby b5cdbb50c7
Use fixed message 2023-10-19 17:12:05 +13:00
Jake Barnby 354211950f
Add timeout test 2023-10-19 17:06:57 +13:00
Jake Barnby b6b8fe7d51
Allow overriding timeout per request in dev mode 2023-10-19 16:19:40 +13:00
Jake Barnby 389d367fca
Set hard timeouts for API dbs 2023-10-19 15:32:45 +13:00
shimon 893b1d0ba7 Merge branch 'main' of github.com:appwrite/appwrite into refactor-workers
 Conflicts:
	.gitmodules
	app/controllers/api/functions.php
	app/controllers/api/health.php
	app/init.php
	app/views/install/compose.phtml
	composer.lock
	src/Appwrite/Migration/Migration.php
	src/Appwrite/Platform/Workers/Builds.php
	src/Appwrite/Platform/Workers/Deletes.php
	src/Appwrite/Platform/Workers/Functions.php
	src/Executor/Executor.php
2023-10-11 12:08:13 +03:00
shimon 2bb4d8fb89 sync with 1.4 2023-10-02 17:02:48 +03:00
Matej Bačo 1502bfef74 Increase timeout 2023-09-30 17:24:09 +02:00
Matej Bačo d9f2f1c37b Introduce execution sync timeout 2023-09-30 11:54:54 +02:00
shimon c4bd6e008e Merge branch 'master' of github.com:appwrite/appwrite into refactor-workers
 Conflicts:
	.env
	app/cli.php
	app/config/collections.php
	app/console
	app/controllers/api/account.php
	app/controllers/api/databases.php
	app/controllers/api/functions.php
	app/controllers/api/projects.php
	app/controllers/api/storage.php
	app/controllers/api/teams.php
	app/controllers/api/users.php
	app/controllers/general.php
	app/controllers/shared/api.php
	app/init.php
	app/worker.php
	app/workers/audits.php
	app/workers/builds.php
	app/workers/certificates.php
	app/workers/databases.php
	app/workers/deletes.php
	app/workers/functions.php
	app/workers/mails.php
	bin/worker-usage
	composer.json
	composer.lock
	docker-compose.yml
	src/Appwrite/Event/Delete.php
	src/Appwrite/Event/Mail.php
	src/Appwrite/Platform/Tasks/Maintenance.php
2023-09-27 18:51:17 +03:00
Matej Bačo cebfc5a22d Fix migrations 2023-09-21 16:09:51 +02:00
Christy Jacob 864092d81c
Merge pull request #6272 from appwrite/feat-router-protection
Feat: router protection
2023-09-21 05:13:34 -04:00
Matej Bačo 8926d24a0d One more env var rename 2023-09-19 09:35:32 +02:00
Matej Bačo d87dbad768 PR review changes 2023-09-19 09:31:57 +02:00
Matej Bačo 6afba0b9c9 Linter fix 2023-09-18 13:22:06 +02:00
Matej Bačo a1049bd2d5 Implement router protection 2023-09-18 13:18:58 +02:00
Matej Bačo 6a7950aa34 Add function domains force https 2023-09-18 12:27:47 +02:00
Christy Jacob 47427972bf fix: test failures 2023-09-07 00:57:23 -04:00
Christy Jacob 90eed32311 fix: add check for localhost domain 2023-09-06 18:39:53 +00:00
Matej Bačo adb4c72a9c Fix project internal ID 2023-09-06 10:31:40 +02:00
Matej Bačo 0d6abda431 Fix autossl domain query 2023-09-06 10:27:21 +02:00
Matej Bačo cafe792879 Fix API returning html 2023-09-06 09:34:02 +02:00
Matej Bačo cda58d2256 Re-add automatic ssl generation 2023-09-05 17:09:54 +02:00
Matej Bačo f4ada97d1a Allow any hostname, and serve API+Console by default 2023-09-05 17:02:07 +02:00
Steven Nguyen 24efa0de82
Fix router error
It's possible for the route to be null (no match) which leads to an
error like:

```
appwrite  | [Error] Timestamp: 2023-08-30T21:39:58+00:00
appwrite  | [Error] Type: Error
appwrite  | [Error] Message: Call to a member function label() on null
appwrite  | [Error] File: /usr/src/code/app/controllers/general.php
appwrite  | [Error] Line: 50
```

This adds a null check to prevent the error.
2023-08-30 16:07:11 -07:00
Jake Barnby b58c34a052
Add global scope to fix invalid routes getting 401 instead of 404 2023-08-22 22:42:04 -04:00
Jake Barnby 02f8e7796d
Merge remote-tracking branch 'origin/feat-git-integration' into feat-1.4-request-response-filters 2023-08-22 17:20:50 -04:00
Jake Barnby 8b4479aa99
Merge pull request #5988 from appwrite/feat-1.4.x-response-filters
Create 1.4 response filter
2023-08-22 17:20:21 -04:00
Jake Barnby 360935fd28
Apply suggestions from code review 2023-08-22 14:13:37 -04:00
Jake Barnby c3682362e9
Merge remote-tracking branch 'origin/feat-git-integration' into feat-1.4-request-response-filters
# Conflicts:
#	app/controllers/api/proxy.php
2023-08-22 13:37:44 -04:00
Jake Barnby e7d5d25263
Merge remote-tracking branch 'origin/feat-git-integration' into feat-1.4.x-response-filters
# Conflicts:
#	app/controllers/api/proxy.php
2023-08-22 13:37:03 -04:00
Matej Bačo ff9eb39689 Rever changes 2023-08-22 19:32:19 +02:00
Matej Bačo 4a2f10f938 Fix request host missing 2023-08-22 19:28:37 +02:00
Matej Bačo ce54c71e16 Fix 404 pages 2023-08-22 12:23:49 +02:00
Steven Nguyen a012a42008
Create 1.4 request filters 2023-08-21 11:52:03 -07:00
Steven Nguyen 0a0a5e9f04
Create 1.4 response filter 2023-08-21 11:48:48 -07:00
Matej Bačo 7c184498bb Fix GitHub app auth and migrations 2023-08-21 15:16:02 +02:00
Matej Bačo 7bdbd51255 PR review changes 2023-08-20 14:14:05 +02:00
Bradley Schofield 0ebd6d43d5
Merge branch 'feat-git-integration' into feat-git-integration-migrations 2023-08-18 11:18:58 +01:00
Khushboo Verma 00f6785818 Addressed PR comments 2023-08-18 12:25:44 +05:30
Bradley Schofield 7fedac9306
Handle Eldad Suggestions 2023-08-16 19:08:24 +01:00
Bradley Schofield a0cd65b94b
Fix Migrations Stability 2023-08-16 16:01:56 +01:00
Matej Bačo 897d299ae6 PR review changes, fixes from QA 2023-08-11 15:34:57 +02:00
Matej Bačo 1bd96228bf Fix file responses from router 2023-08-11 11:19:05 +02:00
Matej Bačo 93735ac4a7 Merge remote-tracking branch 'origin/cl-1.4.x' into feat-git-integration 2023-08-09 12:30:45 +02:00
Christy Jacob c009a12a25 Merge branch 'cl-1.4.x' of https://github.com/appwrite/appwrite into 1.4.x 2023-08-08 20:51:31 +00:00
Matej Bačo 3b15dccc84 More QA fixes 2023-08-06 15:42:18 +02:00
Matej Bačo d5fd3a28f9 More QA fixes 2023-08-06 15:11:30 +02:00
Matej Bačo e60456cfda QA after merge with 1.4 2023-08-06 10:51:53 +02:00
Matej Bačo 906f86fbb8 Merge branch 'cloud-1.4.x' into feat-git-integration 2023-08-06 09:31:32 +02:00
Steven Nguyen d960f85da6
Merge branch '1.4.x' into cloud-1.4.x 2023-08-04 18:07:33 -07:00