Commit Graph

25060 Commits

Author SHA1 Message Date
Christy Jacob 14f35589b3 Merge branch 'main' into fix-db-mod 2023-10-23 12:40:05 +04:00
德华 刘 3dee8d6ecd fix: update incorrect method call cl-1.4.6+5 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
loks0n 1343d4851a Merge branch 'main' of https://github.com/appwrite/appwrite into feat-ssr 2023-10-23 09:10:57 +01:00
shimon b09a254d3c fix mod condition 2023-10-23 10:46:15 +03:00
shimon 76e2b39c1a Merge remote-tracking branch 'origin/main'
# Conflicts:
#	app/controllers/api/projects.php
cl-1.4.6+4
2023-10-23 01:08:04 +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
Christy Jacob 765391cd7c Merge branch 'main' into feat-support-selfdb 2023-10-23 01:56:54 +04:00
shimon ac231914d4 fix mod condition 2023-10-23 00:55:57 +03:00
shimon 453ce03881 fix mod condition 2023-10-23 00:47:48 +03:00
Christy Jacob d1deef43c5 Merge pull request #6984 from appwrite/fix-db-mod
fix mod condition
cl-1.4.6+3
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
cl-1.4.6-2
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
德华 刘 c0f099e176 chore: update test file 2023-10-22 15:28:39 +00:00
德华 刘 42ce9d881a Merge branch 'main' of https://github.com/appwrite/appwrite into chhore-parallelize-tests 2023-10-22 15:16:40 +00:00
Matej Bačo 1787e57448 Fix database override 2023-10-22 16:18:47 +02:00
Eldad Fux f4fedc832e Fix formating 2023-10-21 08:30:35 -04:00
Eldad Fux 92538c57f6 cleanups 2023-10-21 07:29:23 -04:00
Eldad Fux 77a4300669 cleanups 2023-10-21 07:22:46 -04:00
Eldad Fux 2884cb636b cleanup 2023-10-21 07:18:21 -04:00
Eldad Fux 025a0292f4 Revert "Sync with main"
This reverts commit 0ea1418132.
2023-10-21 07:02:44 -04:00
Eldad Fux 0ea1418132 Sync with main 2023-10-21 07:00:21 -04:00
Eldad A. Fux e5fca85d88 Merge branch 'main' into feat-reclaim-only-current-connection 2023-10-21 06:42:59 -04:00
Christy Jacob fc35e0f6ff Merge pull request #6954 from appwrite/1.4.x
Merge 1.4.x to main
cl-1.4.6+1 cl-1.4.26
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
cl-1.4.25 1.4.6
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
prateek banga af40c63357 review changes 2023-10-20 17:02:13 +05:30
prateek banga e040ecba36 fixed lint error 2023-10-20 15:03:56 +05:30
prateek banga 6c260223ba Merge branch '1.5.x' of https://github.com/appwrite/appwrite into sync-1.4.x-to-1.5.x 2023-10-20 15:00:22 +05:30
prateek banga 161bbfb822 Merge branch '1.4.x' of https://github.com/appwrite/appwrite into sync-1.4.x-to-1.5.x 2023-10-20 14:55:17 +05:30
Jake Barnby 8ed37fb445 Merge pull request #6950 from appwrite/feat-sms-push-controllers
Feat sms push controllers
2023-10-20 21:49:20 +13:00
Prateek Banga d714760eb8 review changeS 2023-10-20 13:51:13 +05:30
prateek banga 24b2d70441 review changes 2023-10-20 13:33:27 +05:30
prateek banga e4d2d15f70 review changes 2023-10-20 13:31:56 +05:30
prateek banga db9e7b0199 review changes 2023-10-20 13:28:23 +05:30
shimon 7f42fbfe71 debug cl-1.4.24 2023-10-19 23:11:30 +03:00
shimon 04676d9737 debug cl-1.4.23 2023-10-19 22:57:59 +03:00