Elgato_dark/appwrite
1
0
Fork 0
mirror of https://github.com/appwrite/appwrite synced 2026-04-28 08:57:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3
31586 commits 1155 branches 491 tags 498 MiB
Commit graph

980 commits

Author SHA1 Message Date
loks0n
c19d6a6dda chore: description 2024-11-07 15:33:44 +01:00
loks0n
e7e1a5b11f fix: tests 2024-11-07 11:13:20 +01:00
loks0n
e4c6e97ded feat: memberships privacy 2024-11-06 21:15:31 +01:00
loks0n
12b60e01cf fix: tests 2024-11-06 15:51:15 +01:00
loks0n
0e254618f6 fix: tests 2024-11-05 18:37:48 +01:00
loks0n
71879236b8 fix: disable test 2024-11-05 17:42:01 +01:00
loks0n
69e8fdf077 chore: refactor 2024-11-05 17:05:21 +01:00
loks0n
4c14375d89 fix: tests 2024-11-01 13:31:33 +00:00
loks0n
37d60e1039 fix: var name 2024-11-01 13:28:13 +00:00
loks0n
f5e2f4acfa fix: endpoint name 2024-11-01 12:53:54 +00:00
loks0n
c9b2d6eb90 feat: teamHideSensitiveFields 2024-11-01 11:38:56 +00:00
Bradley Schofield
40b8af0671 Further cleanup code now findOne returns empty doc 2024-10-31 17:13:23 +09:00
Jake Barnby
a7f1cc128a
Validate cursor queries to avoid getDocument type error 2024-10-17 18:41:24 +13:00
Jake Barnby
8bc37026cd
Revert "Feat adding coroutines" 2024-10-08 20:54:40 +13:00
Binyamin Yawitz
c34f8afa81
fix: wrong document check 2024-10-07 20:34:27 -04:00
Binyamin Yawitz
16835f96bf
chore: merge 2024-10-07 11:02:18 -04:00
Torsten Dittmann
ec77ab1007 Merge branch '1.6.x' of https://github.com/appwrite/appwrite into migrations-backups 2024-10-03 11:13:44 +02:00
Binyamin Yawitz
671f801cd5
fix: missing protocol 2024-10-02 13:27:02 -04:00
Binyamin Yawitz
2703ca1106
chore: merge 2024-10-01 11:44:01 -04:00
Binyamin Yawitz
d14edf4207
reverting: to set coroutines as head 2024-10-01 10:30:47 -04:00
fogelito
54f55f65f4 deletes-worker-set-project 2024-10-01 17:17:36 +03:00
Binyamin Yawitz
5512340cdd
Revert "Feat eldad4 coroutines" 2024-09-20 12:30:05 -04:00
Damodar Lohani
413f3c20ab use proper scope for platforms and keys endpoint 2024-09-04 01:51:32 +00:00
Binyamin Yawitz
7d6eac4ddb
Merge branch '1.6.x' into feat-eldad4-coroutines 
# Conflicts:
#	app/cli.php
#	app/controllers/api/account.php
#	app/controllers/api/functions.php
#	app/controllers/api/projects.php
#	app/controllers/general.php
#	app/controllers/shared/api.php
#	app/http.php
#	app/init.php
#	app/realtime.php
#	app/worker.php
#	composer.json
#	composer.lock
#	src/Appwrite/Migration/Migration.php
#	src/Appwrite/Platform/Tasks/Migrate.php
#	src/Appwrite/Platform/Tasks/ScheduleExecutions.php
#	src/Appwrite/Platform/Workers/Builds.php
#	src/Appwrite/Platform/Workers/Deletes.php
#	src/Appwrite/Specification/Format/Swagger2.php
#	src/Appwrite/Utopia/Response.php
 2024-09-03 19:06:48 -04:00
Torsten Dittmann
6ef600deb9 Merge branch '1.6.x' of https://github.com/appwrite/appwrite into feat-react-native-platform 2024-08-23 21:44:58 +02:00
Binyamin Yawitz
5cdb8388a1
chore: versions update 2024-08-23 13:02:54 -04:00
Torsten Dittmann
f3874e680b fix: react native platform for ios adn android 2024-08-20 13:03:03 +02:00
Torsten Dittmann
f065022cab feat: react native platform 2024-08-20 12:01:20 +02:00
Matej Bačo
d5db9253cd Fix breaking changes in lib 2024-08-16 11:25:01 +00:00
Christy Jacob
bfa253297b Merge branch 'main' of https://github.com/appwrite/appwrite into sync-1.6-main 2024-08-13 15:36:13 +00:00
Binyamin Yawitz
e672a0ebe2
Merge branch 'refs/heads/1.6.x' into feat-eldad4-coroutines 
# Conflicts:
#	src/Appwrite/Auth/Validator/MockNumber.php
 2024-08-07 14:01:46 -04:00
