1
0
Fork 0
mirror of synced 2024-07-15 19:36:08 +12:00
Commit graph

426 commits

Author SHA1 Message Date
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
Steven Nguyen aa3c2faed9
Merge tag '1.3.8' into cloud-1.3.x-2 2023-08-04 13:55:07 -07:00
Matej Bačo 8bc933ab91 Fix template issues 2023-08-04 10:56:46 +02:00
Matej Bačo 1db0c57518 PR review changes 2023-08-04 07:59:23 +02:00
Steven Nguyen ee6e65ffbc
Style appwrite error page 2023-08-01 11:23:27 -07:00
Matej Bačo 57a4d5ad66 Upgrade console, formatting 2023-07-30 15:30:30 +02:00
Matej Bačo 6cea5a12bb Improve performance of listRepositores 2023-07-30 15:24:10 +02:00
Matej Bačo c3cef56e39 Bug fixing after QA 2023-07-30 15:12:55 +02:00
Matej Bačo 6fb72db7c4 Rename exception 2023-07-29 18:03:13 +02:00
Matej Bačo 37c0cc122a More PR review changes 2023-07-28 10:27:16 +02:00
Matej Bačo ce98b04348 Address PR reviews 2023-07-28 09:56:07 +02:00
Matej Bačo e5adc5772c Add support for all runtime start commands 2023-07-24 08:23:23 +02:00
loks0n 611fbf6b32 feat: X domain console cookie 2023-07-21 11:08:34 +01:00
Eldad A. Fux 66fee90af9
Merge pull request #5199 from appwrite/feat-custom-smtp
[FEAT] Custom SMTP and Template support
2023-07-20 07:09:11 +03:00
Damodar Lohani 8dc5c2cb4c Merge remote-tracking branch 'origin/1.4.x' into feat-custom-smtp 2023-07-19 07:24:58 +00:00
Matej Bačo b72b2ffc8c Improve error page 2023-07-11 10:53:40 +02:00
Damodar Lohani f59d3563f4 Merge remote-tracking branch 'origin/feat-db-pools-master' into feat-db-pools-db-pools-master-sync 2023-07-10 03:06:48 +00:00
Matej Bačo 97581d5836 Add database to log 2023-06-15 13:21:18 +02:00
Matej Bačo e4c79d5d09 Fix https 2023-06-07 11:02:41 +02:00
Matej Bačo 2e11d85033 Fix localhost https 2023-06-07 10:56:14 +02:00
Matej Bačo 6c81b3e3f8 Fix proxy internal http communication 2023-06-07 10:52:16 +02:00
Steven Nguyen f7f14695f0
Don't default to console project
Defaulting to the console project leads to misleading error messages.
For example, you can get a CORS error saying you haven't configured
a platform yet, but the actual error is missing project ID.
2023-06-05 09:06:29 -07:00
Torsten Dittmann a664363525 fix: trailing wildcards 2023-06-02 15:20:58 +02:00
Torsten Dittmann 55ba25ad83 fix: trailing wildcards 2023-06-02 13:18:34 +02:00
Jake Barnby fad53d3e89
Fix visibility
(cherry picked from commit b092405b04)
(cherry picked from commit 3dd67cb17f)
2023-05-30 19:00:50 +12:00
Jake Barnby 3dd67cb17f
Fix visibility
(cherry picked from commit b092405b04)
2023-05-30 18:29:13 +12:00
shimon 432ee72071 Merge branch 'feat-db-pools' of github.com:appwrite/appwrite into refactor-workers
 Conflicts:
	app/cli.php
	app/console
	app/controllers/api/account.php
	app/controllers/api/functions.php
	app/controllers/api/teams.php
	app/controllers/shared/api.php
	app/init.php
	app/worker.php
	app/workers/builds.php
	app/workers/certificates.php
	app/workers/deletes.php
	app/workers/functions.php
	app/workers/mails.php
	src/Appwrite/Event/Event.php
	src/Appwrite/Event/Mail.php
