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,238 Commits 1,269 Branches 495 Tags
__stream
Commit Graph

368 Commits

Author SHA1 Message Date
shimon d28803e2e7 Merge branch 'master' of github.com:appwrite/appwrite into __stream 
 Conflicts:
	composer.json
	composer.lock
 2023-06-12 17:34:19 +03:00
shimon d3475030bf api cache fix 2023-06-12 17:32:43 +03:00
Bishwajeet Parhi 40f70faa89 Feat: Add enable param in Database and Collection 2023-05-18 18:55:22 +05:30
shimon e0f4673574 re-working worker flow 2023-05-17 11:37:46 +03:00
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
shimon 3c69c211e9 added internalIds to collections 2023-05-07 11:31:27 +03:00
shimon 741a87f464 updates 2023-04-12 18:18:56 +03:00
shimon 4cd273e976 updates 2023-04-09 12:58:21 +03:00
shimon fc991e89f1 transcoding -> videos 2023-04-04 20:20:40 +03:00
shimon 2b60b18a3c timeline 2023-04-04 14:24:18 +03:00
shimon bccd1a96c0 timeline 2023-04-02 13:48:59 +03:00
Jake Barnby 0797df8414 Merge remote-tracking branch 'origin/1.3.x' into feat-relations-2 
# 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-03-25 15:32:55 +13:00
fogelito 00c1418246 Update response Model.php 2023-03-16 13:48:27 +02:00
fogelito 31fad24603 collections.php 2023-03-14 15:20:56 +02:00
fogelito 9c4b269669 update collections.php with options 2023-03-13 12:59:01 +02:00
shimon 26251e94f6 Updates 2023-03-06 17:58:26 +02:00
Torsten Dittmann 496da61cd9 feat: team preferences 2023-03-06 19:54:02 +05:30
shimon dbad8c2a85 Updates 2023-03-05 19:30:53 +02:00
shimon d6d6a7753a Updates 2023-03-05 19:21:51 +02:00
shimon 7a0255d011 Updates 2023-03-05 11:24:24 +02:00
shimon 8d496d66d1 metadata extraction ffmpeg -> mediainfo 2023-03-02 15:05:15 +02:00
shimon cfb53be8ac metadata extraction ffmpeg -> mediainfo 2023-03-02 10:56:04 +02:00
Damodar Lohani 6b6f9edbd6 Merge branch '1.3.x' into feat-13x-master-sync 2023-02-21 07:38:46 +05:45
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
shimon 3d1228ba13 sync with master 
and renaming attr
 2023-02-12 10:56:11 +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
Damodar Lohani fe472e5b36 Merge branch '1.3.x' of https://github.com/appwrite/appwrite into feat-password-history 2023-01-16 05:04:13 +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
Damodar Lohani 0eae73e7b8 fix: password comparison 2022-12-18 06:27:41 +00:00
Damodar Lohani 8e7b89ec03 feat: check password history 2022-12-16 10:22:39 +00:00
fogelito f96128e14f Changing Id 2022-12-14 17:42:25 +02:00
Matej Bačo 4dfaa5e69a Fix mimetype size 2022-12-05 14:54:13 +00: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
Bradley Schofield 3c71164741 Merge branch '1.1.x' into feat-implement-session-length-api 2022-11-14 15:30:38 +00:00
Bradley Schofield 43d4d6fec3 Address Eldad's Comments 2022-11-14 09:57:37 +00:00
Bradley Schofield 4dfafd1169 Merge branch 'master' into feat-implement-session-length-api 2022-11-04 16:11:38 +00:00
Bradley Schofield e1f9a8e0ce Clean up a couple things and fix tests 2022-11-04 14:48:29 +00:00
Bradley Schofield 4b8287c097 Remove 'expire' from sessions 2022-11-03 15:03:39 +00:00
Christy Jacob b2d884e329 Merge branch 'master' of github.com:appwrite/appwrite into 1.1.x 2022-11-01 22:21:19 +05:30
Bradley Schofield cddacfbb78 Handle Eldad's Comments 2022-11-01 14:43:18 +00:00
fogelito bf119867e8 change name back to original 'name' 2048 2022-10-31 17:17:37 +02:00
Bradley Schofield d34359fd49 Implement Variable Session Duration 2022-10-31 14:54:15 +00:00
fogelito a5e67db604 fulltext 2022-10-26 23:12:46 +03:00
fogelito 08e44f0656 some changes 2022-10-26 22:14:39 +03:00
Matej Bačo a883d3728f Allow teamId queries on listProjects 2022-10-03 07:16:49 +00:00
Torsten Dittmann fbbb150e86 Revert "Merge pull request #4041 from appwrite/revert-3789-feat-app-region" 
This reverts commit 2117fa53f0, reversing
changes made to c634d12ef4.
 2022-09-30 14:22:11 +02:00
Torsten Dittmann e0b9f57d85 Revert "Feat app region" 2022-09-30 12:32:58 +02:00
Damodar Lohani e80e65946b Merge branch 'master' of https://github.com/appwrite/appwrite into feat-app-region 2022-09-19 12:01:56 +00:00
shimon 110c38d03d 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/controllers/api/projects.php
	composer.json
	composer.lock
	phpunit.xml
 2022-09-18 10:27:51 +03:00
Matej Bačo 20bbbfc493 Merge remote-tracking branch 'origin/0.16.x' into fix-function-scheduling 2022-09-13 20:14:42 +00:00