CodeMirror/appwrite
1
0
Fork 0
mirror of synced 2024-07-07 23:46:11 +12:00
Code Issues Projects Releases Wiki Activity
20210 commits 206 branches 384 tags 334 MiB
Commit graph

709 commits

Author SHA1 Message Date
prateek banga 161bbfb822 Merge branch '1.4.x' of https://github.com/appwrite/appwrite into sync-1.4.x-to-1.5.x 2023-10-20 14:55:17 +05:30
德华 刘 de8b9638d5 chore: update backup timings 2023-10-19 16:07:54 +00:00
shimon 2451d9fef1 Merge branch '1.4.x' of github.com:appwrite/appwrite into refactor-workers-sn 
 Conflicts:
	src/Appwrite/Platform/Workers/Deletes.php
 2023-10-16 17:06:59 +03:00
shimon 94178f8eaf rollback to Usage 2023-10-15 20:41:09 +03:00
Steven Nguyen 3f2f6ab43a
Ensure permissions are updated when a project moves orgs 
Since the following collections also have permissions set to the team,
the team should be updated for consistency:

- installations
- repositories
- vcsComments
 2023-10-12 17:34:53 -07:00
Steven Nguyen 3bb22c38cc
Update teamInternalId when updating project team 
This is important because when an organization is deleted, projects are
fetched by the teamInternalId and if the teamInternalId is not updated
when the project team is updated, the project will be deleted if the
previous organization is deleted.
 2023-10-12 17:03:45 -07:00
shimon 893b1d0ba7 Merge branch 'main' of github.com:appwrite/appwrite into refactor-workers 
 Conflicts:
	.gitmodules
	app/controllers/api/functions.php
	app/controllers/api/health.php
	app/init.php
	app/views/install/compose.phtml
	composer.lock
	src/Appwrite/Migration/Migration.php
	src/Appwrite/Platform/Workers/Builds.php
	src/Appwrite/Platform/Workers/Deletes.php
	src/Appwrite/Platform/Workers/Functions.php
	src/Executor/Executor.php
 2023-10-11 12:08:13 +03:00
Prateek Banga 1e5a2a78aa Merge branch '1.4.x' of https://github.com/appwrite/appwrite into sync-1.5.x-with-1.4.x 2023-10-10 17:46:44 +05:30
shimon 31466c44d8 update projects database 2023-10-08 16:44:14 +03:00
Prateek Banga d5cc214546 Merge branch 'main' of https://github.com/appwrite/appwrite into sync-main-1.5.x 2023-10-06 03:44:36 +05:30
Christy Jacob 32ba34cba5 chore: add database overrides 2023-10-05 05:58:52 +00:00
Christy Jacob adbbb6dc20 chore: add database overrides 2023-10-05 05:53:49 +00:00
shimon 429dabaaee sync with 1.4 2023-10-03 19:50:48 +03:00
Christy Jacob ff3c25d352 chore: update database 2023-10-02 22:23:35 +00:00
Christy Jacob 29ad61d461 chore: update database 2023-10-02 22:01:42 +00:00
Christy Jacob b456c9df2c chore: remove DB creates 2023-10-02 21:32:05 +00:00
shimon 75d8741eaa sync against master 2023-10-01 21:30:52 +03:00
Christy Jacob ac844d33ef Merge branch '1.4.x' of https://github.com/appwrite/appwrite into cl-1.4.x 2023-09-27 23:25:48 +00:00
shimon c4bd6e008e Merge branch 'master' of github.com:appwrite/appwrite into refactor-workers 
 Conflicts:
	.env
	app/cli.php
	app/config/collections.php
	app/console
	app/controllers/api/account.php
	app/controllers/api/databases.php
	app/controllers/api/functions.php
	app/controllers/api/projects.php
	app/controllers/api/storage.php
	app/controllers/api/teams.php
	app/controllers/api/users.php
	app/controllers/general.php
	app/controllers/shared/api.php
	app/init.php
	app/worker.php
	app/workers/audits.php
	app/workers/builds.php
	app/workers/certificates.php
	app/workers/databases.php
	app/workers/deletes.php
	app/workers/functions.php
	app/workers/mails.php
	bin/worker-usage
	composer.json
	composer.lock
	docker-compose.yml
	src/Appwrite/Event/Delete.php
	src/Appwrite/Event/Mail.php
	src/Appwrite/Platform/Tasks/Maintenance.php
 2023-09-27 18:51:17 +03:00
