Khushboo Verma
d3b002a48e
Merge branch '1.5.x' into feat-block-countries
2024-02-01 17:49:14 +05:30
Khushboo Verma
dadb94c499
Merge branch '1.5.x' into feat-block-countries
2024-01-31 12:24:21 +05:30
Khushboo Verma
1d2eadf7e0
Allow 451 error publicly
2024-01-31 12:23:45 +05:30
Jake Barnby
ab0fae216d
Merge remote-tracking branch 'origin/1.5.x' into feat-php-8-1
...
# Conflicts:
# composer.lock
2024-01-30 18:44:16 +13: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
fogelito
55c72521e9
Upgrade base:0.7.2
2024-01-24 10:37:28 +02:00
fogelito
8dd387cfbe
Parsing and Throw Error
2024-01-23 17:14:14 +02:00
Jake Barnby
121521d7c5
Merge remote-tracking branch 'origin/1.5.x' into json-parsing
...
# Conflicts:
# composer.lock
# src/Appwrite/Platform/Tasks/DeleteOrphanedProjects.php
# src/Appwrite/Platform/Tasks/Hamster.php
2023-12-15 18:22:08 +13:00
fogelito
cc5ae73f57
purgeCached changes
2023-12-14 15:32:06 +02:00
Luke B. Silver
60a0fefe56
Merge branch '1.4.x' into feat-ssr
2023-12-13 10:32:13 +00:00
德华 刘
f334168f90
fix: remove expired cookie
2023-12-13 08:45:47 +00:00
loks0n
fe0001350d
feat: use x-appwrite-session header
2023-12-12 15:39:24 +00:00
Christy Jacob
8b5783d3ff
fix: update setParam
2023-12-08 21:02:07 +01:00
Christy Jacob
9dca3c4300
fix: linter
2023-12-08 20:38:55 +01:00
Christy Jacob
f5c2c8d8f7
chore: reset old cookie
2023-12-08 20:23:04 +01:00
Khushboo Verma
695d6f4065
Renamed variables
2023-11-18 00:04:57 +05:30
Khushboo Verma
7902defe69
Addressed PR comments
2023-11-17 19:29:57 +05:30
Khushboo Verma
cf1c914edb
Update app/controllers/general.php
...
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2023-11-17 18:36:03 +05:30
Khushboo Verma
9329287982
Update app/controllers/general.php
...
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2023-11-17 18:35:51 +05:30
Khushboo Verma
40ec98569e
Update app/controllers/general.php
...
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2023-11-17 18:35:26 +05:30
Khushboo Verma
c34dc4dae0
Add flag to send logs to logger
2023-11-16 23:51:09 +05:30
Steven Nguyen
7c8a9ad4d2
Fix incorrect general_protocol_unsupported error
...
$requestHeaders was being referenced before it was set. This PR reverts
code back to using $swooleRequest to extract the header.
2023-10-31 18:31:36 +00:00
Matej Bačo
9a6d5f8101
Improve var name
2023-10-27 17:25:19 +02:00
Matej Bačo
71807635b3
Move cookie-header logic to request
2023-10-27 17:23:43 +02:00
Matej Bačo
740d9def8e
Linter fix
2023-10-27 10:33:08 +02:00
Matej Bačo
94ff3baa9c
Fix cookie headers
2023-10-27 10:26:46 +02:00
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