2023-05-22 18:41:24 +03:00
Damodar Lohani 7419867078 new locale codes endpoint 2023-04-17 02:10:17 +00:00
Matej Bačo 27bf18f031 Code formatting 2023-03-14 20:31:23 +01:00
Matej Baco e7351f4eec Add logs to rules 2023-03-13 13:35:34 +00:00
Matej Bačo 541cb010a6 Changes after dev-mode QA 2023-03-10 20:36:39 +01:00
Torsten Dittmann 2178bfc126 Merge branch '1.3.x' of https://github.com/appwrite/appwrite into feat-database-update-attribute 2023-03-10 18:39:11 +05:30
Matej Baco 4b0d6d9826 Bug fixes after proxy QA 2023-03-10 12:20:24 +00:00
Matej Baco 04c7db9f7b Bug fixes for proxy rule service 2023-03-10 07:42:52 +00:00
Matej Bačo 59f5978fa3 Implement rules 2023-03-08 19:30:01 +01:00
Steven Nguyen 85a2d623a6
Update APIs to check X-Appwrite-Timestamp header
Appwrite will refer to the X-Appwrite-Timestamp header for when the
request was originally sent and reject the request if the Timestamp
is older than the updatedAt timestamp of the document.
2023-03-07 10:54:52 -08:00
Torsten Dittmann 6e5b8fab4b fix: implement new framework changes 2023-03-01 17:30:36 +05:30
Matej Bačo 47f85678ff Fix options method routing 2023-02-27 13:43:20 +01:00
Matej Bačo 18021b6fbd Allow localhost hostname 2023-02-24 12:19:38 +01:00
Matej Bačo 249a2e1699 Fix query params 2023-02-24 12:18:22 +01:00
Matej Bačo 068acef0f6 Add unique url generator 2023-02-22 16:07:34 +01:00
Matej Bačo 0cf6a50c3c Code cleanup 2023-02-21 11:31:55 +01:00
Matej Bačo 8dec7e6040 Fix custom ID support 2023-02-21 11:30:16 +01:00
Matej Bačo 60028250a2 Fix url parsing 2023-02-19 13:01:50 +01:00
Matej Bačo 47dbf4c8f6 Fix wildcard bugs 2023-02-19 12:04:12 +01:00
Damodar Lohani 5acd78463a Merge remote-tracking branch 'origin/feat-db-pools' into feat-db-pools-master-sync 2023-02-16 00:44:29 +00:00
Matej Bačo 04e734f8af Console UI update 2023-02-15 15:50:18 +01:00
Matej Bačo f6ae0a05fa Stream response support 2023-02-15 09:36:20 +01:00
Matej Bačo 11580a8a69 Update router for V3 2023-02-14 14:58:13 +01:00
Matej Bačo eea635fe4b Basic implementation for Open Runtimes V2 2023-02-09 15:27:11 +01:00
shimon 5850a454e0 addressing comments 2023-02-05 22:07:46 +02:00
fogelito c4ae047833 Merge branch 'master' of github.com:appwrite/appwrite into feat-technical-debt-2
 Conflicts:
	app/init.php
	composer.json
	composer.lock
2023-01-16 10:24:37 +02:00
Bradley Schofield c0daed3644 Refactor names and cleanup code 2022-12-20 16:11:30 +00:00
Bradley Schofield 3e66d1a549 Rename certificate queue 2022-12-20 11:21:07 +00:00
fogelito 8ade726932 Changing Role + Permissions namespace 2022-12-14 18:04:06 +02:00
Bradley Schofield 21afa43127 Port Certificates to new Queue system 2022-12-13 11:16:12 +00:00
Jake Barnby b6723b7c83
Merge remote-tracking branch 'origin/master' into feat-graphql-support
# Conflicts:
#	app/init.php
2022-12-06 20:38:09 +13:00
shimon b71bba2a9c updates 2022-12-04 19:06:23 +02:00
Eldad Fux db345fae41 WIP 2022-11-24 09:53:52 +02:00
Jake Barnby 4a61718cff
Enable HSTS for all HTTPS requests 2022-11-21 16:49:45 +13:00
Jake Barnby 5a84a37a9e
Merge remote-tracking branch 'origin/master' into feat-graphql-support
# Conflicts:
#	app/init.php
2022-11-18 12:41:48 +13:00
Torsten Dittmann 8d3903cd37 fix: remove layout 2022-11-17 13:37:59 +01:00
Jake Barnby 163cbc5052
Merge remote-tracking branch 'origin/master' into feat-graphql-support
# Conflicts:
#	composer.json
#	composer.lock
2022-11-17 21:41:56 +13:00
Torsten Dittmann 1b533daeaa fix: remove manifest endpoint 2022-11-15 16:30:53 +01:00
Jake Barnby 03f85c3b74
Merge remote-tracking branch 'origin/1.1.x' into feat-graphql-support
# 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
#	composer.json
#	composer.lock
#	src/Appwrite/Utopia/Response/Model/Provider.php
2022-11-01 11:07:51 +13:00
Steven Nguyen 719aa67afa
Remove PDO rethrow
The PDOException was rethrown in general.php so that it could be caught
in the catch block of http.php. However, [a change in
utopia-php/framework](9d37326851)
caused the exception to be masked as an Exception rather than the
underlying PDOException. As such, the `$th instanceof PDOException` in
http.php is always false and `$db = null` is never executed. Since these
snippets of code aren't doing anything or adding value, they should be
removed.

