CodeMirror/appwrite
1
0
Fork 0
mirror of synced 2024-09-15 00:48:25 +12:00
Code Issues Projects Releases Wiki Activity
21009 commits 235 branches 424 tags 340 MiB
Commit graph

527 commits

Author SHA1 Message Date
Torsten Dittmann
32b34793e0 fix: formatter 2024-03-05 11:34:04 +01:00
Torsten Dittmann
4cac7f5edd fix: merge conflicts 2024-03-05 11:31:15 +01:00
Torsten Dittmann
a53e630536 Merge branch 'main' of https://github.com/appwrite/appwrite into sync-main-1.5.x-2 2024-03-05 10:31:51 +01:00
Jake Barnby
74a3d6531f
Merge remote-tracking branch 'origin/refactor-usage-sn' into feat-isolation-modes 
# Conflicts:
#	composer.json
#	composer.lock
#	src/Appwrite/Platform/Tasks/CalcTierStats.php
#	tests/e2e/Services/Projects/ProjectsConsoleClientTest.php
 2024-03-04 19:50:10 +01:00
Eldad Fux
b78725e650 Hide error messages from HTML templates 2024-02-24 19:12:27 +01:00
Eldad Fux
e7a847a417 Fixed ID class namespace 2024-02-24 19:01:00 +01:00
Christy Jacob
c04f54da64
Revert "Revert "Fix: Router CURL"" 2024-02-22 15:10:18 +05:30
Christy Jacob
d2787c8555
Revert "Fix: Router CURL" 2024-02-22 12:26:01 +05:30
Matej Bačo
b03783c588 Fix bigs until works 2024-02-21 18:14:24 +01:00
Matej Bačo
6567cff5dc Fix missing todo 2024-02-21 17:03:48 +00:00
Matej Bačo
0dd2889de5 Fix double router curl 2024-02-21 14:51:21 +00:00
Torsten Dittmann
de0e83f703 fix: move user and project logic from general to api hook 2024-02-16 17:58:51 +00:00
Torsten Dittmann
5193a97ddb fix: move user logic from general to api hook 2024-02-16 16:26:50 +00:00
Torsten Dittmann
4748dedd29 fix: blocked users from accessing console 2024-02-16 14:58:38 +00:00
Jake Barnby
66e51c0f18
Merge remote-tracking branch 'origin/1.5.x' into 1.5.x-response-request-models 
# Conflicts:
#	src/Appwrite/Platform/Workers/Usage.php
#	src/Appwrite/Platform/Workers/UsageHook.php
 2024-02-13 15:07:16 +13:00
Jake Barnby
18f7168160
Merge main 2024-02-12 14:18:19 +13:00
Bradley Schofield
559fa924c0 Merge branch '1.5.x' into 1.5.x-response-request-models 2024-02-06 17:10:43 +00:00
shimon
a63977455f Merge branch '1.5.x' of github.com:appwrite/appwrite into 1.5.x-response-request-models 
 Conflicts:
	.gitmodules
 2024-02-04 09:27:08 +02:00
Khushboo Verma
7b4f334f31 Update error message 2024-02-02 19:30:54 +05:30
Matej Bačo
4115537f72 Fix client error reporting 2024-02-02 14:33:52 +01:00
Khushboo Verma
d3b002a48e Merge branch '1.5.x' into feat-block-countries 2024-02-01 17:49:14 +05:30
Torsten Dittmann
ceb868c9d7 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mfa 2024-02-01 11:57:32 +01:00
shimon
f477be7521 Merge branch '1.5.x' of github.com:appwrite/appwrite into 1.5.x-response-request-models 
 Conflicts:
	composer.json
 2024-01-31 20:28:03 +02:00
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
Torsten Dittmann
3f688a2aa7 fix: remove some leftovers 2024-01-30 16:09:58 +01:00
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
Matej Bačo
c0ae2e6549 PR review changes for exception publishing 2024-01-26 12:07:08 +00: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
Matej Bačo
5bd106afaf Implement better cname validation logging 2024-01-23 15:40:32 +00:00
fogelito
8dd387cfbe Parsing and Throw Error 2024-01-23 17:14:14 +02:00
Bradley Schofield
18f3f35cad Merge branch '1.5.x' into 1.5.x-response-request-models 2024-01-19 13:29:04 +00:00
Torsten Dittmann
057496dbaa feat: mfa users endpoints 2024-01-18 14:56:58 +01:00
Torsten Dittmann
1ab3dc2236 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mfa 2024-01-18 13:10:15 +01:00
Bradley Schofield
198f68b807 Implement Response and Request filters as well as migrations 2024-01-16 11:10:07 +00:00
Torsten Dittmann
99259ebf2b fix: enable mfa in console 2024-01-11 20:24:37 +01:00
Torsten Dittmann
7c66481406 fix: collections for mfa 2024-01-08 13:22:33 +01:00
Torsten Dittmann
208abe17e7 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mfa 2024-01-08 12:20:08 +01: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
Torsten Dittmann
83c411e5fd fix: some fixes 2023-12-07 10:05:37 +01:00
Jake Barnby
632c902e1c
Remove debug trace 2023-11-28 01:53:24 +13:00
Jake Barnby
2c71de1d1b
Merge remote-tracking branch 'origin/1.4.x' into feat-isolation-modes 
# Conflicts:
#	composer.lock
 2023-11-28 00:57:17 +13:00
Jake Barnby
82dfe5ddee
Add tests 2023-11-28 00:30:02 +13:00
Jake Barnby
7b8e37b03d
Update method names 2023-11-27 15:22:05 +13: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
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