Bradley Schofield
91c82f0d7d
Merge remote-tracking branch 'origin/cl-1.4.x' into feat-implement-migrations
2023-08-07 16:09:28 +01: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
Steven Nguyen
ee6e65ffbc
Style appwrite error page
2023-08-01 11:23:27 -07: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
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
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
Damodar Lohani
7419867078
new locale codes endpoint
2023-04-17 02:10:17 +00: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
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
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
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
fogelito
8ade726932
Changing Role + Permissions namespace
2022-12-14 18:04:06 +02: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