loks0n
8b24c44fb9
fix: proxy create rule 500
2023-11-06 14:44:00 +00:00
shimon
f64d0ab8a8
Merge branch '1.4.x' of github.com:appwrite/appwrite into refactor-usage-sn
...
Conflicts:
.gitmodules
CHANGES.md
Dockerfile
composer.lock
src/Appwrite/Migration/Migration.php
2023-11-05 17:03:13 +02:00
Steven Nguyen
9f7bbe4869
Fix the Health service's get X queue endpoints
...
Before this, the endpoints called $client->sumProcessingJobs() which
only gets the currently processing jobs, but this endpoint should return
what's currently in queue, pending to be processed. This should be
retrieved using $client->getQueueSize().
2023-11-03 16:57:30 +00:00
Christy Jacob
9fc7c1384a
Merge pull request #7071 from appwrite/fix-swoole-warning
...
feat: fix swoole warning
2023-11-03 19:46:59 +04:00
loks0n
305c781206
feat: fix swoole warning
2023-11-03 12:18:24 +00:00
Bradley Schofield
e158d134b0
Merge branch 'main' into feat-improve-migration-validations
2023-11-02 10:48:38 +00:00
shimon
1c1028412a
refactor users, project, functions usage display
2023-11-01 20:44:06 +02:00
shimon
04290730b2
refactor storage, databases usage display
2023-11-01 17:20:12 +02:00
Christy Jacob
9fded16d3f
Merge pull request #7053 from appwrite/1.4.x
...
Sync main with 1.4.x
2023-10-31 12:27:08 +04:00
德华 刘
744f2fbc1c
chore: update project creation database allocation
2023-10-30 14:46:54 +00:00
Christy Jacob
e17bb94e39
Merge pull request #6495 from appwrite/fix-mails
...
Fix certificate emails and add support for variables in email template subject
2023-10-27 19:17:50 +04:00
Khushboo Verma
cba20d8b96
Addressed PR comments
2023-10-27 19:38:33 +05:30
Steven Nguyen
836ce852ed
Refactor email templates
...
Update the mails worker to only be responsible for building the final
email using the base (layout) template and the user, team, project, and
redirect variables.
It is the responsibility of the controller to perform localization and
determine whether a custom or default email template should be used.
If the default one is used, it has to be rendered using the hello,
footer, thanks, and signature variables so that it matches the custom
template. Then, it can be sent to the worker.
2023-10-26 16:47:14 -07:00
Steven Nguyen
3206cee36f
Leave user placeholder in default email template
...
This matches up with the default template and gives the developer an
idea about the available variables and how to use them.
2023-10-26 16:23:58 -07:00
Steven Nguyen
70a3820009
Remove unused mail vars
2023-10-26 16:23:58 -07:00
shimon
4c6976488c
clean up
2023-10-25 15:06:54 +03:00
shimon
b775c53666
clean up
2023-10-25 13:16:25 +03:00
shimon
c11b3ff522
workers start hook
2023-10-25 12:46:45 +03:00
shimon
b7675df9b9
usage workers
2023-10-25 11:38:44 +03:00
shimon
9fad9dca88
usage sync
2023-10-25 10:39:59 +03:00
Khushboo Verma
2cf8639b68
Resolve merge conflicts
2023-10-23 15:06:01 +05:30
德华 刘
3dee8d6ecd
fix: update incorrect method call
2023-10-23 08:34:57 +00:00
Shimon Newman
808f682fa7
Update app/controllers/api/projects.php
...
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2023-10-23 11:25:31 +03:00
shimon
2ef8490691
fix mod condition
2023-10-23 11:22:28 +03: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
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
18dc8749d5
chore: update health API
2023-10-19 09:25:38 +00: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
db3fa21468
Update database
2023-10-19 14:26:44 +13: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
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
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
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
shimon
593e5ab316
some fixes
2023-10-17 22:08:01 +03:00
Jake Barnby
dbfe5e45aa
Delegate custom deletes
2023-10-17 12:18:51 +13: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
0e2c1c1f2d
small fixes
2023-10-16 16:20:41 +03:00
shimon
94178f8eaf
rollback to Usage
2023-10-15 20:41:09 +03:00
Yatharth Verma
96f389cee5
merge 1.4.x changes to my branch
2023-10-14 11:57:40 +05:30
Bradley Schofield
5274f1234b
Merge branch 'main' into feat-improve-migration-validations
2023-10-13 16:23:25 +01:00
Bradley Schofield
d4b53e5014
Run Linter
2023-10-13 16:23:20 +01:00
Torsten Dittmann
3778939605
fix: relative links to absolute
2023-10-13 15:43:23 +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
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
Khushboo Verma
bb75036efe
WIP: Mocked GitHub installation
2023-10-13 01:45:27 +05:30
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
002fc19d60
tests fix
2023-10-10 21:02:24 +03:00
shimon
e2989afda8
queueForBuilds fix via functions controller
2023-10-09 13:28:06 +03:00
shimon
24e09d3d8e
queueForBuilds fix via functions controller
2023-10-09 13:16:05 +03:00
shimon
31466c44d8
update projects database
2023-10-08 16:44:14 +03:00
Bradley Schofield
9cb1cf418c
Improve Error Handling and Add more Validation
2023-10-06 17:02:01 +01:00
shimon
948f36a023
sync with 1.4
2023-10-05 16:15:39 +03:00
Christy Jacob
32ba34cba5
chore: add database overrides
2023-10-05 05:58:52 +00:00
Christy Jacob
adbbb6dc20
chore: add database overrides
2023-10-05 05:53:49 +00:00
shimon
7f1507f810
sync with 1.4
2023-10-04 11:20:32 +03:00
shimon
e3668a4d06
sync with 1.4
2023-10-03 21:56:36 +03:00
shimon
429dabaaee
sync with 1.4
2023-10-03 19:50:48 +03:00
Christy Jacob
ff3c25d352
chore: update database
2023-10-02 22:23:35 +00:00
Christy Jacob
29ad61d461
chore: update database
2023-10-02 22:01:42 +00:00
Christy Jacob
b456c9df2c
chore: remove DB creates
2023-10-02 21:32:05 +00:00
shimon
2bb4d8fb89
sync with 1.4
2023-10-02 17:02:48 +03:00
shimon
75d8741eaa
sync against master
2023-10-01 21:30:52 +03:00
shimon
b02d51c794
migrations worker
2023-10-01 20:39:26 +03:00
Matej Bačo
1502bfef74
Increase timeout
2023-09-30 17:24:09 +02:00
Matej Bačo
78dd0ca439
Merge branch 'cl-1.4.x' into patch-sync-exec-timeout
2023-09-30 16:02:33 +02:00
Christy Jacob
43de260b33
Merge pull request #6366 from appwrite/1.4.x
...
Update cl-1.4.x
2023-09-30 10:02:15 -04:00
Matej Bačo
d9f2f1c37b
Introduce execution sync timeout
2023-09-30 11:54:54 +02:00
Steven Nguyen
9d47237da9
Merge branch '1.4.x' into fix-skip-non-ascii-chars-image
2023-09-29 11:07:31 -07:00
Bradley Schofield
1136dc9e64
Add Test and don't stop on special char
2023-09-29 16:27:59 +01:00
Bradley Schofield
615d61d962
Merge branch '1.4.x' into fix-skip-non-ascii-chars-image
2023-09-29 09:21:17 +01:00
Christy Jacob
a65c1c1ee5
chore: fix merge conflict
2023-09-28 22:22:44 +00:00
Christy Jacob
ac844d33ef
Merge branch '1.4.x' of https://github.com/appwrite/appwrite into cl-1.4.x
2023-09-27 23:25:48 +00:00
Christy Jacob
9fa93e0449
chore: review comments
2023-09-27 22:13:03 +00:00
Matej Bačo
e58bf7f695
Rename audits back to logs
2023-09-27 21:24:56 +00:00
Matej Bačo
5120152369
Add all worker health endpoints
2023-09-27 21:24:41 +00:00
Christy Jacob
50600d6f2a
Merge pull request #6343 from appwrite/master
...
Merge master into 1.4.x
2023-09-27 17:20:32 -04:00
shimon
dcf0107a79
sync with master
2023-09-27 20:10:21 +03: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
Vincent (Wen Yu) Ge
86f0e6008c
Merge branch 'master' into sentence-case
2023-09-27 11:11:58 -04:00
Steven Nguyen
4a0c77a8df
Update avatar font and default colors
2023-09-25 15:55:15 -07:00
Christy Jacob
2273cb50b4
Merge branch '1.4.x' of github.com:appwrite/appwrite into cl-1.4.x
2023-09-26 00:02:19 +04:00
Matej Bačo
c35f05f495
Increase max body size
2023-09-25 11:12:41 +02:00
Matej Bačo
725897c896
Rename audits back to logs
2023-09-24 14:36:20 +02:00
Matej Bačo
24204bce54
Add all worker health endpoints
2023-09-24 14:07:37 +02:00