1
0
Fork 0
mirror of synced 2024-09-09 22:27:06 +12:00
Commit graph

10160 commits

Author SHA1 Message Date
shimon
2ef8490691 fix mod condition 2023-10-23 11:22:28 +03:00
loks0n
1343d4851a Merge branch 'main' of https://github.com/appwrite/appwrite into feat-ssr 2023-10-23 09:10:57 +01:00
shimon
b09a254d3c fix mod condition 2023-10-23 10:46:15 +03:00
shimon
a841734d50 fix mod condition 2023-10-23 01:05:10 +03:00
shimon
ac231914d4 fix mod condition 2023-10-23 00:55:57 +03:00
shimon
0d5127d90b fix mod condition 2023-10-23 00:08:55 +03:00
德华 刘
00d2a5ffcd chore: update create projects endpoints 2023-10-22 18:33:15 +00:00
德华 刘
79612bd80f Merge branch 'main' of https://github.com/appwrite/appwrite into feat-sm-db 2023-10-22 18:30:14 +00:00
Christy Jacob
21b9716bb2
Merge pull request #6959 from appwrite/chore-update-backup-timings
chore: update backup timings
2023-10-19 20:40:43 +04:00
德华 刘
de8b9638d5 chore: update backup timings 2023-10-19 16:07:54 +00:00
shimon
8048766d28 queues fixes 2023-10-19 18:28:01 +03:00
Matej Bačo
20c37db8fc Upgrade executor 2023-10-19 11:54:56 +02:00
Christy Jacob
01e842782f
Merge branch '1.4.x' into feat-1.4.6-release-prep 2023-10-19 05:28:02 -04:00
Christy Jacob
4b08729131
Update app/init.php 2023-10-19 05:27:52 -04:00
Christy Jacob
18dc8749d5 chore: update health API 2023-10-19 09:25:38 +00:00
Christy Jacob
a46b3d088c
Merge branch '1.4.x' into feat-api-db-timeout 2023-10-19 05:15:44 -04:00
Jake Barnby
03b6d65669
Add timeout on vcs project DBs 2023-10-19 17:21:11 +13: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
b17e24f645
Use const for timeout 2023-10-19 15:45:32 +13:00
Jake Barnby
389d367fca
Set hard timeouts for API dbs 2023-10-19 15:32:45 +13:00
Jake Barnby
db3fa21468
Update database 2023-10-19 14:26:44 +13:00
Steven Nguyen
6d040beb36
Update specs for 1.4.6
$ diff old.json new.json
4c4
<     "version": "1.4.5",
---
>     "version": "1.4.6",
8132c8132
<     "/health/queue/databases": {
---
>     "/health/queue/databases/{databaseId}": {
8164c8164,8175
<         "security": [{ "Project": [], "Key": [] }]
---
>         "security": [{ "Project": [], "Key": [] }],
>         "parameters": [
>           {
>             "name": "databaseId",
>             "description": "Database for which to check the queue size",
>             "required": false,
>             "type": "string",
>             "x-example": "[DATABASE_ID]",
>             "default": "database_db_main",
>             "in": "path"
>           }
>         ]
2023-10-18 17:42:27 -07:00
Steven Nguyen
1d7c9d84d2
Fix get database queue endpoint params
A path param cannot be optional so change it to a query param.
2023-10-18 17:42:27 -07:00
Steven Nguyen
435b20df77
Bump appwrite version to 1.4.6 2023-10-18 16:07:47 -07:00
Steven Nguyen
9bc6b124c0
Bump console to version 3.2.3 2023-10-18 15:51:13 -07:00
Christy Jacob
67541d4a1d chore: review comments 2023-10-18 21:35:15 +00:00
Christy Jacob
20985c7ee4
Merge pull request #6946 from appwrite/remove-resque
chore: remove resque library and update health check endpoints
2023-10-18 16:59:44 -04:00
Christy Jacob
be5ed9b282
Merge pull request #6934 from appwrite/feat-delegate-deletes
Delegate custom deletes
2023-10-18 16:13:08 -04:00
Christy Jacob
3d7cd91176 chore: fix injections 2023-10-18 19:54:56 +00:00
Christy Jacob
be26e4b729 chore: remove resque library and update health check endpoints 2023-10-18 19:44:06 +00:00
Christy Jacob
f822f86517
Merge branch '1.4.x' into refactor-workers-sn 2023-10-18 15:26:45 -04:00
Christy Jacob
74e3f3f7d2 fix: remove unused variable 2023-10-18 19:08:21 +00:00
Christy Jacob
133cb62b4e fix: update injection name 2023-10-18 19:07:17 +00:00
Christy Jacob
4724d729fb Merge branch 'refactor-workers-sn' of https://github.com/appwrite/appwrite into feat-delegate-deletes 2023-10-18 18:59:51 +00:00
Christy Jacob
066dd6393d Merge branch 'refactor-workers-sn' of https://github.com/appwrite/appwrite into feat-delegate-deletes 2023-10-18 18:57:16 +00:00
Christy Jacob
72d0865ad8 chore: use deletes worker for deleting audit logs 2023-10-18 18:54:20 +00:00
Christy Jacob
699ac7f7f5 fix: review comments 2023-10-18 20:53:11 +04:00
Christy Jacob
050cb28d4f fix: incorrect events 2023-10-18 20:30:47 +04:00
Khushboo Verma
979054e5ca Merge branch 'main' into refactor-vcs-tests 2023-10-18 13:25:40 +05:30
Khushboo Verma
2914a4d1c5 Add test for createRepo endpoint 2023-10-18 13:24:32 +05:30
Jake Barnby
bb0744842d
Set metadata for all database instantiations 2023-10-18 16:21:10 +13:00
Christy Jacob
33ec5b3d7b chore: re-order tests 2023-10-18 02:36:50 +04:00
Christy Jacob
39820b5a0f chore: update docker compose config 2023-10-18 01:56:54 +04:00
shimon
593e5ab316 some fixes 2023-10-17 22:08:01 +03:00
shimon
1036cb406d some fixes 2023-10-17 21:32:38 +03:00
shimon
3d5930c104 some fixes 2023-10-17 16:55:08 +03:00
Christy Jacob
022952e2ee chore: revert console 2023-10-17 08:36:41 +00:00
Christy Jacob
20468782e5 chore: revert console 2023-10-17 08:35:22 +00:00
Jake Barnby
64d582a43a
Update for package changes 2023-10-17 21:31:00 +13:00
Matej Bačo
97ea29bba2 Add dart 3.1 support 2023-10-17 10:18:29 +02:00
shimon
55dfb0b034 Merge remote-tracking branch 'origin/refactor-workers-sn' into refactor-workers-sn 2023-10-17 06:44:53 +03:00
shimon
9a6d88a819 addressing some comments 2023-10-17 06:44:36 +03:00
Jake Barnby
dbfe5e45aa
Delegate custom deletes 2023-10-17 12:18:51 +13:00
Shimon Newman
e565557eb2
Update app/worker.php
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2023-10-16 20:13:39 +03:00
shimon
a8f5886474 minor fix 2023-10-16 18:17:02 +03:00
shimon
e660a6f4a3 small fixes 2023-10-16 17:09:51 +03:00
shimon
2451d9fef1 Merge branch '1.4.x' of github.com:appwrite/appwrite into refactor-workers-sn
 Conflicts:
	src/Appwrite/Platform/Workers/Deletes.php
2023-10-16 17:06:59 +03:00
shimon
2fcda9fc11 Merge branch 'cl-1.4.x' of github.com:appwrite/appwrite into refactor-workers-sn 2023-10-16 17:03:43 +03:00
shimon
0e2c1c1f2d small fixes 2023-10-16 16:20:41 +03:00
loks0n
dfeb49951b Merge branch 'main' of https://github.com/appwrite/appwrite into feat-ssr 2023-10-16 10:26:51 +01:00
shimon
0c776e0a44 comparing $workersCount via worker.php vs init php 2023-10-16 11:04:44 +03:00
shimon
94178f8eaf rollback to Usage 2023-10-15 20:41:09 +03:00
Steven Nguyen
5956c4c247
Merge branch 'main' into fix-unique-in-errors 2023-10-13 12:03:23 -07:00
loks0n
250e9ae9f7 chore: cleanup pr 2023-10-13 16:10:55 +01:00
Torsten Dittmann
7bae8ac374 revert: console change 2023-10-13 16:10:27 +02:00
Torsten Dittmann
f5d0ebeb75 docs: fix broken links 2023-10-13 15:59:28 +02:00
Torsten Dittmann
3778939605 fix: relative links to absolute 2023-10-13 15:43:23 +02:00
Torsten Dittmann
8e12a07267 Merge branch 'main' of https://github.com/appwrite/appwrite into fix-specs 2023-10-13 15:42:09 +02:00
Khushboo Verma
f18d33a0d6 Resolved merge conflicts 2023-10-13 18:54:14 +05:30
Khushboo Verma
66ec7f2e1d VCS tests 2023-10-13 18:50:58 +05:30
Torsten Dittmann
ce0024d97a
Merge pull request #5290 from DH-555/patch-4
Fix: spanish translations (emails)
2023-10-13 13:36:28 +02:00
Torsten Dittmann
ecd073fb02
Merge pull request #6898 from appwrite/fix-6879-fix-project-delete
Update teamInternalId when updating project team
2023-10-13 13:35:47 +02:00
loks0n
63d3a2bc73 chore: revert abuse-key changes 2023-10-13 11:08:25 +01:00
loks0n
07286e5864 Merge branch 'main' of https://github.com/appwrite/appwrite into feat-ssr 2023-10-13 11:05:22 +01:00
loks0n
81c4a9bbd5 chore: fmt 2023-10-13 11:05:14 +01:00
Steven Nguyen
3f2f6ab43a
Ensure permissions are updated when a project moves orgs
Since the following collections also have permissions set to the team,
the team should be updated for consistency:

- installations
- repositories
- vcsComments
2023-10-12 17:34:53 -07:00
Steven Nguyen
3bb22c38cc
Update teamInternalId when updating project team
This is important because when an organization is deleted, projects are
fetched by the teamInternalId and if the teamInternalId is not updated
when the project team is updated, the project will be deleted if the
previous organization is deleted.
2023-10-12 17:03:45 -07:00
Steven Nguyen
2d2af20547 Fix realtime deletes
The realtime collection only exists in the console project so iterating
over every project leads to the not found error.

In addition, the deleteForProjectIds() doesn't include the console
project so the realtime records were not being cleaned up properly.
2023-10-12 22:49:55 +00:00
Khushboo Verma
bb75036efe WIP: Mocked GitHub installation 2023-10-13 01:45:27 +05:30
loks0n
8ab429b92f feat: replace session confirmation endpoints 2023-10-12 14:38:32 +01:00
shimon
66c57c9a4f Merge remote-tracking branch 'origin/refactor-workers' into refactor-workers 2023-10-12 16:34:31 +03:00
shimon
4088941f70 sync with main 2023-10-12 16:34:13 +03:00
Jake Barnby
48bc369149
Hardcode default queue for db worker only 2023-10-12 21:32:33 +13:00
Jake Barnby
204912cb98
Update compose phtml 2023-10-12 20:59:40 +13:00
Jake Barnby
dc580c3d0d
Change name 2023-10-12 20:15:16 +13:00
Jake Barnby
e2a8369712
Add docblock for env vars 2023-10-12 19:11:08 +13:00
Jake Barnby
effdeb4bc2
Fix env vars 2023-10-12 19:10:45 +13:00
Jake Barnby
1ac3372239
Set queue name per worker 2023-10-12 17:55:30 +13:00
Jake Barnby
096a529618
Revert "Merge branch 'feat-db-per-process' of github.com:appwrite/appwrite into feat-db-per-process"
This reverts commit 6f42305484, reversing
changes made to 69abd222e8.
2023-10-12 15:30:01 +13:00
Jake Barnby
6f42305484
Merge branch 'feat-db-per-process' of github.com:appwrite/appwrite into feat-db-per-process
# Conflicts:
#	bin/worker-databases
#	src/Appwrite/Event/Database.php
#	src/Appwrite/Platform/Workers/Databases.php
2023-10-12 15:28:52 +13:00
Vincent (Wen Yu) Ge
291654bee9 Rename ID -> Keys for attribute and index for consistency 2023-10-11 19:29:04 +00:00
loks0n
b299ed056e chore: rename $sessionSecret 2023-10-11 17:07:02 +01:00
loks0n
f9d6ebd3a0 docs: add descriptions to universal token endpoints 2023-10-11 16:31:32 +01:00
shimon
2cd4514086 sync with main 2023-10-11 16:03:15 +03:00
Torsten Dittmann
92adaee1cb chore: upgrade console to 3.2.2 on cloud 2023-10-11 14:57:11 +02:00
loks0n
e41fab769f fix: edge cases 2023-10-11 13:20:25 +01: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
Jake Barnby
d238d79e29
Allow multiprocess for db queue 2023-10-11 21:28:29 +13:00