Vincent (Wen Yu) Ge 86f0e6008c
Merge branch 'master' into sentence-case 2023-09-27 11:11:58 -04:00
Christy Jacob c7e6efc050 chore: update backups schedule 2023-09-21 10:23:55 +00:00
prateek banga e104e6d0f2 Merge branch 'feat-add-messaging-collections-in-config' into feat-add-messaging-providers 2023-08-31 18:16:48 +05:30
Jake Barnby 922332042e
Fix template strings 2023-08-30 20:31:11 -04:00
Jake Barnby d3929a5bae
Fix forced username and password requirement 2023-08-30 01:31:02 -04:00
Matej Bačo c98d5bd3cd Fix SMTP after QA 2023-08-29 11:40:30 +02:00
Matej Bačo d4acbcf4f0 Add domain_enabled var 2023-08-28 16:08:50 +02:00
Matej Bačo f130a9ebc9 linter fix 2023-08-28 14:21:35 +02:00
Matej Bačo 89c9f8da6a Implement proper behaviour for SMTP sender 2023-08-28 14:19:37 +02:00
Bradley Schofield 82f400d177 Add more HTML back 2023-08-28 09:03:55 +01:00
Bradley Schofield 88d48715c5 Run Linter 2023-08-28 06:53:26 +01:00
Bradley Schofield 1f1e7dd397 Remove Testing Bypasses 2023-08-28 05:55:40 +01:00
Bradley Schofield 608b6b3847
Continue work 2023-08-27 23:45:37 +01:00
Matej Bačo 596e59f2cc response format fix, smtp QA fixes 2023-08-25 17:13:25 +02:00
Matej Bačo 293e44e91e Introduce SMTP ping timeout 2023-08-24 13:04:49 +02:00
Jake Barnby 3ec84986b2
Fix project imports 2023-08-22 22:04:36 -04:00
Jake Barnby b48a64d1ad
Merge remote-tracking branch 'origin/cl-1.4.x' into feat-git-integration 
# Conflicts:
#	app/controllers/api/functions.php
#	composer.json
#	composer.lock
#	tests/e2e/Services/Databases/DatabasesConsoleClientTest.php
 2023-08-22 00:59:36 -04:00
Jake Barnby 942705b5f3
Fix database upgrade 2023-08-21 23:25:55 -04:00
shimon 83ffea68d1 rolling back usage flow 2023-08-20 16:53:26 +03:00
shimon 8147f3ee7d rolling back usage flow 2023-08-20 15:29:43 +03:00
prateek banga 92e587769a resolve merge conflicts 2023-08-16 15:16:45 +05:30
Matej Bačo 93735ac4a7 Merge remote-tracking branch 'origin/cl-1.4.x' into feat-git-integration 2023-08-09 12:30:45 +02:00
Christy Jacob 82a206d808 Merge branch 'cl-1.4.x' of https://github.com/appwrite/appwrite into disallow-personal-data 2023-08-08 16:48:59 +00:00
prateek banga 9057a50a10 rename provider param in config 2023-08-07 15:54:00 +05:30
Matej Bačo 906f86fbb8 Merge branch 'cloud-1.4.x' into feat-git-integration 2023-08-06 09:31:32 +02:00
Steven Nguyen d960f85da6
Merge branch '1.4.x' into cloud-1.4.x 2023-08-04 18:07:33 -07:00
Steven Nguyen aa3c2faed9
Merge tag '1.3.8' into cloud-1.3.x-2 2023-08-04 13:55:07 -07:00
Dakshi 12228ccef4 converted desc to sentence case 2023-08-01 20:56:48 +05:30
Christy Jacob c26194e189 Merge branch '1.4.x' of github.com:appwrite/appwrite into disallow-personal-data 2023-07-20 17:19:18 +04:00
Christy Jacob 6cdc8a97b7 chore: update tests 2023-07-20 17:12:41 +04:00
Eldad A. Fux 66fee90af9
Merge pull request #5199 from appwrite/feat-custom-smtp 
[FEAT] Custom SMTP and Template support
 2023-07-20 07:09:11 +03:00
