Commit graph

980 commits

Author SHA1 Message Date
Khushboo Verma
d3b0b00917 Allow users to disable APIs 2024-03-04 23:12:54 +01:00
Jake Barnby
74a3d6531f
Merge remote-tracking branch 'origin/refactor-usage-sn' into feat-isolation-modes
# Conflicts:
#	composer.json
#	composer.lock
#	src/Appwrite/Platform/Tasks/CalcTierStats.php
#	tests/e2e/Services/Projects/ProjectsConsoleClientTest.php
2024-03-04 19:50:10 +01:00
Torsten Dittmann
7fa578c901 Merge branch 'main' of https://github.com/appwrite/appwrite into sync-main-1.5.x 2024-03-01 14:20:32 +01:00
Khushboo Verma
af3d6b2308 Allow ssl along with tls in custom smtp 2024-02-26 20:40:41 +05:30
Jake Barnby
6c4b0ecd5b
Simplify allow list 2024-02-20 23:27:40 +13:00
Jake Barnby
5747b33e38
Make self-hosted and cloud specs consistent 2024-02-20 23:15:46 +13:00
Christy Jacob
48e87cdc7c Merge branch 'main' of github.com:appwrite/appwrite into mock-numbers 2024-02-14 21:24:53 +05:30
Jake Barnby
06b15c79ff
Merge pull request #7572 from appwrite/attributes-query-fix
fix Indexes
2024-02-13 12:37:59 +13:00
fogelito
ace75b0786 parseQueries 2024-02-12 18:02:04 +02:00
fogelito
e5bada0493 typo 2024-02-12 12:03:31 +02:00
fogelito
adbe11fd50 fix Indexes 2024-02-12 11:55:45 +02:00
Christy Jacob
be92aa92e5 chore: rename files 2024-02-11 20:28:05 +05:30
Christy Jacob
89dcc34453 feat: initial commit 2024-02-11 20:21:19 +05:30
Matej Bačo
abb1007385 Rework project creation 2024-02-07 12:04:46 +01:00
Matej Bačo
a89b73d20b Fix bug 2024-02-07 10:48:02 +01:00
Matej Bačo
d5216d5b14 Linter fix 2024-02-07 10:17:34 +01:00
Matej Bačo
939aec866e Add getProxyProjectDatabase hook 2024-02-07 10:16:17 +01:00
Matej Bačo
a7e95588c6 Fix bug on ZDT 2024-02-06 16:08:42 +01:00
Matej Bačo
8154b4c131 Linter fix 2024-02-06 12:11:27 +01:00
Matej Bačo
d4afe22396 Add ZDT migration support to project creation 2024-02-06 12:07:47 +01:00
fogelito
a782e20315 Merge branch '1.5.x' of github.com:appwrite/appwrite into json-parsing
 Conflicts:
	app/controllers/api/account.php
	composer.json
	composer.lock
	src/Appwrite/Platform/Tasks/CalcTierStats.php
	tests/e2e/Services/Account/AccountBase.php
