1
0
Fork 0
mirror of synced 2024-09-18 18:40:24 +12:00
Commit graph

749 commits

Author SHA1 Message Date
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