Christy Jacob
eb4e259be5 chore: linter 2024-07-22 13:08:02 +04:00
Christy Jacob
7614a356a2 feat: address review comments 2024-07-22 12:55:15 +04:00
Bradley Schofield
3792f816ad Add new audit events 2024-07-22 17:03:53 +09:00
Christy Jacob
98b8e13add feat: address review comments 2024-07-21 23:45:39 +04:00
Christy Jacob
711ca8801a feat: address review comments 2024-07-21 23:30:06 +04:00
Binyamin Yawitz
916f58cd9d
fixes: Logger and Abuse timelimit 2024-07-19 14:19:30 -04:00
Binyamin Yawitz
927dbc7e11
Merge branch 'refs/heads/1.6.x' into feat-eldad4-coroutines 
# Conflicts:
#	app/console
#	app/controllers/api/account.php
#	app/controllers/api/functions.php
#	app/controllers/api/projects.php
#	app/controllers/api/users.php
#	app/controllers/api/vcs.php
#	app/controllers/general.php
#	app/controllers/mock.php
#	app/controllers/shared/api.php
#	app/init.php
#	composer.json
#	composer.lock
#	src/Appwrite/Platform/Tasks/Doctor.php
#	src/Appwrite/Platform/Tasks/ScheduleMessages.php
#	src/Appwrite/Platform/Workers/Builds.php
#	src/Appwrite/Utopia/Response.php
 2024-07-17 14:31:13 -04:00
Damodar Lohani
0374711298
Update projects.php 2024-07-16 06:53:21 +05:45
Damodar Lohani
f4a4ec1def
Merge branch '1.6.x' into feat-project-accessed-at 2024-07-10 13:01:00 +05:45
Damodar Lohani
61333908a5 set project accessed at while creating 2024-07-08 01:11:09 +00:00
Binyamin Yawitz
664c3ad466
chore: Cleanup 2024-07-04 15:04:20 -04:00
Binyamin Yawitz
a3682b72e1
Merge remote-tracking branch 'refs/remotes/origin/main' into feat-eldad4-coroutines 
# Conflicts:
#	app/cli.php
#	app/console
#	app/controllers/api/projects.php
#	app/controllers/general.php
#	app/init.php
#	app/realtime.php
#	app/worker.php
#	composer.json
#	composer.lock
 2024-07-03 17:03:24 -04:00
Matej Bačo
2262d516f1 Merge remote-tracking branch 'origin/1.6.x' into mock-numbers 2024-07-03 09:30:11 +00:00
Matej Bačo
3a570b1f73 PR review changes 2024-07-03 08:27:54 +00:00
Matej Bačo
5ef196ec9a PR review changes 2024-07-03 07:11:15 +00:00
loks0n
d0125398f1 fix: test 2024-06-26 15:46:12 +01:00
Luke B. Silver
ecf761beab
Merge branch '1.6.x' into feat-new-session-alert 2024-06-26 12:44:49 +01:00
Christy Jacob
7cec278d27 Merge branch '1.6.x' of https://github.com/appwrite/appwrite into mock-numbers 2024-06-25 15:17:22 +00:00
loks0n
0ea2438069 fix: implementation 2024-06-24 14:12:09 +01:00
loks0n
f3f233eb14 feat: new session alert 2024-06-21 19:21:05 +01:00
Christy Jacob
a2f27ec15f Merge branch '1.5.x' of https://github.com/appwrite/appwrite into sync-with-main 2024-06-21 13:11:35 +00:00
Christy Jacob
fdf44c7bab Merge branch 'main' of https://github.com/appwrite/appwrite into sync-with-main 2024-06-20 15:26:17 +00:00
Christy Jacob
c5fa7eb7dc Merge branch '1.6.x' of github.com:appwrite/appwrite into mock-numbers 2024-06-20 20:53:06 +05:30
Christy Jacob
9e1541d96a Merge branch 'main' of https://github.com/appwrite/appwrite into mock-numbers 2024-06-16 07:28:22 +00:00
Binyamin Yawitz
d0a55e266c
lint: Linting 2024-06-06 20:54:51 -04:00
Jake Barnby
9e487b8ccf
Revert "Merge pull request #8237 from appwrite/revert-8193-feat-remove-random-shared-tables" 
This reverts commit 930ae6ded0, reversing
changes made to 1f6417b156.
 2024-06-06 20:11:19 +12:00
Binyamin Yawitz
6b0892a495
refactor: Adjusting to merge and some code cleanups 2024-06-05 20:41:23 -04:00
Binyamin Yawitz
b5a241db8d
merge: Main into Coroutines 2024-06-05 18:38:39 -04:00
Christy Jacob
ff6efc2855
Revert "Feat remove random shared tables" 2024-06-06 00:11:56 +05:30
Jake Barnby
f459a5c458
Merge remote-tracking branch 'origin/refactor-usage-sn' into feat-remove-random-shared-tables 
# Conflicts:
#	docker-compose.yml
 2024-06-04 17:43:14 +12:00