In addition, the `$db = null` may have been added to ensure the
connection was added back to the pool and/or reset if needed, but it
seems like that's not a problem anymore.
2022-10-25 10:05:52 -07:00
Jake Barnby 61e5014ff0
Add sdk graphql header to allowed headers list 2022-10-19 13:01:39 +13:00
Steven Nguyen eca5aa3c2b Fix version matching for 0.15.X request & response 2022-09-13 20:42:50 +00:00
Bradley Schofield 8bc570b0a5 Merge branch '0.16.x' into feat-response-filters-0.16.x 2022-09-05 13:42:46 +01:00
Matej Bačo c7780c5fe6 Update allowed headers with new SDK headers 2022-09-05 08:08:24 +00:00
Christy Jacob 7952dac85e feat: linter fixes 2022-08-20 07:41:07 +00:00
Christy Jacob ca25d329ae feat: update date time calculation 2022-08-19 20:22:38 +05:30
Christy Jacob 2a750eaa73 Merge branch 'refactor-permissions-inc-console-fix' of https://github.com/appwrite/appwrite into feat-improve-keys 2022-08-19 09:32:22 +00:00
Christy Jacob 278afd77c0 Merge branch 'origin/datetime-attributes' of https://github.com/appwrite/appwrite into feat-improve-keys 2022-08-19 09:20:08 +00:00
Jake Barnby 9819088563 Lint 2022-08-19 16:05:00 +12:00
Jake Barnby 66539bbe3a Review updates for role helper usage 2022-08-19 16:04:33 +12:00
fogelito c21b563614 Merge branch 'refactor-permissions-inc-console-fix' of github.com:appwrite/appwrite into datetime-jake-tz
 Conflicts:
	app/controllers/general.php
	composer.json
	composer.lock
2022-08-17 21:04:23 +03:00
Bradley Schofield 80ff661aeb Continue working on response filters 2022-08-17 14:08:09 +01:00
Jake Barnby bbf7f8d8c3 Merge remote-tracking branch 'origin/origin/datetime-attributes' into refactor-permissions-inc-console-fix
# Conflicts:
#	app/controllers/api/databases.php
#	app/controllers/api/storage.php
#	src/Appwrite/Extend/Exception.php
2022-08-16 20:30:00 +12:00
Jake Barnby fb34ecfa7d Merge remote-tracking branch 'origin/0.16.x' into datetime-attributes-merge
# Conflicts:
#	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
2022-08-16 19:20:26 +12:00
fogelito 9b85a89e71 Projects tests 2022-08-15 20:37:26 +03:00
Bradley Schofield e1cc6bc624 Start work on response filters for 0.16 2022-08-15 16:09:09 +01:00
Jake Barnby 33970276b2 Self review 2022-08-15 19:20:10 +12:00
Jake Barnby 9c260164ef Merge remote-tracking branch 'origin/feat-datetime-attributes-with-database-query-update' into refactor-permissions-inc-queries-update-datetime-fixes
# Conflicts:
#	app/controllers/api/databases.php
#	app/controllers/api/storage.php
#	app/controllers/general.php
#	app/controllers/shared/api.php
#	composer.json
#	composer.lock
2022-08-14 23:46:34 +12: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
Christy Jacob a5bc0a61ca feat: exceptions on more files 2022-08-14 12:26:12 +05:30
Steven 610ec1a6a4 Update database query syntax 2022-08-14 05:44:55 +00: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