2660 commits

Author	SHA1	Message	Date
Torsten Dittmann	3860602697	feat: console service	2023-03-31 17:14:59 +02:00
Jake Barnby	578d4d1619	Disallow index creation on relationship attributes	2023-03-31 18:06:50 +13:00
Jake Barnby	c7201cc417	Remove HTML from API error messages	2023-03-31 18:05:45 +13:00
Damodar Lohani	41d22fb50b	Merge remote-tracking branch 'origin' into feat-db-pools-master-sync-2	2023-03-30 08:02:31 +00: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
Bhaskar Singh	700f4f33ed	Merge branch 'appwrite:master' into fix-4960-Database-usage-screen-shows-500-error-when_APP_USAGE_STATS-is-disabled	2023-03-24 21:33:42 +05:30
Jake Barnby	0071b9d885	Generate specs	2023-03-24 20:59:12 +13:00
Jake Barnby	48b018fd9d	Merge remote-tracking branch 'origin/1.3.x' into feat-relations-2	2023-03-24 20:53:41 +13:00
Christy Jacob	5f10ff4d3b	Merge branch 'feat-db-pools-master' of https://github.com/appwrite/appwrite into feat-db-pools-sync	2023-03-24 06:35:30 +00:00
Torsten Dittmann	10cd97e978	Merge branch '1.3.x' of https://github.com/appwrite/appwrite into feat-team-prefs	2023-03-23 13:03:50 +01:00
Torsten Dittmann	0fc4d5f49a	chore: generate specs	2023-03-23 11:28:15 +01:00
Torsten Dittmann	818d111068	fix: wrong team event descriptions	2023-03-23 10:52:43 +01:00
Damodar Lohani	25d94f0995	hyphen to underscore	2023-03-22 08:47:01 +00:00
Damodar Lohani	afe049ec9a	fix format	2023-03-22 08:44:18 +00:00
Damodar Lohani	a6c515684f	locales config	2023-03-22 08:31:24 +00:00
Bhaskar Singh	8b5e0e1f1a	Updating the exception variable name for easy ... readability	2023-03-21 20:33:42 +05:30
Christy Jacob	e114da1d9a	Merge branch 'master' of github.com:appwrite/appwrite into update-cli-1.2.1	2023-03-20 16:55:02 +05:30
Matej Bačo	e8b11b2d14	Fix scheduler	2023-03-19 10:43:57 +01:00
Bhaskar Singh	ac2085ffa8	Updated error when _APP_USAGE_STATS is disabled ... for usage	2023-03-18 22:12:36 +05:30
Torsten Dittmann	841a8d3fae	chore: generate specs	2023-03-17 10:27:56 +01:00
fogelito	00c1418246	Update response Model.php	2023-03-16 13:48:27 +02:00
fogelito	79bfa025cb	Merge branch 'feat-database-update-attribute' of github.com:appwrite/appwrite into feat-relations-2 ... Conflicts: app/controllers/api/databases.php composer.json composer.lock	2023-03-16 12:14:37 +02:00
Torsten Dittmann	348c2d4ffe	Update app/config/events.php ... Co-authored-by: Christy Jacob <christyjacob4@gmail.com>	2023-03-15 12:11:46 +01:00
fogelito	31fad24603	collections.php	2023-03-14 15:20:56 +02:00
Matej Bačo	c01fcb130c	Merge branch 'feat-db-pools-master' into feat-db-pools-sync	2023-03-14 12:58:54 +01:00
Damodar Lohani	2552916314	sms template tests	2023-03-14 09:13:43 +00:00
Damodar Lohani	c7db44b45f	default sms template	2023-03-14 09:07:42 +00:00
fogelito	9c4b269669	update collections.php with options	2023-03-13 12:59:01 +02:00
Torsten Dittmann	ea1c0d0a1f	chore: generate specs	2023-03-13 15:54:55 +05:30
Damodar Lohani	d5c8807e26	update types	2023-03-13 01:45:23 +00:00
Torsten Dittmann	2178bfc126	Merge branch '1.3.x' of https://github.com/appwrite/appwrite into feat-database-update-attribute	2023-03-10 18:39:11 +05:30
Torsten Dittmann	cb065e4228	fix: openapi specification	2023-03-10 15:36:10 +05:30
Damodar Lohani	1cd0498b15	code format	2023-03-10 02:46:34 +00:00
Bhaskar Singh	31a903d144	Updated the error message for target check fails ... in custom domain creation	2023-03-10 00:24:33 +05:30
Damodar Lohani	5589e5ac58	list of supported templates config for parameter validation	2023-03-09 13:44:23 +00:00
Damodar Lohani	f1adf61337	project attribute update for templates	2023-03-09 13:43:59 +00:00
Torsten Dittmann	fcd9b060fd	chore: generate specs	2023-03-09 16:49:11 +05:30
Torsten Dittmann	01edc57806	Merge branch '1.3.x' of https://github.com/appwrite/appwrite into feat-team-prefs	2023-03-09 16:04:20 +05:30
Damodar Lohani	dbcc70607a	smtp attribute for project	2023-03-09 01:58:59 +00:00
Torsten Dittmann	4f08d8e82a	Apply suggestions from code review ... Co-authored-by: Vincent (Wen Yu) Ge <vincent@appwrite.io>	2023-03-09 02:09:03 +05:30
Bhaskar Singh	b16c789282	Fixing the bracket	2023-03-08 17:23:15 +05:30
Bhaskar Singh	7a4cea9f79	Removed ENV_VARIABLE_INCORRECT_SETUP	2023-03-08 17:21:37 +05:30
Bhaskar Singh	7f3000439a	Updated ENV_VARIABLE_INCORRECT_SETUP to DOMAIN_VARIABLE_INCORRECT	2023-03-08 17:15:55 +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
Torsten Dittmann	496da61cd9	feat: team preferences	2023-03-06 19:54:02 +05:30
Bhaskar Singh	eaf31fdb78	Updated the error to 501 error code for custom ... domain when _APP_DOMAIN and _APP_DOMAIN_TARGET is setup incorrectly	2023-03-05 14:35:47 +05:30
Torsten Dittmann	41277864fd	sdks: fix version number for console sdk	2023-02-28 15:26:37 +05:30
Torsten Dittmann	86134768fc	chore: generate specs	2023-02-28 15:07:30 +05:30
Torsten Dittmann	ae32536be2	Merge branch 'master' of https://github.com/appwrite/appwrite into chore-release-1-3-console-sdk	2023-02-28 14:45:34 +05:30
Lucas Reis	2021dea936	set correct value for logging drivers ... set correct value for logOwl and appSignal logging drivers	2023-02-26 19:31:56 +00:00
Torsten Dittmann	293c0e176b	Merge branch 'master' of https://github.com/appwrite/appwrite into feat-console-sdk	2023-02-26 13:24:55 +05:30
yatharth	b5f02bd6c8	fix error description for duplicate user	2023-02-25 20:36:09 +05:30
Steven Nguyen	0c6ddb8c99	Generate updated specs	2023-02-23 14:47:45 -08:00
Christy Jacob	b8efa441fb	feat: upgrade CLI to 1.2.1	2023-02-22 11:06:21 +05:30
Damodar Lohani	6b6f9edbd6	Merge branch '1.3.x' into feat-13x-master-sync	2023-02-21 07:38:46 +05:45
Damodar Lohani	5acd78463a	Merge remote-tracking branch 'origin/feat-db-pools' into feat-db-pools-master-sync	2023-02-16 00:44:29 +00:00
Damodar Lohani	171f30adb1	Merge remote-tracking branch 'origin/master' into feat-db-pools-master-sync	2023-02-16 00:29:37 +00:00
Torsten Dittmann	244c4e1795	Merge branch 'master' of https://github.com/appwrite/appwrite into 1.2.x	2023-02-15 17:54:23 +01:00
shimon	074d7dad32	test fix	2023-02-14 21:07:13 +02:00
Damodar Lohani	3215e8d8df	Merge remote-tracking branch 'origin/feat-db-pools' into feat-db-pools-master-sync	2023-02-14 04:54:02 +00:00
Damodar Lohani	71d2c45a92	Merge remote-tracking branch 'origin/master' into feat-db-pools-master-sync	2023-02-14 04:35:19 +00: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
Steven Nguyen	bbd39582ba	Update API specs	2023-02-13 16:21:45 -08:00
shimon	f00cc06daf	addressing comments	2023-02-08 18:34:22 +02:00
shimon	5850a454e0	addressing comments	2023-02-05 22:07:46 +02:00
shimon	a30dfd284c	addressing comments	2023-02-02 18:36:32 +02:00
Christy Jacob	e5a6db6133	Merge pull request #4890 from appwrite/doc-clarify-permission ... Update permission and ID param descriptions for grammar and clarity.	2023-01-28 04:15:20 +05:30
shimon	213c4392a1	Merge branch 'feat-db-pools' of github.com:appwrite/appwrite into refactor-internalId-collections-db-pools	2023-01-22 17:21:21 +02:00
Vincent (Wen Yu) Ge	efcaa8ba77	update specs	2023-01-20 17:27:14 -05:00
Christy Jacob	4142ffdb70	feat: update account codes	2023-01-19 17:26:41 +05:30
Christy Jacob	30690f6bc4	Merge pull request #4885 from appwrite/revert-4844-feat-build-size ... Revert "Feat: Build output size"	2023-01-19 15:04:35 +05:30
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	a852672bff	Merge branch 'feat-db-pools' of github.com:appwrite/appwrite into feat-new-usage-stats	2023-01-15 17:18:32 +02:00
Vincent (Wen Yu) Ge	d9edc65e9d	Generate specs for 1.2.x	2023-01-13 15:30:48 -05:00
Torsten Dittmann	f6744fc07a	feat: add console sdk	2023-01-13 13:29:22 +01:00
Damodar Lohani	f41e3b1e8f	Merge remote-tracking branch 'origin/master' into feat-db-pools-master-sync	2023-01-12 07:25:23 +00:00
Steven Nguyen	2b4dbfb4b9	Convert _APP_STORAGE_DEVICE env var to lowercase ... This is done for backwards compatibility. Up to utopia-php/storage version 0.12.X, the devices were not lowercase. Starting 0.13.X, they are all converted to lowercase, but people would still have the old case in their .env file. This change makes the value check insensitive so that the value from older versions still works.	2023-01-11 11:41:26 -08:00
Christy Jacob	9f9daf900a	feat: review comments	2023-01-11 17:11:33 +05:30
Christy Jacob	e3a2135515	feat: linter fixes	2023-01-10 20:18:45 +05:30
Christy Jacob	78a057ebf9	feat: add code to account creation endpoint	2023-01-09 22:39:58 +05:30
Matej Bačo	014457636c	Fix missing env var category	2022-12-27 23:58:30 +01:00
Matej Bačo	df0409d25c	Update specs	2022-12-27 16:18:55 +01:00
Matej Bačo	ccc9432219	Merge branch 'master' into fix-1.2.x-conflicts	2022-12-27 08:29:10 +01:00
Matej Bačo	3826937a7b	Update 1.2 specs	2022-12-26 13:16:12 +01:00
Matej Bačo	14b6aa0e8e	Update SDK versions	2022-12-26 13:08:31 +01:00
shimon	0ac5e293b6	add internalId to collections	2022-12-25 14:13:52 +02:00
shimon	586c7fac7c	add internalId to collections	2022-12-25 14:07:54 +02:00
shimon	f3dcd6a79f	add internalId to collections	2022-12-25 13:06:25 +02:00
shimon	b89e04f561	add internalId to collections	2022-12-22 19:18:54 +02:00
Steven	9167b10c81	Merge branch 'master' into fix-4782-email-body-fr-translation	2022-12-21 11:45:50 -08:00
shimon	5e394fed5d	refactor usage worker	2022-12-21 21:03:09 +02:00
shimon	c6b3fb39b1	Merge branch 'feat-db-pools' of github.com:appwrite/appwrite into feat-new-usage-stats ... Conflicts: app/console app/workers/builds.php docker-compose.yml src/Appwrite/Usage/Stats.php	2022-12-21 09:58:22 +02:00
Jake Barnby	2ee9f2607f	Remove redundant code	2022-12-21 19:15:42 +13:00
Christy Jacob	ff9bccf1ff	Revert "Feat: Build output size"	2022-12-20 18:26:56 +05:30
Christy Jacob	adb21683e0	Merge pull request #4285 from vrabe/update-zh-tw-translation ... update zh-tw translation	2022-12-20 02:31:41 +05:30
Jake Barnby	09a6726afa	Update specs	2022-12-19 20:52:14 +13:00
Matej Bačo	8f363eae7a	Fix bugs	2022-12-18 08:35:16 +01:00
Matej Bačo	ab68bb4ea1	Merge branch 'feat-db-pools' into feat-build-size	2022-12-18 08:21:41 +01:00
Matej Bačo	c5da386d67	PR review changes	2022-12-18 08:20:50 +01:00
Damodar Lohani	0eae73e7b8	fix: password comparison	2022-12-18 06:27:41 +00:00
Christy Jacob	90e93f3255	Merge branch 'master' of https://github.com/appwrite/appwrite into feat-db-pools	2022-12-16 15:42:40 +00:00
Damodar Lohani	8e7b89ec03	feat: check password history	2022-12-16 10:22:39 +00:00
Jake Barnby	ab08f0ca40	Fix prism settings for graphql platforms	2022-12-15 13:39:13 +13:00
fogelito	f96128e14f	Changing Id	2022-12-14 17:42:25 +02:00
shimon	961c408885	metric negative / positive values in worker	2022-12-14 09:34:04 +02:00
shimon	06aee565a8	addressing comments	2022-12-13 13:46:53 +02:00
shimon	141d55bd36	build+functions worker	2022-12-13 09:35:05 +02:00
Matej Bačo	fe27670e1f	New attribute + migration	2022-12-12 13:39:43 +01:00
shimon	3242bd9b2a	Merge branch 'feat-db-pools' of github.com:appwrite/appwrite into feat-new-usage-stats	2022-12-11 20:07:20 +02:00
shimon	0348472345	usage cleanup	2022-12-11 19:15:38 +02:00
shimon	5d63d2f199	functions api usage	2022-12-07 19:01:25 +02:00
Christy Jacob	69d5a25c62	Merge branch 'master' of github.com:appwrite/appwrite into feat-db-pools	2022-12-07 15:39:44 +04:00
Jake Barnby	b6723b7c83	Merge remote-tracking branch 'origin/master' into feat-graphql-support ... # Conflicts: # app/init.php	2022-12-06 20:38:09 +13:00
Matej Bačo	4dfaa5e69a	Fix mimetype size	2022-12-05 14:54:13 +00:00
P.O Marec	31089b76fb	Fix : translation french "emails.certificate.body"	2022-11-26 13:04:46 +01:00
P.O.M	0cd67229a1	Fix : translation french "emails.recovery.body" ... Wrong reference to project variable	2022-11-26 13:04:44 +01:00
Eldad Fux	db345fae41	WIP	2022-11-24 09:53:52 +02:00
Christy Jacob	210b4558c6	Merge branch 'feat-db-pools' of github.com:appwrite/appwrite into feat-usage-refactor-fo-db-pools	2022-11-22 19:52:44 +05:30
Vincent (Wen Yu) Ge	7f95ff31bd	Updated the error descriptions for better SEO.	2022-11-21 15:37:34 +00:00
Matej Bačo	202e4c01d8	Add new executor env vars	2022-11-21 14:23:43 +00:00
Damodar Lohani	14ea8b2197	Merge branch 'feat-db-pools' of https://github.com/appwrite/appwrite into feat-usage-refactor-fo-db-pools	2022-11-21 14:12:22 +00:00
Matej Bačo	421cebced8	Update app/config/variables.php ... Co-authored-by: Christy Jacob <christyjacob4@gmail.com>	2022-11-18 15:17:51 +01:00
Matej Baco	0075956c6c	Introduce ENV to disable console invites, fix outdated code after merge	2022-11-18 09:51:28 +01:00
Christy Jacob	57dd721a61	chore: update volume names	2022-11-18 01:08:43 +05:30
Christy Jacob	71bb70dec4	Merge branch 'feat-db-pools' of github.com:appwrite/appwrite into feat-add-console	2022-11-17 23:27:26 +05:30
Christy Jacob	6c43b44441	feat: use new storage library	2022-11-17 23:16:49 +05:30
Christy Jacob	080abbbb79	Merge branch 'master' of github.com:appwrite/appwrite into feat-add-console	2022-11-17 20:26:10 +05:30
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
Christy Jacob	28087d708d	feat: review comments	2022-11-17 07:03:59 +00:00
Christy Jacob	d830f5c262	feat: review comments	2022-11-17 07:01:11 +00:00
Christy Jacob	261830c122	Merge branch 'feat-db-pools' of https://github.com/appwrite/appwrite into feat-support-dsn	2022-11-17 06:43:49 +00:00
Christy Jacob	d75831380b	feat: review comments	2022-11-17 06:36:41 +00:00
Damodar Lohani	96e67f968f	Merge remote-tracking branch 'origin/feat-db-pools' into feat-usage-refactor-fo-db-pools	2022-11-17 00:31:57 +00:00
Christy Jacob	a233a30d28	Merge pull request #4691 from appwrite/feat-schedules-deletions ... Deleted functions	2022-11-16 20:49:14 +05:30
Christy Jacob	44c85da574	Update app/config/variables.php	2022-11-16 20:47:47 +05:30
shimon	a6fcc59ead	Merge remote-tracking branch 'origin/feat-schedules-deletions' into feat-schedules-deletions ... # Conflicts: # app/config/variables.php	2022-11-16 17:05:27 +02:00
shimon	29db442b99	Deleted functions ... schedules clean up	2022-11-16 17:02:00 +02:00
Christy Jacob	0250754e6f	Update app/config/variables.php	2022-11-16 20:31:36 +05:30
shimon	8edb592138	Deleted functions ... schedules clean up	2022-11-16 17:00:27 +02:00
Shimon Newman	bc6731ff6b	Update app/config/variables.php ... Co-authored-by: Christy Jacob <christyjacob4@gmail.com>	2022-11-16 16:55:41 +02:00
shimon	99823656f0	Deleted functions ... schedules clean up	2022-11-16 16:31:49 +02:00
shimon	dd7bd108cc	Deleted functions ... schedules clean up	2022-11-16 16:14:45 +02:00
Matej Baco	8b000aff40	Merge branch 'feat-db-pools' into refactor-scheduler	2022-11-16 14:13:05 +01:00
Christy Jacob	05318b3168	Merge pull request #4679 from appwrite/feat-realtime-dbpools ... Simplify pool sizing	2022-11-16 16:35:52 +05:30
Christy Jacob	cf4be51094	feat: review comments	2022-11-16 10:43:26 +00:00
Torsten Dittmann	410533be27	chore: generate specs	2022-11-16 11:01:49 +01:00
Jake Barnby	750dcc2a56	Comment out variable	2022-11-16 20:00:20 +13:00
Jake Barnby	c46ba06c51	Update env var name	2022-11-16 19:57:12 +13:00
Jake Barnby	f9d2976c1d	Merge remote-tracking branch 'origin/1.1.x' into feat-graphql-support ... # Conflicts: # CHANGES.md # 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/init.php # app/tasks/sdks.php # composer.lock # docker-compose.yml	2022-11-16 19:37:35 +13:00
Torsten Dittmann	50dc4c3790	chore: refresh specs	2022-11-15 16:43:42 +01:00
Christy Jacob	98fbe18ac4	Merge branch 'feat-db-pools' of https://github.com/appwrite/appwrite into refactor-scheduler	2022-11-15 12:13:44 +00:00
Christy Jacob	3e4a10f42e	Merge pull request #4673 from appwrite/feat-realtime-dbpools ... Feat realtime dbpools	2022-11-15 14:47:51 +05:30
Jake Barnby	702657ebb4	Merge remote-tracking branch 'origin/feat-db-pools' into feat-realtime-dbpools ... # Conflicts: # .env # CHANGES.md # composer.json # composer.lock	2022-11-15 21:22:14 +13:00
Jake Barnby	ada54cacd0	Update default env values	2022-11-15 20:29:27 +13:00
Torsten Dittmann	aea13bad72	Merge branch 'chore-prepare-1-1-0' of https://github.com/appwrite/appwrite into feat-console-rewrite	2022-11-14 22:54:23 +01:00
Christy Jacob	d7d41b4b6b	feat: move project endpoint to another service	2022-11-14 23:52:04 +05:30
Bradley Schofield	3c71164741	Merge branch '1.1.x' into feat-implement-session-length-api	2022-11-14 15:30:38 +00:00
Torsten Dittmann	310ff90d22	Merge branch '1.1.x' of https://github.com/appwrite/appwrite into feat-console-rewrite	2022-11-14 15:57:40 +01:00
Torsten Dittmann	465dad522e	fix: remove unnecessary files	2022-11-14 15:31:24 +01:00
Bradley Schofield	43d4d6fec3	Address Eldad's Comments	2022-11-14 09:57:37 +00:00
Jake Barnby	702bb413dc	Merge remote-tracking branch 'origin/feat-mysql-test' into feat-realtime-dbpools ... # Conflicts: # .env # app/config/variables.php # app/init.php # app/realtime.php # composer.lock	2022-11-14 11:21:58 +13:00
shimon	745ae7a4c8	Merge branch 'feat-db-pools' of github.com:appwrite/appwrite into refactor-scheduler	2022-11-10 20:07:32 +02:00
shimon	aef565c8ff	addressing comments	2022-11-10 18:40:12 +02:00
Matej Bačo	192cf2e20d	PR review changes + fix test	2022-11-10 12:04:49 +00:00
Matej Bačo	6c6e1caefc	Improve ENV vars documentation	2022-11-10 09:37:49 +00:00
Jake Barnby	4fe2289e7f	Add max connections variable	2022-11-09 16:24:42 +13:00
Damodar Lohani	5bd4b6e59d	Merge branch 'feat-db-pools' of https://github.com/appwrite/appwrite into feat-usage-refactor-fo-db-pools	2022-11-09 01:21:04 +00:00
Matej Bačo	940eee0562	Merge remote-tracking branch 'origin/feat-decouple-executor' into feat-db-pools-opr	2022-11-08 12:39:25 +00:00
Matej Bačo	a52ff7372a	Add Open Runtimes Executor	2022-11-08 08:49:45 +00:00
Christy Jacob	1d4afd2f6c	Merge branch 'feat-db-pools' of github.com:appwrite/appwrite into feat-mysql-test	2022-11-07 16:45:28 +05:30
shimon	ef7b53fbc7	queue	2022-11-06 23:41:33 +02:00
shimon	ed505fba7c	queue	2022-11-06 15:10:26 +02:00
Damodar Lohani	5756a7e117	Merge remote-tracking branch 'origin/feat-fixes-for-pools' into feat-usage-refactor-fo-db-pools	2022-11-06 08:10:01 +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
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
Eldad Fux	1ff53bc82a	Merge branch 'master' of https://github.com/appwrite/appwrite into feat-fixes-for-pools	2022-11-04 07:26:35 +02:00
shimon	bc631d926e	ticker	2022-11-04 07:12:08 +02:00
Damodar Lohani	4ef05e2a16	Merge remote-tracking branch 'origin/master' into feat-usage-refactor-fo-db-pools	2022-11-04 04:22:50 +00:00
Everly Precia Suresh	e869debc76	resolve merge conflicts	2022-11-03 15:20:20 +00:00
Bradley Schofield	4b8287c097	Remove 'expire' from sessions	2022-11-03 15:03:39 +00:00
Damodar Lohani	41d31c28d0	remove buildTime from deployments collection	2022-11-02 15:38:59 +05:45
Damodar Lohani	b66f932b3b	Merge remote-tracking branch 'origin/1.1.x' into feat-usage-refactor	2022-11-02 08:43:12 +00:00
Christy Jacob	e9239717d7	Merge branch 'master' of github.com:appwrite/appwrite into sync-1.2.x	2022-11-02 10:16:16 +05:30
Christy Jacob	c074731615	Merge pull request #4590 from rskbansal/master ... fixed grammatical and spelling errors	2022-11-02 07:38:45 +05:30
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
Christy Jacob	5ea19cd539	Merge pull request #3848 from appwrite/refactor-remove-beta ... Remove beta tag from Android, Kotlin, Apple and Swift	2022-11-01 12:35:56 +05:30
Christy Jacob	4331e1ef03	feat: update PR	2022-11-01 04:55:13 +00:00
Damodar Lohani	8baa95db1c	Merge remote-tracking branch 'origin/1.1.x' into feat-usage-refactor	2022-11-01 04:54:48 +00:00
Christy Jacob	a6499e34a3	Merge branch 'master' of https://github.com/appwrite/appwrite into feat-mysql-test	2022-11-01 04:52:07 +00:00
Jake Barnby	8a4fd3307d	Merge remote-tracking branch 'origin/master' into feat-graphql-support ... # Conflicts: # composer.json # composer.lock	2022-11-01 11:38:23 +13:00
Damodar Lohani	11f3474cb8	buildTime attribute to deployment ... (cherry picked from commit 7989518eec)	2022-11-01 11:04:27 +13: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
Damodar Lohani	7989518eec	buildTime attribute to deployment	2022-10-31 09:07:06 +00:00
Torsten Dittmann	d387f198db	Merge branch 'master' of https://github.com/appwrite/appwrite into rebase-1.1.x	2022-10-31 09:45:51 +01:00
Damodar Lohani	982a449143	Merge remote-tracking branch 'origin/feat-db-pools' into feat-usage-refactor-fo-db-pools	2022-10-31 06:49:37 +00:00
Damodar Lohani	4086ba93ad	Merge remote-tracking branch 'origin/1.1.x' into feat-usage-refactor	2022-10-31 06:36:26 +00:00