Christy Jacob 4c8608b49c chore: update naming conventions 2023-07-20 02:24:32 +04:00
Christy Jacob e493551f8a Merge branch '1.4.x' of github.com:appwrite/appwrite into disallow-personal-data 2023-07-20 01:44:25 +04:00
Damodar Lohani 4fd5c72f34 Merge branch 'master' into feat-1.4.x-with-1.3.x-master 2023-07-19 07:39:37 +00:00
Damodar Lohani 8dc5c2cb4c Merge remote-tracking branch 'origin/1.4.x' into feat-custom-smtp 2023-07-19 07:24:58 +00:00
Damodar Lohani 14f8cc57af
Update app/controllers/api/projects.php 
Co-authored-by: Eldad A. Fux <eldad.fux@gmail.com>
 2023-07-19 12:04:37 +05:45
Damodar Lohani ff6dd0990d
Update app/controllers/api/projects.php 
Co-authored-by: Eldad A. Fux <eldad.fux@gmail.com>
 2023-07-19 12:04:29 +05:45
Christy Jacob e0aa3db21e Merge branch '1.4.x' of https://github.com/appwrite/appwrite into disallow-personal-data 2023-07-11 19:36:37 +00:00
Damodar Lohani f59d3563f4 Merge remote-tracking branch 'origin/feat-db-pools-master' into feat-db-pools-db-pools-master-sync 2023-07-10 03:06:48 +00:00
Steven Nguyen 33f5cbeca6
Restrict characters for project ID 
Only allow lowercase alphanumeric chars and hyphens
because the project ID is used as part of url
schemes to redirect users back to mobile apps
and certain characters are not allowed.
 2023-06-23 16:22:42 -07:00
Christy Jacob 72e9ddd3f1
Merge pull request #5708 from appwrite/chore-update-database-config 
feat: update database config
 2023-06-15 20:57:21 +05:30
Christy Jacob 4c68e396c1 feat: update backup time 2023-06-15 14:35:21 +00:00
Damodar Lohani 57411db2d3 upadate to use refactored collections config 2023-06-15 00:34:12 +00:00
Jake Barnby 031f8270ff
Merge remote-tracking branch 'origin/1.4.x' into validator-mv 
# Conflicts:
#	composer.lock
 2023-06-15 12:28:32 +12:00
Christy Jacob 25e2771fa7 feat: update database config 2023-06-14 19:52:28 +00:00
Christy Jacob a9e2eca8a4
Merge pull request #5683 from appwrite/master 
Update 1.4.x from Master
 2023-06-12 13:20:26 +05:30
