Commit Graph

609 Commits

Author SHA1 Message Date
Prateek Banga cbea4264ea merge master 2023-09-12 20:53:16 +05:30
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
Damodar Lohani 4fd5c72f34 Merge branch 'master' into feat-1.4.x-with-1.3.x-master 2023-07-19 07:39:37 +00:00
Eldad A. Fux 11c9066c4d Merge pull request #5402 from appwrite/fix-chunked-upload
content-range end should be 1 less than file size
2023-07-18 06:55:05 +03:00
fogelito d55dc7a5b2 Merge branch 'master' of github.com:appwrite/appwrite into validator-mv 2023-05-07 12:23:02 +03:00
Christy Jacob 60f51580a7 Merge pull request #5246 from singhbhaskar/fix-4960-Database-usage-screen-shows-500-error-when_APP_USAGE_STATS-is-disabled
Fix: Updated error when _APP_USAGE_STATS is disabled
2023-05-04 20:47:50 +05:30
fogelito 5e4ff01568 getByType 2023-05-01 12:18:50 +03:00
Damodar Lohani edbc52403a update so that current SDK don't fail 2023-04-27 09:29:39 +00:00
Bhaskar Singh 3865f48d32 Moved check for _APP_USAGE_STATS
to create init hook for App
2023-04-21 23:09:01 +05:30
Damodar Lohani 518b45827f content-range end should be 1 less than file size 2023-04-19 02:17:26 +00:00
Jake Barnby 7f8f34793e Merge remote-tracking branch 'origin/1.3.x' into doc-db-relationships
# Conflicts:
#	composer.lock
2023-04-11 15:57:35 +12:00
Vincent (Wen Yu) Ge 19d5ea03b9 Updates links for query page 2023-03-29 19:38:39 +00:00
Christy Jacob a3019f3d8c Merge branch 'feat-db-pools-sync' of https://github.com/appwrite/appwrite into feat-db-pools-fix-scheduler 2023-03-24 08:23:28 +00:00
Christy Jacob 7f493ed510 Merge branch 'feat-db-pools' of https://github.com/appwrite/appwrite into feat-db-pools-sync 2023-03-24 06:45:58 +00:00
Christy Jacob 5f10ff4d3b Merge branch 'feat-db-pools-master' of https://github.com/appwrite/appwrite into feat-db-pools-sync 2023-03-24 06:35:30 +00:00
Matej Bačo e8b11b2d14 Fix scheduler 2023-03-19 10:43:57 +01:00
Bhaskar Singh ac2085ffa8 Updated error when _APP_USAGE_STATS is disabled
for usage
2023-03-18 22:12:36 +05:30
Matej Bačo 72e0ccf6d6 Remove scheduleUpdatedAt 2023-03-14 19:39:40 +01:00
Matej Bačo a919421b47 Fix scheduler bugs 2023-03-14 15:10:36 +01:00
Matej Bačo c01fcb130c Merge branch 'feat-db-pools-master' into feat-db-pools-sync 2023-03-14 12:58:54 +01:00
shimon 4839dbbfb0 fix 2023-03-09 17:49:03 +02:00
Torsten Dittmann 6e5b8fab4b fix: implement new framework changes 2023-03-01 17:30:36 +05:30
Damodar Lohani 5acd78463a Merge remote-tracking branch 'origin/feat-db-pools' into feat-db-pools-master-sync 2023-02-16 00:44:29 +00:00
Damodar Lohani 171f30adb1 Merge remote-tracking branch 'origin/master' into feat-db-pools-master-sync 2023-02-16 00:29:37 +00:00
Damodar Lohani 3215e8d8df Merge remote-tracking branch 'origin/feat-db-pools' into feat-db-pools-master-sync 2023-02-14 04:54:02 +00:00
Damodar Lohani 71d2c45a92 Merge remote-tracking branch 'origin/master' into feat-db-pools-master-sync 2023-02-14 04:35:19 +00:00
Jake Barnby f6fc9a8d8c Merge remote-tracking branch 'origin/master' into feat-technical-debt-2
# Conflicts:
#	composer.lock
2023-02-14 14:22:08 +13:00
shimon 5850a454e0 addressing comments 2023-02-05 22:07:46 +02:00
shimon 1ac935077b addressing comments 2023-02-02 20:16:01 +02:00
shimon abdd5f016a addressing comments 2023-02-02 13:55:23 +02:00
Vincent (Wen Yu) Ge b25dc38a63 clarify custom ID vs unique ID 2023-01-20 22:22:16 +00:00
fogelito c4ae047833 Merge branch 'master' of github.com:appwrite/appwrite into feat-technical-debt-2
 Conflicts:
	app/init.php
	composer.json
	composer.lock
2023-01-16 10:24:37 +02:00
shimon a0554ca91e usage test 2023-01-15 12:25:03 +02:00
Vincent (Wen Yu) Ge 45aea5b941 Update branch with master 2023-01-13 14:53:54 -05:00
Vincent (Wen Yu) Ge 92a384e31c Fix descriptions for ID and regen 1.2.x specs 2023-01-13 14:27:08 -05:00
Damodar Lohani f41e3b1e8f Merge remote-tracking branch 'origin/master' into feat-db-pools-master-sync 2023-01-12 07:25:23 +00:00
shimon e533f8f067 minor adjustments 2022-12-25 19:07:03 +02:00
shimon 0ac5e293b6 add internalId to collections 2022-12-25 14:13:52 +02:00
shimon 586c7fac7c add internalId to collections 2022-12-25 14:07:54 +02:00
shimon f3dcd6a79f add internalId to collections 2022-12-25 13:06:25 +02:00
shimon a8fe99def0 add internalId to collections 2022-12-25 12:17:49 +02:00
shimon b89e04f561 add internalId to collections 2022-12-22 19:18:54 +02:00
shimon 20f9b0c655 refactor usage worker 2022-12-22 15:02:41 +02:00
shimon c02ef7b340 adding build.storage usage 2022-12-21 11:22:29 +02:00
shimon c6b3fb39b1 Merge branch 'feat-db-pools' of github.com:appwrite/appwrite into feat-new-usage-stats
 Conflicts:
	app/console
	app/workers/builds.php
	docker-compose.yml
	src/Appwrite/Usage/Stats.php
2022-12-21 09:58:22 +02:00
Christy Jacob ff9bccf1ff Revert "Feat: Build output size" 2022-12-20 18:26:56 +05:30
shimon 18f192ed65 benchmarks 2022-12-19 10:25:49 +02:00
Matej Bačo 8f363eae7a Fix bugs 2022-12-18 08:35:16 +01:00
shimon 7601c9047b e2e tests 2022-12-15 11:45:43 +02:00