CodeMirror/appwrite
1
0
Fork 0
mirror of synced 2024-07-15 19:36:08 +12:00
Code Issues Projects Releases Wiki Activity
19311 commits 210 branches 386 tags 340 MiB
Commit graph

700 commits

Author SHA1 Message Date
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
Khushboo Verma 16addeba10 Fixed some errors 2023-12-13 03:00:16 +05:30
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
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