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
Christy Jacob
19e5235491
Merge pull request #7073 from appwrite/fix-health-queue-size
...
Fix the Health service's get X queue endpoints
2023-11-04 00:14:54 +04:00
Christy Jacob
bcdac2f803
Merge pull request #7074 from appwrite/fix-delete-schedules
...
Fix regression from worker refactor
2023-11-04 00:11:56 +04:00
Steven Nguyen
30b8ff9166
Add pagination to listByGroup to fix infinite loop problem
2023-11-03 17:47:52 +00:00
Steven Nguyen
03da0380ea
Ensure schedules for deleted projects are deleted
2023-11-03 17:47:16 +00: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
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
Jake Barnby
3652ab61d8
Revert "Enum tests"
...
This reverts commit 74450b1178
.
2023-11-01 21:02:42 +13:00
Jake Barnby
74450b1178
Enum tests
2023-11-01 18:29:54 +13:00
Christy Jacob
7110836beb
Merge pull request #7061 from appwrite/feat-1.4.9-release-prep
...
Prepare 1.4.9 release
2023-10-31 23:59:11 +04:00
Steven Nguyen
358fdb6878
Add 1.4.9 to CHANGES.md
2023-10-31 12:43:52 -07:00
Steven Nguyen
755699de8a
Bump appwrite version to 1.4.9
2023-10-31 12:40:45 -07:00
Christy Jacob
311fc0f0c4
Merge pull request #7059 from appwrite/fix/function-domains-execution
...
Fix 400 error on function domain execution
2023-10-31 23:17:16 +04:00
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
Steven Nguyen
c4e22b1085
Fix warning when cookie is null
2023-10-31 18:25:35 +00:00
Christy Jacob
fbb82ceb81
Merge pull request #7028 from appwrite/feat-1.4.8-release-prep
...
Prepare 1.4.8 release
2023-10-27 23:32:00 +04:00
Steven Nguyen
4eab2a01f7
Add 1.4.8 to CHANGES.md
2023-10-27 10:31:43 -07:00
Steven Nguyen
c1df289df7
Bump appwrite version to 1.4.8
2023-10-27 10:31:43 -07:00
Christy Jacob
255659f009
Merge pull request #7027 from appwrite/chore-bump-console
...
Bump console to version 3.2.5
2023-10-27 21:01:29 +04:00
Steven Nguyen
c3b7b5af80
Fix inconsistent composer.lock
...
For some reason the composer.json had version 0.2.* of
utopia-php/messaging, but the composer.lock had 0.1.1.
2023-10-27 09:45:07 -07:00
Steven Nguyen
3abb74c937
Bump console to version 3.2.5
2023-10-27 09:33:21 -07:00
Christy Jacob
24824e1582
Merge pull request #7015 from appwrite/feat-delete-orphaned-projects
...
Feat delete orphaned projects
2023-10-27 20:21:52 +04:00
Christy Jacob
106f4cfc45
Merge pull request #6487 from appwrite/fix-unique-in-errors
...
Updated error message to not user magic strings
2023-10-27 20:13:16 +04:00
shimon
75484fa018
$collectionsConfig fix
2023-10-27 19:07:27 +03:00
shimon
917a4e9ab1
$collectionsConfig fix
2023-10-27 19:06:16 +03:00
Christy Jacob
bcdebee598
Merge pull request #7024 from appwrite/fix-cookie-header
...
Fix: Cookie Header
2023-10-27 19:36:05 +04: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
shimon
07ef5535ef
dry run
2023-10-27 18:23:41 +03: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
Christy Jacob
21220a2051
Merge pull request #6894 from appwrite/refactor-vcs-tests
...
Add VCS tests
2023-10-27 19:04:44 +04:00
德华 刘
6d237853e6
chore: revert console
2023-10-27 14:38:09 +00:00
Khushboo Verma
9164ed1045
Fixed linter errors
2023-10-27 19:43:07 +05:30
Khushboo Verma
30abfb01b7
Composer update
2023-10-27 19:40:24 +05:30
Khushboo Verma
cba20d8b96
Addressed PR comments
2023-10-27 19:38:33 +05:30
Matej Bačo
b2d385944a
Add function domain cookie test
2023-10-27 15:33:26 +02:00
Khushboo Verma
bb7278dd12
Merge branch 'refactor-vcs-tests' of github.com:appwrite/appwrite into refactor-vcs-tests
2023-10-27 18:14:47 +05:30
Khushboo Verma
36fcc6c293
Resolve merge conflicts
2023-10-27 18:13:50 +05:30
Matej Bačo
0a1a2af218
Connect VCS base to VCS test
2023-10-27 12:57:26 +02:00
Matej Bačo
84559b8f56
Improve cookie test
2023-10-27 12:01:37 +02:00
Christy Jacob
3700751592
Merge pull request #7016 from appwrite/main
...
Sync 1.4.x with main
2023-10-27 13:35:54 +04:00
德华 刘
2ee505b3f8
chore: update composer
2023-10-27 09:35:36 +00: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
Steven Nguyen
7c1ab91ebc
Add support for variables in email template subject
2023-10-26 16:58:31 -07:00
Steven Nguyen
fc4fa977a0
Update emails from certificate worker to match pattern of other emails
...
Since the certificate worker is sending a job to the mails worker just
like the controllers, it should prepare the email in the same way by
localizing and then sending the inner template for the mail worker to
apply the layout and final variables.
This commit also fixes a problem with a missing subject.
2023-10-26 16:56:44 -07:00
Jake Barnby
cb03ad1a15
Merge pull request #7003 from appwrite/feat-query-metadata
...
Feat query metadata
2023-10-27 12:52:34 +13:00
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