1
0
Fork 0
mirror of synced 2024-07-01 20:50:49 +12:00
Commit graph

17921 commits

Author SHA1 Message Date
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
Christy Jacob 45c44bb51c
Merge pull request #6986 from appwrite/fix-db-mod
fix mod condition
2023-10-23 12:41:05 +04:00
Christy Jacob 14f35589b3
Merge branch 'main' into fix-db-mod 2023-10-23 12:40:05 +04:00
德华 刘 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
shimon b09a254d3c fix mod condition 2023-10-23 10:46:15 +03:00
Christy Jacob e2eccaca8b
Merge pull request #6985 from appwrite/fix-db-mod
Fix db mod
2023-10-23 02:07:15 +04:00
shimon a841734d50 fix mod condition 2023-10-23 01:05:10 +03:00
shimon ac231914d4 fix mod condition 2023-10-23 00:55:57 +03:00
Christy Jacob d1deef43c5
Merge pull request #6984 from appwrite/fix-db-mod
fix mod condition
2023-10-23 01:11:05 +04:00
shimon 0d5127d90b fix mod condition 2023-10-23 00:08:55 +03:00
Christy Jacob bb46e3869c
Merge pull request #6851 from appwrite/feat-sm-db
update projects database
2023-10-22 22:35:54 +04:00
德华 刘 00d2a5ffcd chore: update create projects endpoints 2023-10-22 18:33:15 +00:00
德华 刘 79612bd80f Merge branch 'main' of https://github.com/appwrite/appwrite into feat-sm-db 2023-10-22 18:30:14 +00:00
Christy Jacob fc35e0f6ff
Merge pull request #6954 from appwrite/1.4.x
Merge 1.4.x to main
2023-10-20 17:36:56 +04:00
Christy Jacob 3001cac2ba
Merge pull request #6967 from appwrite/cl-1.4.x
Cl 1.4.x
2023-10-20 17:03:16 +04:00
Christy Jacob f533ab9324 feat: add swoole hooks 2023-10-20 17:00:45 +04:00
Christy Jacob b9e5d0c890 feat: add swoole hooks 2023-10-20 16:59:07 +04:00
Christy Jacob ce14e05d1d chore: sync with 1.4.x 2023-10-20 16:58:15 +04:00
Christy Jacob df35c79bc2 chore: remove var_dumps 2023-10-20 16:56:34 +04:00
Christy Jacob 3acb68f364 Merge branch 'cl-1.4.x' of github.com:appwrite/appwrite into cl-1.4.x 2023-10-20 16:55:52 +04:00
Christy Jacob 15347cce4b chore: update CI 2023-10-20 16:55:29 +04:00
Christy Jacob 4e0cc1b297
Merge pull request #6966 from appwrite/fix-mails-worker
fix: mails worker using TLS
2023-10-20 16:52:57 +04:00
Torsten Dittmann d19baafc59 chore: fix linting 2023-10-20 14:43:48 +02:00
Torsten Dittmann 4f77510b0a fix: only apply hook flags to mails worker 2023-10-20 14:42:22 +02:00
Torsten Dittmann 1f97aaf591 fix: disable swoole tcp hook for mails worker 2023-10-20 14:40:59 +02:00
shimon 7f42fbfe71 debug 2023-10-19 23:11:30 +03:00
shimon 04676d9737 debug 2023-10-19 22:57:59 +03:00
shimon c159032e93 email template path 2023-10-19 22:49:53 +03:00
shimon 416e5cc88c Merge branch '1.4.x' of github.com:appwrite/appwrite into cl-1.4.x 2023-10-19 21:00:21 +03:00
Christy Jacob 8e44f350e5
Merge pull request #6960 from appwrite/fix-email-tmeplate-path
email template path
2023-10-19 21:59:04 +04:00
shimon dd47ef4fd9 email template path 2023-10-19 20:57:24 +03:00
shimon aa9b057632 Merge branch '1.4.x' of github.com:appwrite/appwrite into cl-1.4.x 2023-10-19 19:42:03 +03:00
Christy Jacob 21b9716bb2
Merge pull request #6959 from appwrite/chore-update-backup-timings
chore: update backup timings
2023-10-19 20:40:43 +04:00
Christy Jacob a8ee31f9ae
Merge pull request #6958 from appwrite/fix-events-queue-proxy
Fix events queue
2023-10-19 20:32:42 +04:00
德华 刘 de8b9638d5 chore: update backup timings 2023-10-19 16:07:54 +00:00
shimon 8048766d28 queues fixes 2023-10-19 18:28:01 +03:00
Christy Jacob 5403df059f
Merge pull request #6952 from appwrite/feat-upgrade-executor
Feat: Upgrade executor
2023-10-19 17:18:29 +04:00
Christy Jacob 6b853a532a
Merge pull request #6953 from appwrite/fix-logger-ver
hard coding utopia logger to 0.3.1
2023-10-19 16:44:49 +04:00
Christy Jacob c89bace5e4 chore: revert logger version 2023-10-19 12:25:10 +00:00
shimon 23926e9530 hard coding utopia logger to 0.3.1 2023-10-19 14:01:06 +03:00
shimon aa32b419a8 hard coding utopia logger to 0.3.1 2023-10-19 13:50:32 +03:00
Matej Bačo 20c37db8fc Upgrade executor 2023-10-19 11:54:56 +02:00
Christy Jacob 8d9f0180a1
Merge pull request #6948 from appwrite/feat-1.4.6-release-prep
Prepare 1.4.6 release
2023-10-19 05:41:21 -04:00
Christy Jacob 01e842782f
Merge branch '1.4.x' into feat-1.4.6-release-prep 2023-10-19 05:28:02 -04:00
Christy Jacob 4b08729131
Update app/init.php 2023-10-19 05:27:52 -04:00
Christy Jacob 18dc8749d5 chore: update health API 2023-10-19 09:25:38 +00:00
Christy Jacob e2be9ea180
Merge pull request #6949 from appwrite/feat-api-db-timeout
API DB timeout
2023-10-19 05:17:00 -04:00