1
0
Fork 0
mirror of synced 2024-07-04 14:10:33 +12:00
Commit graph

430 commits

Author SHA1 Message Date
Jake Barnby 7e56607975
Update docker base 2024-02-16 14:09:22 +13:00
Torsten Dittmann 756993eea2 fix: new console 2024-02-13 12:10:30 +00:00
Torsten Dittmann 1be56bf118 feat: new console 2024-02-13 12:09:52 +00:00
Jake Barnby 18f7168160
Merge main 2024-02-12 14:18:19 +13: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
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 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 1301031b48
Update bin scripts 2024-01-11 16:10:20 +13:00
Jake Barnby 513ed9de05
Merge remote-tracking branch 'origin/1.5.x' into scheduling-temp
# Conflicts:
#	app/controllers/api/messaging.php
#	tests/e2e/Services/Messaging/MessagingBase.php
2024-01-11 13:06:15 +13:00
Jake Barnby 5039592128
Bump base 2024-01-10 16:39:14 +13:00
Matej Bačo 301401914a Add generate translations command 2024-01-09 13:58:45 +00:00
Jake Barnby f925d4e556
Update docker base 2024-01-09 18:19:08 +13: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
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 ea3b9ca0ec
Revert "Update appwrite base image" 2023-12-07 17:37:15 +01:00
Prateek Banga b8aa2faa7b adds scheduling commit, still need to resolve pools error 2023-12-07 11:25:19 +01:00
德华 刘 38a3c08772 chore: update docker base image 2023-12-05 09:16:35 +00:00
德华 刘 b6fabf80ef Merge branch '1.4.x' of https://github.com/appwrite/appwrite into feat-refactor-hamster 2023-11-30 21:20:59 +00:00
Bradley Schofield dea3e74b6a Implement Job based hamster 2023-11-28 10:19:55 +00:00
shimon 7ee96fb118 sync against 1.4x 2023-11-26 10:36:52 +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
Christy Jacob 9a12ab8f8a feat: add migration stats task 2023-11-20 19:36:53 -05:00
Matej Bačo fb6455b783 Add script to patch missing repos documents 2023-11-14 14:43:33 +01:00
Bradley Schofield d885b6218d Update Dockerfile 2023-11-08 11:26:27 +00:00
Bradley Schofield 48cbd60987 Update base and remove XDebug if non-debug 2023-11-08 11:24:58 +00:00
shimon ad63a377ab added inf metric 2023-11-08 11:09:32 +02:00
Bradley Schofield 77caf64076 Add XDebug to Appwrite 2023-11-06 10:08:11 +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
Eldad Fux 0fb3315c4c Upgrade to PHP 8.2 2023-11-01 22:44:19 -04:00
shimon 831122679f creating script 2023-10-26 17:45:23 +03:00
shimon b80bfb0a3c usage sync 2023-10-25 11:00:21 +03:00
shimon 9fad9dca88 usage sync 2023-10-25 10:39:59 +03:00
Christy Jacob b3807e6e22 chore: move env variable to dockerfile 2023-09-01 17:17:58 -04:00
Christy Jacob 03073d50fc Merge branch '1.4.x' of github.com:appwrite/appwrite into chore-cleanup-dockerfile 2023-09-01 15:24:02 -04:00
Steven Nguyen 2d0d036519
Ensure upgrade executable has execute permissions 2023-08-30 12:31:25 -07:00
Matej Bačo d3a9766c4f Sync env & storage setup with 1.4.x 2023-08-23 12:08:48 +02:00
shimon 8147f3ee7d rolling back usage flow 2023-08-20 15:29:43 +03:00
Christy Jacob b0f5a0e677 feat: add version to dockerfile 2023-08-13 14:20:29 +00:00
Christy Jacob 31191c0be8 chore: cleanup dockerfile 2023-08-11 23:49:10 +00:00
Christy Jacob 96354098f1 chore: cleanup dockerfile 2023-08-11 23:45:05 +00:00
Christy Jacob 8368ff0ffe chore: cleanup dockerfile 2023-08-11 23:43:55 +00:00
Matej Bačo 899bc38069 Merge branch 'cl-1.4.x' into feat-git-integration 2023-08-10 01:12:09 +02:00
Bradley Schofield 91c82f0d7d Merge remote-tracking branch 'origin/cl-1.4.x' into feat-implement-migrations 2023-08-07 16:09:28 +01:00
Matej Bačo 345df3f2ca More QA fixes 2023-08-06 12:30:38 +02:00
Matej Bačo 906f86fbb8 Merge branch 'cloud-1.4.x' into feat-git-integration 2023-08-06 09:31:32 +02:00
Steven Nguyen d960f85da6
Merge branch '1.4.x' into cloud-1.4.x 2023-08-04 18:07:33 -07:00
Steven Nguyen aa3c2faed9
Merge tag '1.3.8' into cloud-1.3.x-2 2023-08-04 13:55:07 -07:00
Bradley Schofield 8f5d79e668 Move to new branch 2023-08-04 17:21:41 +01:00
Matej Bačo 1db0c57518 PR review changes 2023-08-04 07:59:23 +02:00