Khushboo Verma
|
7b4f334f31
|
Update error message
|
2024-02-02 19:30:54 +05:30 |
|
Khushboo Verma
|
1f0dc6cc1e
|
Update swoole version
|
2024-02-02 12:50:27 +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 |
|
Jake Barnby
|
e4194c690f
|
Merge remote-tracking branch 'origin/1.5.x' into feat-smtp-provider
# Conflicts:
# composer.lock
|
2024-02-01 01:50:36 +13:00 |
|
Jake Barnby
|
d9f53cacfa
|
Add SMTP provider
|
2024-02-01 01:30:09 +13:00 |
|
Jake Barnby
|
f0a14a441e
|
Add back csv lib
|
2024-01-30 19:15:11 +13:00 |
|
Jake Barnby
|
1be0997db5
|
Update composer platform
|
2024-01-30 19:11:42 +13: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 |
|
fogelito
|
accf75156c
|
Remove "league/csv": "9.7.1"
|
2024-01-29 09:24:44 +02:00 |
|
fogelito
|
9c8c017618
|
Merge branch '1.5.x' of github.com:appwrite/appwrite into feat-php-8-1
Conflicts:
app/controllers/api/databases.php
app/controllers/api/projects.php
app/controllers/api/users.php
composer.json
composer.lock
|
2024-01-29 08:50:53 +02:00 |
|
fogelito
|
41421ba178
|
Fix Domains not found
|
2024-01-25 17:49:50 +02: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 |
|
Torsten Dittmann
|
9070dce6ac
|
Merge branch 'main' of https://github.com/appwrite/appwrite into 1.5.x
|
2024-01-24 16:32:12 +01:00 |
|
Torsten Dittmann
|
9f5a0312cf
|
Merge branch 'main' of https://github.com/appwrite/appwrite into 1.5.x
|
2024-01-24 11:24:59 +01:00 |
|
fogelito
|
55c72521e9
|
Upgrade base:0.7.2
|
2024-01-24 10:37:28 +02:00 |
|
fogelito
|
e8a390bff6
|
DSN changes check
|
2024-01-23 13:07:08 +02:00 |
|
Torsten Dittmann
|
185e4258df
|
Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mfa
|
2024-01-22 14:45:07 +01:00 |
|
fogelito
|
a614152d78
|
Merge branch '1.5.x' of github.com:appwrite/appwrite into feat-php-8-1
Conflicts:
composer.lock
|
2024-01-22 13:05:42 +02:00 |
|
Jake Barnby
|
8d6915aef5
|
Update libs
|
2024-01-19 23:06:11 +13:00 |
|
Torsten Dittmann
|
e2a0c2d825
|
sync: with 1.5.x
|
2024-01-12 14:04:31 +01:00 |
|
Khushboo Verma
|
f6830f4e85
|
Resolve merge conflict
|
2024-01-10 19:38:55 +05:30 |
|
Khushboo Verma
|
b74c7671e8
|
Resolve merge conflicts
|
2024-01-10 13:13:09 +05:30 |
|
Matej Bačo
|
e59bdbbb8f
|
Implement translation generator
|
2024-01-09 14:44:58 +00:00 |
|
Jake Barnby
|
28c75bda1b
|
Merge remote-tracking branch 'origin/1.5.x' into feat-php-8-1
|
2024-01-09 16:56:14 +13:00 |
|
Steven Nguyen
|
a7048255e8
|
Fix utopia-php/framework version
The framework version needs to be 0.33.0 as a new param was added to Template->setParam()
that is used across Appwrite.
|
2024-01-09 01:36:07 +00:00 |
|
Jake Barnby
|
baf807d389
|
Merge remote-tracking branch 'origin/1.5.x' into json-parsing
# Conflicts:
# composer.lock
|
2024-01-09 14:08:39 +13:00 |
|
shimon
|
472712dbb7
|
update utopia-framework version
|
2024-01-08 19:30:27 +02:00 |
|
shimon
|
deb189f44b
|
sync with main
and bump utopia-cache lib version
|
2024-01-08 19:16:47 +02:00 |
|
Torsten Dittmann
|
9ba2eafa83
|
fix: escape html in email params (#7409)
* fix: escape html in email params
* revert: phpunit stop on failure
* chore: fix linter
|
2024-01-08 18:08:17 +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 |
|
Khushboo Verma
|
431e26c153
|
Allow certain domains to skip validation
|
2024-01-04 16:37:15 +05:30 |
|
shimon
|
99f1543f1b
|
Merge branch 'main' of github.com:appwrite/appwrite into refactor-usage-sn
Conflicts:
.gitmodules
Dockerfile
app/console
app/init.php
composer.lock
src/Appwrite/Platform/Services/Workers.php
src/Appwrite/Platform/Tasks/Hamster.php
|
2024-01-02 11:49:23 +02:00 |
|
Khushboo Verma
|
d418a581b7
|
Allow only public domains in webhook url
|
2023-12-28 15:16:08 +05:30 |
|
Jake Barnby
|
8fc3f99a8e
|
Update messaging lib
|
2023-12-15 19:55:50 +13: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 |
|
Jake Barnby
|
7b99fab512
|
Use targets for cc/bcc
|
2023-12-15 03:19:24 +13:00 |
|
Jake Barnby
|
2eace5a627
|
Merge remote-tracking branch 'origin/1.5.x' into messaging-uniform-logic
# Conflicts:
# app/controllers/api/messaging.php
# composer.lock
|
2023-12-15 02:47:59 +13:00 |
|
fogelito
|
57624ac65e
|
composer updated
|
2023-12-14 14:42:38 +02:00 |
|
Christy Jacob
|
f5c2c8d8f7
|
chore: reset old cookie
|
2023-12-08 20:23:04 +01:00 |
|
fogelito
|
21b6b199a9
|
composer parsing-nested
|
2023-12-06 14:56:31 +01:00 |
|
Prateek Banga
|
e7dca6b2d5
|
adds uniform logic for worker and extra params for email
|
2023-12-05 15:01:32 +01:00 |
|
shimon
|
c313e8347f
|
Merge branch '1.4.x' of github.com:appwrite/appwrite into refactor-usage-sn
Conflicts:
composer.lock
|
2023-11-30 10:21:59 +02:00 |
|
shimon
|
5daae1db14
|
tests fix
|
2023-11-30 10:20:14 +02:00 |
|
shimon
|
21895e3ac0
|
Merge branch '1.4.x' of github.com:appwrite/appwrite into refactor-usage-sn
Conflicts:
.gitmodules
CHANGES.md
Dockerfile
app/controllers/api/storage.php
app/init.php
composer.lock
src/Appwrite/Migration/Migration.php
src/Appwrite/Platform/Services/Tasks.php
src/Appwrite/Usage/Calculators/TimeSeries.php
|
2023-11-26 10:28:17 +02:00 |
|
Jake Barnby
|
6ad4566b6b
|
Update CLI
|
2023-11-21 00:15:50 +13:00 |
|
Jake Barnby
|
535db05b9b
|
Merge remote-tracking branch 'origin/main' into feat-php-8-1
# Conflicts:
# app/console
# composer.lock
|
2023-11-14 14:06:43 +13:00 |
|
Jake Barnby
|
17919ecfbe
|
Update database
|
2023-11-10 12:11:21 +13: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 |
|
Eldad Fux
|
d91f961c90
|
Fixed errors
|
2023-11-01 23:09:04 -04:00 |
|
Jake Barnby
|
3652ab61d8
|
Revert "Enum tests"
This reverts commit 74450b1178 .
|
2023-11-01 21:02:42 +13:00 |
|