1
0
Fork 0
mirror of synced 2024-08-20 20:51:40 +12:00
Commit graph

18470 commits

Author SHA1 Message Date
Jake Barnby
2d897889c9
Merge remote-tracking branch 'origin/main' into chore-updates-deps 2023-10-26 21:22:41 +13:00
prateek banga
c2cd544948 review changes 2023-10-26 13:46:45 +05:30
Prateek Banga
34c96e4672 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into review-changes-1.5.x 2023-10-26 12:37:51 +05:30
Prateek Banga
34b3ed68ee adds total count for subscribers in topics model 2023-10-26 12:37:39 +05:30
Jake Barnby
ea76bc6680
Merge pull request #6991 from appwrite/providers-from-attribute
Providers from attribute
2023-10-26 19:52:02 +13:00
Prateek Banga
9545e4ac72
Merge branch '1.5.x' into providers-from-attribute 2023-10-26 02:11:12 +05:30
prateek banga
456654c165 Merge branch 'providers-from-attribute' of https://github.com/appwrite/appwrite into review-changes-1.5.x 2023-10-26 00:03:13 +05:30
prateek banga
f5aa226b57 fix test 2023-10-26 00:02:22 +05:30
KRISH SONI
822596b2c9
Merge branch 'main' into kvs-patch 2023-10-25 23:56:54 +05:30
prateek banga
f6f4397aab Merge branch 'providers-from-attribute' of https://github.com/appwrite/appwrite into review-changes-1.5.x 2023-10-25 23:55:45 +05:30
KRISH SONI
191235ecaf
added docs url 2023-10-25 23:24:26 +05:30
Torsten Dittmann
2910e87c7a
Merge pull request #7009 from appwrite/fix-worker-permissions-reset
fix: worker database authorization reset
2023-10-25 19:51:20 +02:00
prateek banga
887eeef585 review changes 2023-10-25 23:09:38 +05:30
prateek banga
fd4a81c4fc made review changes 2023-10-25 23:03:23 +05:30
Torsten Dittmann
404ad8653d fix: worker permissions reset 2023-10-25 19:23:55 +02:00
prateek banga
2435f722ca fixes test cases 2023-10-25 21:45:55 +05:30
Christy Jacob
fa0d9139c1
Merge pull request #7007 from appwrite/chore-bump-console
chore: bump console version
2023-10-25 15:36:34 +04:00
Torsten Dittmann
f9a3ae1421 chore: bump console version 2023-10-25 13:35:14 +02:00
Christy Jacob
db52e047c6
Merge pull request #7006 from appwrite/fix-http-status-code
Updated the error code for unsupported protocol
2023-10-25 14:56:45 +04:00
Khushboo Verma
17de0d1ea7 Updated the error code for unsupported protocol 2023-10-25 15:55:46 +05:30
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
7d10174193
Merge pull request #7002 from appwrite/chore-updates-deps
Update dependencies
2023-10-25 14:32:08 +13:00
Jake Barnby
8db372a7d3
Update dependencies 2023-10-25 13:55:32 +13:00
Torsten Dittmann
5069aef6ac
Merge pull request #6998 from appwrite/feat-realtime-error-handling
feat: realtime error handling
2023-10-24 16:12:21 +02:00
Torsten Dittmann
fbcbd0d430 feat: realtime error handling 2023-10-24 14:32:22 +02:00
Jake Barnby
cbae797f38
Merge pull request #6965 from appwrite/sync-1.4.x-to-1.5.x
Sync 1.4.x to 1.5.x
2023-10-24 20:12:11 +13:00
Jake Barnby
d5b6421285
Merge remote-tracking branch 'origin/1.4.x' into sync-1.4.x-to-1.5.x
# Conflicts:
#	composer.lock
2023-10-24 19:46:57 +13:00
Christy Jacob
3a53dce467
Merge pull request #6994 from appwrite/1.4.x
Update main with 1.4.x
2023-10-24 01:11:13 +04:00
Christy Jacob
3e2b6c4344
Merge pull request #6990 from appwrite/feat-1.4.7-release-prep
Prepare 1.4.7 release
2023-10-24 00:49:44 +04:00
Steven Nguyen
84ea81f56d Add 1.4.7 to CHANGES.md 2023-10-23 13:36:29 -07:00
Steven Nguyen
3addf76a2a Bump appwrite version to 1.4.7 2023-10-23 13:36:29 -07:00
Christy Jacob
ce8c7e1527
Merge pull request #6988 from appwrite/fix-functions-worker
Fix missing body in async function execution
2023-10-23 23:40:58 +04:00
prateek banga
b60cbcada5 adds from field in remaining providers 2023-10-24 01:05:46 +05:30
Torsten Dittmann
342deb4989
Merge pull request #6465 from appwrite/fix-docs-links
Fix docs links CONTRIBUTING.md
2023-10-23 19:24:43 +02:00
shimon
0411f9f530 fix function-worker body param typo 2023-10-23 16:33:26 +03:00
Khushboo Verma
ad4db114bc Updated composer.lock 2023-10-23 15:23:52 +05:30
Khushboo Verma
c0460289b7 Remove unused value from docker-compose 2023-10-23 15:19:23 +05:30
Khushboo Verma
a09c4281c8 Revert "Remove unused value from docker-compose"
This reverts commit c7435e7e78.
2023-10-23 15:18:48 +05:30
Khushboo Verma
c7435e7e78 Remove unused value from docker-compose 2023-10-23 15:16:42 +05:30
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
shimon
fc34d2ff7e Merge remote-tracking branch 'origin/main' 2023-10-23 11:47:30 +03:00
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
shimon
76e2b39c1a Merge remote-tracking branch 'origin/main'
# Conflicts:
#	app/controllers/api/projects.php
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