1
0
Fork 0
mirror of synced 2024-07-03 21:50:34 +12:00
Commit graph

16726 commits

Author SHA1 Message Date
Jake Barnby cc924b0984
Merge remote-tracking branch 'origin/master' into feat-sync-1.4
# Conflicts:
#	app/controllers/api/storage.php
#	app/workers/deletes.php
2023-08-29 14:48:18 -04:00
Jake Barnby 6cc819c520
Merge pull request #6057 from appwrite/cl-1.4.x
cl-1.4.x -> 1.4.x
2023-08-29 14:35:07 -04:00
Jake Barnby cfdc9dff1b
Remove cloud specific config 2023-08-29 14:25:00 -04:00
Eldad A. Fux fdb8d84765
Merge pull request #6050 from appwrite/bump-assistant-version
update assistant version
2023-08-29 10:57:24 +03:00
prateek banga d1e6f1b535 update assistant version 2023-08-28 15:00:42 +05:30
Eldad A. Fux 017f43393c
Merge pull request #6048 from appwrite/bump-assistant-version
updates appwrite assistant docker image version
2023-08-28 11:44:45 +03:00
prateek banga 655f7b7563 updates appwrite assistant docker image version 2023-08-28 14:08:21 +05:30
Eldad A. Fux 9463607067
Merge pull request #5327 from pranjalg13/doc-5318-update-documentation-on-building-static-files
Added Documentation change on static files
2023-08-24 18:39:15 +03:00
Jake Barnby 5fd860bc87
Merge pull request #6029 from appwrite/fix-file-id-collision
Fix colliding ID overrides
2023-08-22 15:52:36 -04:00
Jake Barnby 6a9588c4be
Update src/Appwrite/Extend/Exception.php 2023-08-22 13:38:43 -04:00
Jake Barnby c929fe113e
Fix colliding ID overrides 2023-08-22 13:11:32 -04:00
Eldad A. Fux 95389a713e
Merge pull request #5879 from appwrite/akamai-rebrand
Update Akamai integration further according to their latest rebrand
2023-08-22 07:57:32 +03:00
Eldad A. Fux 0ded0c259b
Merge pull request #5915 from appwrite/docs-function-create-build
Fix missing description for function create build endpoint
2023-08-22 07:57:05 +03:00
Jake Barnby bda3afdfdf
Merge pull request #5900 from appwrite/fix-collection-disabled-mode-checks
Fix collection disabled mode checks
2023-08-22 00:47:47 -04:00
Jake Barnby 6c67172fd7
Fix missing ID 2023-08-21 23:45:32 -04:00
Jake Barnby 942705b5f3
Fix database upgrade 2023-08-21 23:25:55 -04:00
Jake Barnby 1e3fd5291e
Merge remote-tracking branch 'origin/cl-1.4.x' into fix-collection-disabled-mode-checks 2023-08-18 13:25:21 -04:00
Jake Barnby fb0a4bde28
Merge pull request #6015 from appwrite/1.4.x
Merge 1.4.x into cl-1.4.x
2023-08-18 13:09:25 -04:00
Jake Barnby 4b07896877
Merge pull request #6010 from appwrite/chore-1.4.x-upgrade
Chore 1.4.x upgrade
2023-08-18 09:58:41 -04:00
Jake Barnby a3895b041a
Apply suggestions from code review 2023-08-17 21:48:21 -04:00
Jake Barnby a77ff0a9b0
Merge remote-tracking branch 'origin/1.4.x' into chore-1.4.x-upgrade
# Conflicts:
#	app/config/specs/open-api3-latest-client.json
#	app/config/specs/open-api3-latest-console.json
#	app/config/specs/open-api3-latest-server.json
#	app/config/specs/swagger2-latest-client.json
#	app/config/specs/swagger2-latest-console.json
#	app/config/specs/swagger2-latest-server.json
2023-08-17 19:54:25 -04:00
Jake Barnby a88f90dd90
Merge remote-tracking branch 'origin/1.4.x' into chore-1.4.x-upgrade
# Conflicts:
#	app/config/specs/open-api3-latest-client.json
#	app/config/specs/open-api3-latest-console.json
#	app/config/specs/open-api3-latest-server.json
#	app/config/specs/swagger2-latest-client.json
#	app/config/specs/swagger2-latest-console.json
#	app/config/specs/swagger2-latest-server.json
#	composer.lock
2023-08-17 19:51:36 -04:00
Jake Barnby 92c39470be
Merge pull request #5800 from appwrite/fix-team-update-membership
Update method name for `updateMembershipRoles`
2023-08-17 19:43:56 -04:00
Jake Barnby 6ef5e8bd7e
Fix test 2023-08-17 19:08:30 -04:00
Jake Barnby 49b9003b7f
FIx test 2023-08-17 17:58:04 -04:00
Jake Barnby 861ed521a0
Merge branch '1.4.x' into fix-team-update-membership
# Conflicts:
#	app/config/specs/open-api3-1.4.x-client.json
#	app/config/specs/open-api3-1.4.x-console.json
#	app/config/specs/open-api3-1.4.x-server.json
#	app/config/specs/open-api3-latest-client.json
#	app/config/specs/open-api3-latest-console.json
#	app/config/specs/open-api3-latest-server.json
#	app/config/specs/swagger2-1.4.x-client.json
#	app/config/specs/swagger2-1.4.x-console.json
#	app/config/specs/swagger2-1.4.x-server.json
#	app/config/specs/swagger2-latest-client.json
#	app/config/specs/swagger2-latest-console.json
#	app/config/specs/swagger2-latest-server.json
2023-08-17 17:51:24 -04:00
Jake Barnby a019d01e91
Merge pull request #5887 from appwrite/fix-5404-update-document-without-relation-permission
Fix 5404 update document without relation permission
2023-08-17 17:48:08 -04:00
prateek banga 27df545fb7 Merge branch '1.4.x' of https://github.com/appwrite/appwrite into fix-5404-update-document-without-relation-permission 2023-08-17 19:15:33 +05:30
prateek banga 860e9958c7 lint fix 2023-08-17 19:04:41 +05:30
Jake Barnby 414d85be8e
Update mode checks 2023-08-16 17:58:25 -04:00
Jake Barnby b6ffb385a7
Merge remote-tracking branch 'origin/cl-1.4.x' into fix-collection-disabled-mode-checks
# Conflicts:
#	tests/e2e/Services/Databases/DatabasesConsoleClientTest.php
2023-08-16 15:55:19 -04:00
prateek banga d6f4d76807 adds another scenario in test case 2023-08-16 14:57:50 +05:30
Eldad A. Fux 96fa7362f3
Merge pull request #5698 from appwrite/fix-cache-delete-bug-master
Fix cache delete bug master
2023-08-15 14:57:33 +03:00
Eldad A. Fux 279b482f1a
Merge pull request #5726 from 2002Bishwajeet/feat-whitelist-enums
Feat:  Whitelist enums
2023-08-15 10:33:15 +03:00
Bishwajeet Parhi 42f1be0f6c
Update tests/e2e/Services/Teams/TeamsBaseServer.php
Co-authored-by: Jake Barnby <jakeb994@gmail.com>
2023-08-15 09:04:05 +05:30
Jake Barnby 04d0e284a1
Update specs 2023-08-14 22:29:47 -04:00
Jake Barnby 23deb5c4df
Apply suggestions from code review 2023-08-14 21:57:48 -04:00
Jake Barnby ff6d3f39b1
Remove invalid test 2023-08-14 20:47:47 -04:00
Jake Barnby 171f22daa0
Merge pull request #5604 from 2002Bishwajeet/feat-add-encrypt-param
feat: add encrypt param to string attribute
2023-08-14 20:45:15 -04:00
Jake Barnby 8820d422be
Update app/controllers/api/databases.php 2023-08-14 20:45:05 -04:00
Jake Barnby 4ddb0ce6a7
Merge remote-tracking branch 'upstream/cl-1.4.x' into feat-add-encrypt-param 2023-08-14 19:37:37 -04:00
Jake Barnby 68601c5dc2
FIx lint 2023-08-14 19:35:18 -04:00
Jake Barnby c00c5119b2
Merge remote-tracking branch 'upstream/1.4.x' into feat-whitelist-enums 2023-08-14 19:33:56 -04:00
Jake Barnby 0ca90cee6c
Fix test 2023-08-14 19:30:11 -04:00
prateek banga cb6760a957 removes unnecessary use statement 2023-08-14 22:02:54 +05:30
prateek banga 8e1ef812d3 resolve merge conflicts 2023-08-14 21:59:24 +05:30
Bishwajeet Parhi ac4701988a generate api specs 2023-08-14 17:01:42 +05:30
Bishwajeet Parhi 12a61feed4 chore: add PlatformType 2023-08-14 14:03:30 +05:30
Jake Barnby 03cdae245e
Merge pull request #5923 from appwrite/v19-migration
V19 migration - uid varchar
2023-08-11 19:30:17 -04:00
Jake Barnby efe81f5723
Merge branch 'cl-1.4.x' into v19-migration 2023-08-11 19:29:12 -04:00