2024-01-25 17:44:05 +02:00
Torsten Dittmann
9f5a0312cf Merge branch 'main' of https://github.com/appwrite/appwrite into 1.5.x 2024-01-24 11:24:59 +01:00
Matej Bačo
724b8c8098 Merge remote-tracking branch 'origin/1.5.x' into feat-smtp-test 2024-01-22 10:13:28 +00:00
Khushboo Verma
3a1fe3b2a7 Add webhook tests 2024-01-18 15:19:57 +05:30
Matej Bačo
20322589dd Improve SMTP test email design 2024-01-17 11:22:08 +00:00
Matej Bačo
ffa4ad09ec Merge remote-tracking branch 'origin/1.5.x' into feat-smtp-test 2024-01-15 11:07:32 +00:00
Matej Bačo
8668f15835 Linter fix 2024-01-15 11:02:05 +00:00
Matej Bačo
d5be48a846 Finish custom SMTP feature 2024-01-15 10:18:17 +00:00
Torsten Dittmann
9ba2eafa83
fix: escape html in email params (#7409)
* fix: escape html in email params

* revert: phpunit stop on failure

* chore: fix linter
2024-01-08 18:08:17 +01:00
Khushboo Verma
bbd551cf0d Reset attempts to 0 on successful request 2024-01-05 17:54:20 +05:30
Khushboo Verma
6d8443d5cd Addressed PR comments 2024-01-05 15:13:54 +05:30
Khushboo Verma
f14285b65b Update webhook endpoints 2024-01-02 16:17:02 +05:30
Khushboo Verma
d418a581b7 Allow only public domains in webhook url 2023-12-28 15:16:08 +05:30
Eldad Fux
90e8e04e08 Fixed test 2023-12-20 00:15:45 +01:00
Eldad Fux
ed999031d0 Fixed whitespace 2023-12-19 22:46:35 +01:00
Eldad Fux
64138d6ccf Added new endpoint 2023-12-19 16:08:09 +01:00
Khushboo Verma
d5cc9d9eea Addressed PR Comments 2023-12-15 01:45:17 +05:30
fogelito
cc5ae73f57 purgeCached changes 2023-12-14 15:32:06 +02:00
Khushboo Verma
16addeba10 Fixed some errors 2023-12-13 03:00:16 +05:30
Jake Barnby
4710310629
Check if self-hosted 2023-12-08 18:33:35 +01:00
fogelito
2fe50717d1 TYPE_CURSOR_AFTER TYPE_CURSOR_BEFORE 2023-12-06 15:10:40 +01:00
Jake Barnby
7e12da5a2a
Use hard-coded DB name instead of project attribute 2023-11-30 16:32:15 +13:00
Jake Barnby
7104f9e2c8
Add comments marking shareTables project attributes + header overrides as temporary 2023-11-28 02:08:04 +13:00
Jake Barnby
9472bff8f9
Fix project create tenant set/reset 2023-11-28 00:27:41 +13:00
Jake Barnby
7b8e37b03d
Update method names 2023-11-27 15:22:05 +13:00
shimon
21895e3ac0 Merge branch '1.4.x' of github.com:appwrite/appwrite into refactor-usage-sn
 Conflicts:
	.gitmodules
	CHANGES.md
	Dockerfile
	app/controllers/api/storage.php
	app/init.php
	composer.lock
	src/Appwrite/Migration/Migration.php
	src/Appwrite/Platform/Services/Tasks.php
	src/Appwrite/Usage/Calculators/TimeSeries.php
2023-11-26 10:28:17 +02:00
Jake Barnby
f44543f083
Add shareTables attribute to project 2023-11-23 01:12:19 +13:00
Jake Barnby
cefc1b6519
Add base share tables check when creating project 2023-11-23 01:11:48 +13:00
Khushboo Verma
2c04c98801 Renamed webhook variables 2023-11-20 19:49:15 +05:30
Khushboo Verma
2bcb6c18fb Merge branch '1.5.x' into fix-limit-failed-webhook-attempts 2023-11-20 17:40:32 +05:30
Khushboo Verma
22f02243c6 Resolved merge conflicts 2023-11-14 14:29:46 +05:30
Khushboo Verma
3f584b85be Limit webhook failure attempts to 10 2023-11-14 14:20:26 +05:30
prateek banga
8f53301209 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into more_review_changes 2023-11-14 12:26:35 +05:30
Prateek Banga
3ade88897c Merge branch 'main' of https://github.com/appwrite/appwrite into chore-sync-main-1.5.x 2023-11-10 12:49:05 +05:30
Prateek Banga
3654799cc7 links ISO 8601, move params in messaging controllers 2023-11-09 14:53:42 +05:30
shimon
f64d0ab8a8 Merge branch '1.4.x' of github.com:appwrite/appwrite into refactor-usage-sn
 Conflicts:
	.gitmodules
	CHANGES.md
	Dockerfile
	composer.lock
	src/Appwrite/Migration/Migration.php
2023-11-05 17:03:13 +02:00
Christy Jacob
9fded16d3f
Merge pull request #7053 from appwrite/1.4.x
Sync main with 1.4.x
2023-10-31 12:27:08 +04:00
德华 刘
744f2fbc1c chore: update project creation database allocation 2023-10-30 14:46:54 +00:00
Steven Nguyen
3206cee36f
Leave user placeholder in default email template
This matches up with the default template and gives the developer an
idea about the available variables and how to use them.
2023-10-26 16:23:58 -07:00
prateek banga
fd4a81c4fc made review changes 2023-10-25 23:03:23 +05:30
shimon
9fad9dca88 usage sync 2023-10-25 10:39:59 +03:00
Jake Barnby
d5b6421285
Merge remote-tracking branch 'origin/1.4.x' into sync-1.4.x-to-1.5.x
# Conflicts:
#	composer.lock
2023-10-24 19:46:57 +13:00
德华 刘
3dee8d6ecd fix: update incorrect method call 2023-10-23 08:34:57 +00:00
Shimon Newman
808f682fa7
Update app/controllers/api/projects.php
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2023-10-23 11:25:31 +03:00
shimon
2ef8490691 fix mod condition 2023-10-23 11:22:28 +03:00
shimon
b09a254d3c fix mod condition 2023-10-23 10:46:15 +03:00
shimon
a841734d50 fix mod condition 2023-10-23 01:05:10 +03:00
shimon
ac231914d4 fix mod condition 2023-10-23 00:55:57 +03:00
shimon
0d5127d90b fix mod condition 2023-10-23 00:08:55 +03:00
德华 刘
00d2a5ffcd chore: update create projects endpoints 2023-10-22 18:33:15 +00:00
德华 刘
79612bd80f Merge branch 'main' of https://github.com/appwrite/appwrite into feat-sm-db 2023-10-22 18:30:14 +00:00
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
Christy Jacob
3451d3d800 chore: linter 2023-04-29 12:44:07 +05:30
Christy Jacob
ac004acbc8 fix: throw correct exception when project custom ID already exists 2023-04-29 12:41:17 +05:30
Damodar Lohani
616dee24d7 replace template variables with values 2023-04-28 07:30:27 +00:00
Damodar Lohani
b1bbc9dfbd Merge remote-tracking branch 'origin/master' into feat-custom-smtp 2023-04-28 07:11:17 +00:00
Torsten Dittmann
e1cf068652 fix: platforms query 2023-04-27 17:36:00 +02:00
Bhaskar Singh
3865f48d32 Moved check for _APP_USAGE_STATS
to create init hook for App
2023-04-21 23:09:01 +05:30
Damodar Lohani
ac9f434c85 more fixes and reset endpoints 2023-04-19 08:44:22 +00:00
Damodar Lohani
07ebb3fae5 fix validator 2023-04-18 07:15:51 +00:00
Damodar Lohani
4719970c93 fix locale 2023-04-18 05:31:18 +00:00
Damodar Lohani
16695a4b6d fix errors 2023-04-17 08:04:52 +00:00
Damodar Lohani
591fd9d734 generate specs 2023-04-17 02:33:50 +00:00
Damodar Lohani
95054434d8 update locale validator 2023-04-17 02:28:49 +00:00
Christy Jacob
0fb34433b9 feat: personal data filters to enhance password protection 2023-04-14 00:20:03 +04:00
Damodar Lohani
d394715b56 Merge remote-tracking branch 'origin/master' into feat-custom-smtp 2023-04-13 01:35:56 +00:00
Christy Jacob
8690c57a7c feat: initial commit 2023-04-12 03:01:50 +04: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
Damodar Lohani
ce83c4d3d3 fix format 2023-04-05 05:52:59 +00:00
Damodar Lohani
adcfecfa0e remove paused and introduce enable-disable all services 2023-04-05 02:33:38 +00:00
Damodar Lohani
41d22fb50b Merge remote-tracking branch 'origin' into feat-db-pools-master-sync-2 2023-03-30 08:02:31 +00:00
Vincent (Wen Yu) Ge
19d5ea03b9 Updates links for query page 2023-03-29 19:38:39 +00: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
Bhaskar Singh
8b5e0e1f1a Updating the exception variable name for easy
readability
2023-03-21 20:33:42 +05:30
Damodar Lohani
1ac91ae022 make nullable 2023-03-21 07:54:06 +00:00
Damodar Lohani
3bd92187f4 pause project 2023-03-21 01:52:32 +00:00
Bhaskar Singh
ac2085ffa8 Updated error when _APP_USAGE_STATS is disabled
for usage
2023-03-18 22:12:36 +05:30
Matej Bačo
27bf18f031 Code formatting 2023-03-14 20:31:23 +01:00
Damodar Lohani
c633eda501 return default template 2023-03-14 09:09:34 +00:00
Damodar Lohani
ae549a1e9a tests and fixes 2023-03-14 07:21:56 +00:00
Damodar Lohani
c649ba897f update response model 2023-03-13 09:33:11 +00:00
Damodar Lohani
1d3e0c19f8 error fixes 2023-03-10 11:04:11 +00:00
Damodar Lohani
bf4aca0d4a get template endpoint 2023-03-10 06:27:42 +00:00
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
2352268a07 templates endponint 2023-03-09 13:44:31 +00:00
Damodar Lohani
52d93fd4af smtp update endpoint 2023-03-09 01:59:10 +00:00
Matej Bačo
59f5978fa3 Implement rules 2023-03-08 19:30:01 +01:00
Bhaskar Singh
7f3000439a Updated ENV_VARIABLE_INCORRECT_SETUP to DOMAIN_VARIABLE_INCORRECT 2023-03-08 17:15:55 +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
6e5b8fab4b fix: implement new framework changes 2023-03-01 17:30:36 +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
104d99e636 fix default value error 2023-02-20 07:08:27 +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
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
Damodar Lohani
daa121262b fix boolean param 2023-01-30 06:06:52 +00:00
Damodar Lohani
91abc2b079 fix SDK method 2023-01-30 06:06:05 +00:00
Damodar Lohani
2070cccd54 update description 2023-01-30 06:05:32 +00: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
Torsten Dittmann
24a7caf936 Merge branch 'master' of https://github.com/appwrite/appwrite into feat-4803-flutter-web-platform-type 2023-01-27 13:24:41 +01:00
Vincent (Wen Yu) Ge
b25dc38a63 clarify custom ID vs unique ID 2023-01-20 22:22:16 +00: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
4f35353289 Merge branch 'feat-password-history' of https://github.com/appwrite/appwrite into feat-password-dictionary 2023-01-16 05:09:55 +00: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
Vincent (Wen Yu) Ge
45aea5b941 Update branch with master 2023-01-13 14:53:54 -05:00
Vincent (Wen Yu) Ge
92a384e31c Fix descriptions for ID and regen 1.2.x specs 2023-01-13 14:27:08 -05: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
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
be77b10549
Add flutter-web as a platform type
Having a dedicated type for flutter-web will allow us to differentiate
between Flutter Web and Web in the Appwrite Console.
2023-01-11 15:47:49 -08:00
Damodar Lohani
abde948b43 fix typo 2022-12-26 06:03:43 +00:00
Damodar Lohani
3bcb1f846e password disctionary endpont and project model 2022-12-26 05:31:49 +00:00
Jake Barnby
43c850bd9b
Deduplicate SDK method name 2022-12-22 21:03:06 +13:00
fogelito
b301a64dc4 clean up some use classes not in use 2022-12-21 10:02:22 +02:00
Bradley Schofield
c0daed3644 Refactor names and cleanup code 2022-12-20 16:11:30 +00:00
Bradley Schofield
3e66d1a549 Rename certificate queue 2022-12-20 11:21:07 +00:00
Damodar Lohani
5b1c54c440 fix suggestions 2022-12-19 05:07:41 +00:00
Damodar Lohani
95791c85ff
Update app/controllers/api/projects.php
Co-authored-by: Eldad A. Fux <eldad.fux@gmail.com>
2022-12-19 10:49:18 +05:45
Damodar Lohani
15f52b933b fix excaping 2022-12-18 08:34:57 +00:00
Damodar Lohani
ba77b35f05
Update app/controllers/api/projects.php
Co-authored-by: Eldad A. Fux <eldad.fux@gmail.com>
2022-12-18 14:05:55 +05:45
Damodar Lohani
0eae73e7b8 fix: password comparison 2022-12-18 06:27:41 +00:00
Damodar Lohani
0b1b7b8170 feat: check history limit 2022-12-16 10:47:08 +00:00
Damodar Lohani
cfd5a91c43 feat: project endpoint to set password history limit 2022-12-16 10:37:49 +00:00
fogelito
8ade726932 Changing Role + Permissions namespace 2022-12-14 18:04:06 +02:00
fogelito
f96128e14f Changing Id 2022-12-14 17:42:25 +02:00
Bradley Schofield
21afa43127 Port Certificates to new Queue system 2022-12-13 11:16:12 +00:00
Damodar Lohani
c60a3a66a0 feat: session limit separate default and max value 2022-12-12 05:07:18 +00:00
Damodar Lohani
65bacc6983 fix: naming and use constant 2022-12-11 07:13:11 +00:00
Damodar Lohani
f070f0974a session limit check on shutdown 2022-12-09 11:33:26 +00:00
Christy Jacob
69d5a25c62 Merge branch 'master' of github.com:appwrite/appwrite into feat-db-pools 2022-12-07 15:39:44 +04:00
Damodar Lohani
27d7f4f083 fix (projects): session limits
Set max session limits to 100 and default session limits to 10
2022-12-06 10:52:17 +00:00
Damodar Lohani
1da3f7770f feat (projects): auth session limit
Add endpoint on project to set max number of sessions for project users.
2022-12-06 10:45:04 +00:00
Jake Barnby
f44a642998
Get from env in param call 2022-11-25 17:27:19 +13:00
Jake Barnby
de38fed306
Fix empty check 2022-11-25 10:29:22 +13:00
Jake Barnby
bb01a6d817
Get default region param from env 2022-11-24 11:23:59 +13:00
Christy Jacob
f239296059 Merge branch 'master' of https://github.com/appwrite/appwrite into feat-db-pools 2022-11-23 19:05:19 +00:00
Jake Barnby
bd0139ef3b
Make region optional with default of 'default' 2022-11-23 18:16:57 +13:00
Christy Jacob
e0c363e8e5 feat: add new console 2022-11-17 22:51:55 +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
Bradley Schofield
a51288da57 Update projects.php 2022-11-15 10:25:34 +00:00
Bradley Schofield
64b725a6f7 Update Defaults 2022-11-15 10:19:35 +00: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
Bradley Schofield
a14ab321bf
Update app/controllers/api/projects.php
Co-authored-by: Eldad A. Fux <eldad.fux@gmail.com>
2022-11-14 15:18:40 +00:00
Bradley Schofield
c76057fd37
Update app/controllers/api/projects.php
Co-authored-by: Eldad A. Fux <eldad.fux@gmail.com>
2022-11-14 09:54:49 +00:00
Bradley Schofield
36d4719a3b
Update app/controllers/api/projects.php
Co-authored-by: Eldad A. Fux <eldad.fux@gmail.com>
2022-11-14 09:54:40 +00:00
Bradley Schofield
0b883df5ec Fix Tests 2022-11-14 09:42:18 +00:00
Bradley Schofield
cdb4c60c3c Run Linter 2022-11-14 09:33:49 +00:00
Bradley Schofield
66b805829c Move authDuration into auths attribute in project 2022-11-14 09:30:45 +00:00
Bradley Schofield
f6b7e0392b Give auth duration it's own endpoint 2022-11-14 09:15:55 +00:00
Eldad A. Fux
42cedf8ed0
Merge pull request #3909 from appwrite/feat-usage-refactor
new stats to count resources
2022-11-10 11:05:36 +02:00
Torsten Dittmann
4befb19c35 feat: add databases and buckets to projects usage 2022-11-08 13:09:18 +01:00
Bradley Schofield
842185e45d Update projects.php 2022-11-07 11:58:57 +00:00
Christy Jacob
b7a24da288 Merge branch 'master' of github.com:appwrite/appwrite into feat-db-pools 2022-11-05 18:06:44 +05:30
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
Damodar Lohani
b66f932b3b Merge remote-tracking branch 'origin/1.1.x' into feat-usage-refactor 2022-11-02 08:43:12 +00:00
Vincent (Wen Yu) Ge
a8a23fb8eb Merge branch 'master' into doc-unique-id 2022-11-01 17:53:48 +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
Bradley Schofield
5dc8a2dee0 Add Tests and fix bugs 2022-11-01 11:15:45 +00:00
Bradley Schofield
d34359fd49 Implement Variable Session Duration 2022-10-31 14:54:15 +00:00
Christy Jacob
aff7c59097 feat: update database library 2022-10-31 12:02:51 +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
Christy Jacob
269266127d feat: update db library 2022-10-28 14:30:31 +05:30
Torsten Dittmann
461c12c7fe
Merge pull request #3701 from appwrite/feat-oauth-improvements
Feat: OAuth improvements
2022-10-24 17:57:40 +02:00
Damodar Lohani
dfa35e0a0b fix periods on usage endpoints 2022-10-21 05:45:25 +00:00
Eldad Fux
e5c62c6730 Fixed usage of DSN database 2022-10-19 16:55:58 +03:00
Eldad Fux
d51c379514 Fixed linter errors 2022-10-19 11:35:30 +03:00
Eldad Fux
4fe5c0dd1d Merge branch 'feat-db-pools' of https://github.com/appwrite/appwrite into feat-db-pools-eldad 2022-10-18 17:29:21 +03:00
Christy Jacob
6bfb76b620 Merge branch 'master' of https://github.com/appwrite/appwrite into feat-db-pools 2022-10-18 07:57:34 +00:00
Eldad Fux
fe29e58f22 Fixed doctor health checks 2022-10-16 20:48:53 +03:00
Eldad Fux
7484656be3 Merge branch 'master' of https://github.com/appwrite/appwrite into feat-db-pools-eldad 2022-10-15 22:08:16 +03:00
Eldad Fux
0506dbb30e Adapted HTTP API 2022-10-15 17:14:17 +03:00
Torsten Dittmann
d0aedf33ba
Merge pull request #4058 from appwrite/fix-deprecate-team-deletion-with-project
Deprecate team deletion with project
2022-10-14 11:19:27 +02:00
Eldad A. Fux
0733909d04 Merge pull request #4346 from appwrite/master
Sync 1.1.x
2022-10-10 07:27:26 +03:00
Eldad Fux
a229eac2cc Renamed DatabasePool to Pools 2022-10-08 08:51:58 +03:00
Eldad Fux
c23c5c686c Merge branch 'feat-db-pools' of https://github.com/appwrite/appwrite into feat-db-pools-eldad 2022-10-08 08:48:06 +03:00
Eldad Fux
5af7dc943f Renamed DatabasePool to Pools 2022-10-08 08:42:53 +03:00
Vincent (Wen Yu) Ge
4cee87273c
Merge branch 'master' into doc-unique-id 2022-10-04 10:51:38 -04:00
Vincent (Wen Yu) Ge
ae2100244f Update unique() to be ID.unique() 2022-10-03 20:22:28 +00:00