Matej Bačo
b0317fb19d Implement project dynamic (JWT) keys 2024-05-29 08:57:25 +00:00
Matej Bačo
8dd883a312 Add comments 2024-05-24 13:04:30 +02:00
Jake Barnby
e19b465ce2
Move shared tables db to env var from const 2024-05-24 20:10:47 +12:00
Jake Barnby
4ed125f7c8
Remove random shared tables assignment in preparation of setting as override instead 2024-05-24 16:53:09 +12:00
Jake Barnby
a895ce4270
Remove redundant backup checks 2024-05-24 16:51:29 +12:00
Jake Barnby
5b82716986
Change from 1 in 20 to 1 in 5 projects on shared tables DB 2024-05-20 14:00:48 +12:00
Matej Bačo
2e1f67245d Fix bugs, add old api key test 2024-05-16 08:39:15 +00:00
Matej Bačo
37176e7865 Backwards compatible approach 2024-05-14 12:33:49 +00:00
Matej Bačo
54c953d559 Add prefix of api key types 2024-05-14 11:58:31 +00:00
Jake Barnby
f7cd1e2361
Ensure namespace is set if override equals shared tables 2024-05-08 16:04:28 +12:00
Jake Barnby
921eb2b900
App::getEnv -> System::getEnv 2024-05-07 22:08:00 +12:00
Jake Barnby
e9bac08de0
Fix header test 2024-05-07 17:59:24 +12:00
Jake Barnby
356d155df2
Add shared tables enabled flag for quick toggle 2024-05-07 17:29:12 +12:00
Jake Barnby
912e3b01dc
Add clarifying comments 2024-05-07 14:07:04 +12:00
Jake Barnby
52c52fa519
Add scheme to DSN on fail 2024-05-06 18:13:41 +12:00
Jake Barnby
db94070162
Use DSN for project database 2024-05-06 17:33:36 +12:00
Jake Barnby
c4deb0ba93
Allow shared tables namespace override 2024-05-03 21:30:38 +12:00
Jake Barnby
b2e956a14d
Merge remote-tracking branch 'origin/refactor-usage-sn' into feat-isolation-modes 
# Conflicts:
#	.gitignore
#	app/cli.php
#	app/controllers/api/account.php
#	app/controllers/api/databases.php
#	app/controllers/api/projects.php
#	app/controllers/general.php
#	app/controllers/shared/api.php
#	app/init.php
#	app/realtime.php
#	app/worker.php
#	composer.json
#	composer.lock
#	src/Appwrite/Platform/Tasks/DeleteOrphanedProjects.php
#	src/Appwrite/Platform/Tasks/GetMigrationStats.php
#	src/Appwrite/Platform/Workers/Databases.php
#	src/Appwrite/Platform/Workers/Deletes.php
#	src/Appwrite/Platform/Workers/Hamster.php
#	tests/e2e/General/HTTPTest.php
#	tests/e2e/Services/Databases/DatabasesCustomServerTest.php
#	tests/e2e/Services/Projects/ProjectsConsoleClientTest.php
 2024-04-30 19:40:47 +12:00
Eldad Fux
d67df5feb1 Fixed formatting 2024-04-22 22:45:55 +02:00
Eldad Fux
3b70ae4d9f Fixed formatting 2024-04-22 07:56:36 +02:00
Eldad Fux
fd2410d2ae Fixed bootstrap 2024-04-14 22:42:31 +02:00
Eldad Fux
766b2ba13e Avatars tests are green! 2024-04-14 22:17:07 +02:00
Matej Bačo
d091b37a15 Merge branch 'refactor-usage-sn' into refactor-usage-sn-1.5.x 2024-04-02 18:42:17 +02:00
Eldad Fux
5ce3de4933 Merge remote-tracking branch 'origin/main' into feat-eldad2-coroutines 2024-04-02 02:13:15 +02:00
Eldad Fux
6ce8781af1 Fixed email escaping 2024-04-01 19:39:26 +02:00
Eldad Fux
beda5293b4 Fix format 2024-04-01 13:08:46 +02:00
Eldad Fux
8ed1da4ea8 Updated getEnv to use system lib 2024-04-01 13:02:47 +02:00
Matej Bačo
5275d0b021 Merge branch 'refactor-usage-sn' into feat-configurable-collections 2024-03-29 10:48:11 +01:00
Matej Bačo
2a0a69f3ed Fix connections pool 2024-03-09 11:59:45 +01:00
Matej Bačo
db1674811f Finish fixing code QL warnings 2024-03-08 13:57:20 +01:00
Torsten Dittmann
b8b3a69a55 fix: specs 2024-03-08 10:28:25 +01:00
Torsten Dittmann
f51c39cd2b Merge branch 'main' of https://github.com/appwrite/appwrite into 1.5.x 2024-03-08 00:30:02 +01:00
Matej Bačo
005a239932 Auth fixes 2024-03-07 18:24:01 +01:00
Jake Barnby
664df69a5f
Fix method refs 2024-03-07 17:49:59 +01:00
Matej Bačo
efeb898be1 Import fixes 2024-03-07 15:29:42 +01:00
Jake Barnby
8a73203635
Revert debugs 2024-03-07 14:52:13 +01:00
Jake Barnby
1db9d8b9ab
Fix method refs 2024-03-07 10:40:03 +01:00
Jake Barnby
1b7ce8fc61
Debug 2024-03-06 10:59:05 +01:00
Khushboo Verma
3d720c7495 Disable all APIs 2024-03-04 23:28:42 +01:00
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