1
0
Fork 0
mirror of synced 2024-09-07 21:31:38 +12:00
Commit graph

784 commits

Author SHA1 Message Date
Jake Barnby
65c21a34c0
Update database 2024-03-10 12:50:51 +01:00
Jake Barnby
f166a1c201
Update db 2024-03-07 17:43:44 +01:00
Jake Barnby
7fc214afbe
Update libs 2024-03-05 11:55:29 +01:00
Jake Barnby
78e4c0611b
Update deps 2024-03-04 20:02:45 +01:00
Jake Barnby
74a3d6531f
Merge remote-tracking branch 'origin/refactor-usage-sn' into feat-isolation-modes
# Conflicts:
#	composer.json
#	composer.lock
#	src/Appwrite/Platform/Tasks/CalcTierStats.php
#	tests/e2e/Services/Projects/ProjectsConsoleClientTest.php
2024-03-04 19:50:10 +01:00
Christy Jacob
2ffcb9b07e Merge branch 'main' of https://github.com/appwrite/appwrite into refactor-usage-sn 2024-03-01 16:08:03 +00:00
Steven Nguyen
fed197a313
Merge branch '1.4.x' into chore-sync-1.4.x-into-main 2024-02-29 21:53:39 +00:00
loks0n
e3c261b9e4 fix: msg91 2024-02-21 16:24:55 +00:00
Jake Barnby
be761b31c1
Update image lib 2024-02-12 14:21:06 +13:00
Khushboo Verma
11ceeff5ca Add health certificate validity endpoint 2024-02-06 15:15:03 +05:30
Bradley Schofield
192599d7c6 Merge branch 'main' into feat-impl-queue-retry 2024-01-24 17:54:29 +00:00
Bradley Schofield
1e247bdde1 Address Christy's Comments and Update Lib 2024-01-19 13:18:37 +00:00
Jake Barnby
de96e0f3dc
Update ruby 2024-01-18 20:07:39 +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
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
Bradley Schofield
01d76a1746 Add Queue Retry Command to Appwrite 2024-01-04 13:00:25 +00:00
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
Christy Jacob
f5c2c8d8f7 chore: reset old cookie 2023-12-08 20:23:04 +01:00
Jake Barnby
4245c0b86e
Update dependencies 2023-12-08 18:07:38 +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
Jake Barnby
2c71de1d1b
Merge remote-tracking branch 'origin/1.4.x' into feat-isolation-modes
# Conflicts:
#	composer.lock
2023-11-28 00:57:17 +13: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
eb5fc0797f
Update abuse/audit 2023-11-23 00:43:32 +13:00
Jake Barnby
6ad4566b6b
Update CLI 2023-11-21 00:15:50 +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
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
21220a2051
Merge pull request #6894 from appwrite/refactor-vcs-tests
Add VCS tests
2023-10-27 19:04:44 +04:00
Khushboo Verma
36fcc6c293 Resolve merge conflicts 2023-10-27 18:13:50 +05:30
shimon
a42577b1aa composer json 2023-10-25 17:14:10 +03:00
shimon
9fad9dca88 usage sync 2023-10-25 10:39:59 +03:00
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
Jake Barnby
8db372a7d3
Update dependencies 2023-10-25 13:55:32 +13:00
Khushboo Verma
2cf8639b68 Resolve merge conflicts 2023-10-23 15:06:01 +05:30
Jake Barnby
9cb2e834a6
Update db 2023-10-19 20:41:06 +13:00
Jake Barnby
db3fa21468
Update database 2023-10-19 14:26:44 +13:00
Christy Jacob
be26e4b729 chore: remove resque library and update health check endpoints 2023-10-18 19:44:06 +00:00
shimon
b42a9e94e2 some fixes 2023-10-17 18:12:24 +03:00
Jake Barnby
62ce68f1b5
Update packages 2023-10-17 16:48:26 +13:00
shimon
9a6d88a819 addressing some comments 2023-10-17 06:44:36 +03:00
shimon
94178f8eaf rollback to Usage 2023-10-15 20:41:09 +03:00
Khushboo Verma
66ec7f2e1d VCS tests 2023-10-13 18:50:58 +05:30
Jake Barnby
1ac3372239
Set queue name per worker 2023-10-12 17:55:30 +13:00
shimon
2cd4514086 sync with main 2023-10-11 16:03:15 +03:00
shimon
002fc19d60 tests fix 2023-10-10 21:02:24 +03:00
shimon
24e09d3d8e queueForBuilds fix via functions controller 2023-10-09 13:16:05 +03:00