Appwrite/appwrite
1
0
Fork 0
mirror of https://github.com/appwrite/appwrite.git synced 2026-05-26 13:51:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,153 Commits 1,269 Branches 495 Tags
__stream_back_2
Commit Graph

592 Commits

Author SHA1 Message Date
shimon f3508e1701 Merge branch 'master' of github.com:appwrite/appwrite into __stream 
 Conflicts:
	.gitmodules
	Dockerfile
	app/config/services.php
	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
	app/console
	app/controllers/api/databases.php
	app/controllers/api/projects.php
	app/controllers/api/teams.php
	composer.json
	composer.lock
	src/Appwrite/Utopia/Response.php
 2023-05-07 11:43:29 +03:00
Steven Nguyen 11d523b050 Bump utopia abuse, audit, and database 2023-04-27 10:42:55 -07:00
Steven Nguyen 471c832a4f Bump utopia-php/database version 2023-04-19 17:21:41 -07:00
shimon 578c8d9277 tests 2023-04-17 10:09:48 +03:00
Jake Barnby 9b7d032eda Update SDK generator for 1.3.x support 2023-04-12 00:58:12 +12:00
Jake Barnby 9604cd1d94 Update to tagged release 2023-04-11 17:41:21 +12:00
Jake Barnby f00bd7dac7 Merge remote-tracking branch 'origin/1.3.x' into feat-relations-2 
# Conflicts:
#	composer.lock
 2023-04-11 17:25:26 +12: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
shimon db4506b0fe updates 2023-04-10 16:41:23 +03:00
Jake Barnby af890a4e4b Merge remote-tracking branch 'origin/1.3.x' into feat-relations-2 
# Conflicts:
#	composer.lock
 2023-04-03 15:55:17 +12:00
Jake Barnby 9010320cd9 Update abuse 2023-03-31 20:57:47 +13:00
Jake Barnby 9468c238de Remove conflicts 2023-03-30 13:01:58 +13:00
Jake Barnby c09ab6cc9d Remove duplicate dependency 2023-03-29 14:42:19 +13:00
Jake Barnby daa5c7e59f Merge remote-tracking branch 'origin/1.3.x' into feat-relations-2 
# Conflicts:
#	composer.json
#	composer.lock
 2023-03-24 23:50:26 +13:00
Jake Barnby c65800b3a3 Merge remote-tracking branch 'origin/1.3.x' into feat-remove-limits 
# Conflicts:
#	composer.json
#	composer.lock
 2023-03-24 21:03:18 +13:00
Jake Barnby c310434eeb Update dependencies 2023-03-24 16:39:35 +13:00
Jake Barnby f43ff0d2e9 Update dependencies 2023-03-23 18:40:05 +13:00
fogelito c1bce185fd composer framework update 2023-03-15 10:04:02 +02:00
Damodar Lohani a0a3e3bd2c update utopia storage version 2023-03-15 00:29:31 +00:00
fogelito ca3efdf562 create relation 2023-03-12 16:04:18 +02:00
Torsten Dittmann cb065e4228 fix: openapi specification 2023-03-10 15:36:10 +05:30
Steven Nguyen 85a2d623a6 Update APIs to check X-Appwrite-Timestamp header 
Appwrite will refer to the X-Appwrite-Timestamp header for when the
request was originally sent and reject the request if the Timestamp
is older than the updatedAt timestamp of the document.
 2023-03-07 10:54:52 -08:00
shimon cfb53be8ac metadata extraction ffmpeg -> mediainfo 2023-03-02 10:56:04 +02:00
Torsten Dittmann 5df53e3e76 fix: http status codes for udpating attributes 2023-03-02 12:15:10 +05:30
Torsten Dittmann 6e5b8fab4b fix: implement new framework changes 2023-03-01 17:30:36 +05:30
Jake Barnby 66a7b652e6 Update lock 2023-02-28 16:48:27 +13:00
Jake Barnby 84f4813135 Revert "Remove count, limit and offset limitations" 
This reverts commit ae3535de0d.

# Conflicts:
#	composer.lock
 2023-02-28 16:42:21 +13:00
shimon a1918d1512 video tests 2023-02-21 11:21:47 +02:00
Jake Barnby ae3535de0d Remove count, limit and offset limitations 2023-02-20 19:03:15 +13:00
shimon 4ac062edfe Merge branch 'master' of github.com:appwrite/appwrite into __stream 
 Conflicts:
	.gitmodules
	Dockerfile
	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
	app/console
	composer.lock
 2023-02-19 10:51:50 +02:00
fogelito 161d3b485e composer.json upgrades 2023-02-14 11:58:52 +02:00
fogelito 94b311f14f composer.json upgrades 2023-02-14 11:55:20 +02: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 edaa93936f Merge branch 'master' of github.com:appwrite/appwrite into __stream 
 Conflicts:
	composer.json
	composer.lock
 2023-02-09 19:28:26 +02:00
fogelito 625aa8ada6 Some changes 2023-01-16 17:11:13 +02: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
fogelito aa5a45ba79 audit + abuse upgrade 2023-01-16 10:12:14 +02:00
Bradley Schofield 31b718d829 Replace Appwrite Validators with backported Utopia ones 
+ Updated Utopia Framework to 0.26.0
+ Replaced Appwrite Validators with Utopia ones
 2023-01-13 15:28:04 +00:00
shimon 1af48bd895 Merge branch 'master' of github.com:appwrite/appwrite into __stream 
 Conflicts:
	.gitmodules
	app/config/errors.php
	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.json
	composer.lock
	docker-compose.yml
	src/Appwrite/Extend/Exception.php
 2023-01-11 16:31:26 +02:00
Steven Nguyen 04fa436dca Bump utopia-php/storage 
Update storage to fix bug with S3 provider paths
 2023-01-06 10:28:40 -08:00
Matej Bačo f77e150fe0 Fix version 2022-12-27 16:33:28 +01:00
Matej Bačo 18c4f2b92a Upgrade sdk-generator 2022-12-26 13:03:32 +01:00
Jake Barnby cbf1d9deb6 Fix indentation 2022-12-22 19:16:03 +13:00
fogelito f96128e14f Changing Id 2022-12-14 17:42:25 +02:00
shimon 0172a6c393 bla 2022-11-21 11:07:36 +02:00
shimon 19a38cd06a Merge branch 'master' of github.com:appwrite/appwrite into __stream 
 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
	app/workers/deletes.php
	composer.json
	composer.lock
	docker-compose.yml
 2022-11-20 13:37:03 +02:00
Jake Barnby 163cbc5052 Merge remote-tracking branch 'origin/master' into feat-graphql-support 
# Conflicts:
#	composer.json
#	composer.lock
 2022-11-17 21:41:56 +13:00
Torsten Dittmann 9f384e016f Merge branch '1.1.x' of https://github.com/appwrite/appwrite into feat-console-rewrite 2022-11-09 15:47:23 +01:00
Torsten Dittmann a2570f5568 chore: update composer 2022-11-09 15:34:26 +01:00
Jake Barnby a47bfe71bf Merge remote-tracking branch 'origin/1.2.x' into feat-graphql-support 
# Conflicts:
#	CHANGES.md
#	composer.json
#	composer.lock
#	tests/e2e/Services/Functions/FunctionsCustomServerTest.php
 2022-11-04 21:32:57 +13:00