loks0n
efe05cd292
Merge branch 'main' of https://github.com/appwrite/appwrite into feat-ssr
2023-11-01 11:03:21 +00:00
Christy Jacob
281b50ba4a
Merge pull request #7063 from appwrite/1.4.x
...
1.4.x
2023-11-01 12:32:11 +04:00
Steven Nguyen
755699de8a
Bump appwrite version to 1.4.9
2023-10-31 12:40:45 -07: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
loks0n
af0d689aff
feat: sessions
scope
2023-10-31 15:05:02 +00:00
loks0n
4559cf77e9
Merge branch 'main' of https://github.com/appwrite/appwrite into feat-ssr
2023-10-31 12:08:48 +00: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
Steven Nguyen
c1df289df7
Bump appwrite version to 1.4.8
2023-10-27 10:31:43 -07:00
Steven Nguyen
3abb74c937
Bump console to version 3.2.5
2023-10-27 09:33:21 -07: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
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
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
cba20d8b96
Addressed PR comments
2023-10-27 19:38:33 +05:30
loks0n
169e57d12d
Merge branches 'feat-ssr' and 'main' of https://github.com/appwrite/appwrite into feat-ssr
2023-10-27 14:36:08 +01:00
Khushboo Verma
36fcc6c293
Resolve merge conflicts
2023-10-27 18:13:50 +05:30
Christy Jacob
3700751592
Merge pull request #7016 from appwrite/main
...
Sync 1.4.x with main
2023-10-27 13:35:54 +04: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
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
Steven Nguyen
70a3820009
Remove unused mail vars
2023-10-26 16:23:58 -07:00
loks0n
91825afaf9
chore: refactor public scope
2023-10-26 15:23:38 +01:00
loks0n
2743ac6934
feat: public scope for api key
2023-10-26 15:07:51 +01:00
loks0n
49425fb8fc
test: fix
2023-10-26 15:04:47 +01:00
Jake Barnby
89236955fb
Fix setting metadata
2023-10-26 22:28:23 +13:00
loks0n
406f772632
Merge branch 'main' of https://github.com/appwrite/appwrite into feat-ssr
2023-10-26 09:53:47 +01:00
Jake Barnby
995c404f35
Update db
2023-10-26 21:24:30 +13:00
Torsten Dittmann
404ad8653d
fix: worker permissions reset
2023-10-25 19:23:55 +02:00
loks0n
b833f29d56
chore: fmt
2023-10-25 14:29:27 +01:00
loks0n
b4773a7fbd
Merge branch 'main' of https://github.com/appwrite/appwrite into feat-ssr
2023-10-25 13:20:42 +01:00
loks0n
3a9202a46b
chore: christy feedback
2023-10-25 13:20:29 +01:00
Torsten Dittmann
f9a3ae1421
chore: bump console version
2023-10-25 13:35:14 +02:00
Khushboo Verma
17de0d1ea7
Updated the error code for unsupported protocol
2023-10-25 15:55:46 +05:30
Jake Barnby
5732171a2a
Merge remote-tracking branch 'origin/1.4.x' into feat-query-metadata
...
# Conflicts:
# app/init.php
# composer.json
# composer.lock
2023-10-25 18:21:16 +13:00
Torsten Dittmann
fbcbd0d430
feat: realtime error handling
2023-10-24 14:32:22 +02:00
Steven Nguyen
3addf76a2a
Bump appwrite version to 1.4.7
2023-10-23 13:36:29 -07:00
loks0n
a67ca55af5
fix: use queueForEvents in users
2023-10-23 11:32:09 +01:00
Khushboo Verma
2cf8639b68
Resolve merge conflicts
2023-10-23 15:06:01 +05:30
Khushboo Verma
97c1099961
Refactor code and add more assertions
2023-10-23 15:03:24 +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
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