shimon fd4f86b1c1 functions/builds/deletes worker 2023-06-11 13:29:04 +03:00
Christy Jacob 845fd7ba68 fix: missing import 2023-06-07 15:13:57 +05:30
Christy Jacob 8fdb9e6592
Update app/controllers/api/projects.php 2023-06-06 17:51:42 +05:30
Christy Jacob 5c6cbbe370 chore: review comments 2023-06-06 12:11:50 +00:00
Christy Jacob 9f02ed700d feat: update db backups schedule 2023-06-06 12:09:14 +00:00
Damodar Lohani f373d30a45 formatting 2023-06-05 07:11:53 +00:00
shimon 6a9011af72 minor changes 2023-06-02 17:14:10 +03:00
shimon 5c9ad6fddd minor changes 2023-06-02 17:01:15 +03:00
shimon f5c4e4cd8a minor changes 2023-06-02 16:52:38 +03:00
shimon 9a071df378 minor changes 2023-06-02 16:23:21 +03:00
shimon 071b2e5826 Extract db from list while backing 2023-06-02 11:06:35 +03:00
shimon ea8804fd52 Extract db from list while backing 2023-06-02 08:10:03 +03:00
Damodar Lohani 62bbace433 fix name 2023-05-31 08:20:45 +00:00
Damodar Lohani 237658f4e8 fix param 2023-05-25 05:33:06 +00:00
Damodar Lohani 6813d53e06 remove password required for project deletion 2023-05-25 00:32:49 +00:00
Christy Jacob 54ad50bd4b feat: review comments 2023-05-24 20:07:31 +00:00
Christy Jacob 48ca2530e6 feat: add missing attribute 2023-05-23 14:46:48 +00:00
Christy Jacob 8be36088d7 chore: linter 2023-05-23 14:38:48 +00:00
Christy Jacob f0df316b4f fix: throw correct exception when project custom ID already exists 2023-05-23 14:38:33 +00:00
Damodar Lohani 5a9f83c43d validate smtp configuration 2023-05-23 05:09:17 +00:00
shimon 432ee72071 Merge branch 'feat-db-pools' of github.com:appwrite/appwrite into refactor-workers 
 Conflicts:
	app/cli.php
	app/console
	app/controllers/api/account.php
	app/controllers/api/functions.php
	app/controllers/api/teams.php
	app/controllers/shared/api.php
	app/init.php
	app/worker.php
	app/workers/builds.php
	app/workers/certificates.php
	app/workers/deletes.php
	app/workers/functions.php
	app/workers/mails.php
	src/Appwrite/Event/Event.php
	src/Appwrite/Event/Mail.php
 2023-05-22 18:41:24 +03:00
Christy Jacob d630d8772b
Merge pull request #5460 from appwrite/fix-create-project-error 
fix: throw correct exception when project ID already exists
 2023-05-19 22:48:02 +05:30
Damodar Lohani ab28f08480 fix default template sender name 2023-05-17 08:25:24 +00:00
Christy Jacob 12afc294bd feat: add checks for domain 2023-05-13 23:35:05 +05:30
Damodar Lohani 6be37d1ae4 code organization 2023-05-11 06:56:16 +00:00
Damodar Lohani f70712865e refactor 2023-05-11 06:52:27 +00:00
Eldad A. Fux 18039f5ba1
Merge pull request #5257 from appwrite/feat-pause-project 
[FEAT] Enable/Disable all services
 2023-05-11 07:00:04 +01:00
Damodar Lohani b1cf55db6e fix formatting 2023-05-11 01:43:26 +00:00
fogelito d55dc7a5b2 Merge branch 'master' of github.com:appwrite/appwrite into validator-mv 2023-05-07 12:23:02 +03:00
Christy Jacob 60f51580a7
Merge pull request #5246 from singhbhaskar/fix-4960-Database-usage-screen-shows-500-error-when_APP_USAGE_STATS-is-disabled 
Fix: Updated error when _APP_USAGE_STATS is disabled
 2023-05-04 20:47:50 +05:30
Damodar 3da853af2e fix email template issue 2023-05-04 07:33:17 +00:00
fogelito c51d4b386b Merge branch 'master' of github.com:appwrite/appwrite into validator-mv 
 Conflicts:
	composer.json
	composer.lock
 2023-05-03 14:56:03 +03:00
fogelito 5be5a7dd0e Empty queries fixes 2023-05-03 14:53:40 +03:00
Damodar Lohani 13a2dfa5cd method to update project team 2023-05-02 06:59:17 +00:00
fogelito 5e4ff01568 getByType 2023-05-01 12:18:50 +03:00