1
0
Fork 0
mirror of synced 2024-07-12 01:45:54 +12:00
Commit graph

323 commits

Author SHA1 Message Date
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
Torsten Dittmann 496da61cd9 feat: team preferences 2023-03-06 19:54:02 +05:30
Damodar Lohani 6b6f9edbd6
Merge branch '1.3.x' into feat-13x-master-sync 2023-02-21 07:38:46 +05:45
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
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
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
Matej Bačo 20bbbfc493 Merge remote-tracking branch 'origin/0.16.x' into fix-function-scheduling 2022-09-13 20:14:42 +00:00
Matej Bačo 640b5abe1e PR review changes 2022-09-13 20:13:48 +00:00
Christy Jacob efbe21d433 Merge branch '0.16.x' of https://github.com/appwrite/appwrite into matej-qa-3 2022-09-13 18:21:44 +00:00
Matej Bačo a315f43039 Fix functon scheduling loop logic, and double-loop prevention 2022-09-11 12:20:26 +00:00
Christy Jacob cb50220b60 feat: rename time attribute to duration 2022-09-09 16:02:04 +04:00
Matej Bačo b41aaefc7e Implement 'enabled' attribute for functions 2022-09-09 08:49:18 +00:00
Damodar Lohani 3beacf0263 add region to usage documents 2022-09-09 06:13:12 +00:00
Damodar Lohani fafef03512 region attribute on project 2022-09-08 04:53:46 +00:00
Christy Jacob e5a9195e66
Merge pull request #3736 from appwrite/refactor-cache-date
Refactor cache date
2022-08-31 19:00:36 +02:00
Matej Bačo a85a471d3b Merge remote-tracking branch 'origin/0.16.x' into fix-ui-with-queries-v2 2022-08-31 13:33:18 +00:00
Damodar Lohani 8fe365d66e Merge branch '0.16.x' of https://github.com/appwrite/appwrite into feat-additional-compression-support 2022-08-31 13:21:45 +00:00
shimon f7da33a873 Merge branch '0.16.x' of github.com:appwrite/appwrite into refactor-cache-date 2022-08-31 16:09:42 +03:00
Matej Bačo dccb9b7291 Merge remote-tracking branch 'origin/0.16.x' into fix-ui-with-queries-v2 2022-08-31 12:38:40 +00:00
Matej Bačo d5997d92c3 Updated all UI components for new queries V2. introduced queries to listProjects 2022-08-31 12:30:16 +00:00
shimon bc786cdb86 Merge branch '0.16.x' of github.com:appwrite/appwrite into refactor-cache-date 2022-08-31 10:42:55 +03:00
Matej Bačo 0897cd0fe4
Merge branch '0.16.x' into feat-variables-api 2022-08-31 09:37:47 +02:00
Damodar Lohani 63f95c0a5c Merge branch '0.16.x' of https://github.com/appwrite/appwrite into feat-additional-compression-support 2022-08-31 02:55:26 +00:00
Christy Jacob fe8295c2ec Merge branch '0.16.x' of https://github.com/appwrite/appwrite into feat-improve-keys 2022-08-30 17:35:46 +00:00
Damodar Lohani 5666002ff2 compression attribute on bucket collection 2022-08-30 12:52:53 +00:00
shimon 69066cfc5e timestamp -> datetime on file cache 2022-08-30 15:44:37 +03:00
Matej Bačo 6df1d35712 PR review changes 2022-08-30 07:30:23 +00:00
Matej Bačo dca0b211f6 Implement queries into list variables 2022-08-26 13:38:39 +00:00
Matej Baco 8513bb2dbe Merge branch 'feat-list-endpoints-queries' into feat-variables-api 2022-08-25 11:14:42 +02:00