1
0
Fork 0
mirror of synced 2024-07-07 23:46:11 +12:00
Commit graph

519 commits

Author SHA1 Message Date
Jake Barnby 4bc23afc65
Add constants for message types 2023-11-29 17:05:37 +13:00
prateek banga 9c6cd8512f review changes 2023-11-21 15:19:19 +05:30
prateek banga 88f228c106 review changes 2023-11-21 15:11:09 +05:30
prateek banga 3394218cb0 adds validation for phone and email identifier 2023-11-21 15:00:02 +05:30
prateek banga 7ae614fe13 adds provider type in target 2023-11-14 18:14:07 +05:30
Jake Barnby 458c2d1446
Merge remote-tracking branch 'origin/main' into chore-sync-main 2023-11-13 16:46:05 +13:00
Christy Jacob d33b8c2ce1
Merge branch '1.4.x' into fix-null-password-history 2023-11-09 07:44:44 -08:00
Bradley Schofield 54e5985940 Fix wrong operator for password history
This fixes a potential chance for nulls to be introduced into the password history array when $password is null and $passwordHistory != 0
2023-11-08 14:35:16 +00:00
loks0n dfc8c919d4 fix: missing sessionId error 2023-11-06 15:06:56 +00:00
Prateek Banga f97d1fa9e3 adds log api in messaging controller 2023-11-02 18:00:17 +05:30
prateek banga f7529140bd adds event label to remaining messaging api 2023-10-31 23:53:46 +05:30
prateek banga fd4a81c4fc made review changes 2023-10-25 23:03:23 +05:30
prateek banga af40c63357 review changes 2023-10-20 17:02:13 +05:30
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
shimon 94178f8eaf rollback to Usage 2023-10-15 20:41:09 +03:00
shimon 002fc19d60 tests fix 2023-10-10 21:02:24 +03:00
Prateek Banga a92390dda2 review changes 2023-10-06 19:23:46 +05:30
Prateek Banga d842191cc6 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mailgun-provider 2023-10-06 03:53:16 +05:30
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
Prateek Banga 22d445587e review changes 2023-10-05 16:57:48 +05:30
Prateek Banga 48b91e39a8 review changes 2023-10-04 16:15:59 +05:30
shimon 7f1507f810 sync with 1.4 2023-10-04 11:20:32 +03:00
shimon 429dabaaee sync with 1.4 2023-10-03 19:50:48 +03:00
shimon dcf0107a79 sync with master 2023-09-27 20:10:21 +03: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
Prateek Banga 35d842171c review changes 2023-09-20 23:37:10 +05:30
Prateek Banga a2e34b5b64 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mailgun-provider 2023-09-20 16:59:07 +05:30
Prateek Banga 350549db7d Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-add-messaging-response-models 2023-09-14 02:17:34 +05:30
Prateek Banga d742b0c0a9 removes provider type from create user target 2023-09-13 00:53:25 +05:30
Steven Nguyen 6b0c24a9d6
Update user creation from teams and users services to not set accessedAt
accessedAt should only be updated when a user performs some sort of
action. Creating a user via the users API or by adding them to a team
is an action done by someone else, not the user themselves. As such,
the accessedAt timestamp shouldn't update.
2023-09-12 12:05:11 -07:00
Prateek Banga 6affa6b5a0 Merge branch 'feat-messages-event-config' of https://github.com/appwrite/appwrite into feat-mailgun-provider 2023-09-13 00:07:09 +05:30
Prateek Banga 11a458f1df change providers to authProviders in remaining places 2023-09-13 00:06:18 +05:30
Matej Bačo 6964477429 Increase labels maximum limit 2023-09-06 18:15:03 +02:00
prateek banga 1762c81b8d Merge branch 'feat-messages-event-config' into feat-mailgun-provider 2023-08-31 18:32:26 +05:30
prateek banga df77f92860 adds sub query for targets and topics, permission for user target 2023-08-25 01:22:16 +05:30
prateek banga 5ca8dc0a73 merge cl-1.4.x 2023-08-24 14:10:26 +05:30
prateek banga e8cc60b0c2 adds audit resource in messaging controllers 2023-08-24 14:05:51 +05:30
prateek banga 82d220e158 fixes audit events 2023-08-24 13:43:30 +05:30
prateek banga a95c29d546 lint fix 2023-08-24 01:55:08 +05:30
prateek banga ec54000263 adds test for target controllers 2023-08-24 01:54:25 +05:30
prateek banga ac33d7828f Revert "Pint linter ran"
This reverts commit bf5f0a8419.
2023-08-24 01:53:52 +05:30
wess bf5f0a8419 Pint linter ran 2023-08-23 13:12:43 -04:00
Matej Bačo 8802e318d5 Fix pools resource 2023-08-23 13:52:17 +02:00
Jake Barnby c99288229f
Add back missing route 2023-08-22 21:36:32 -04:00
Jake Barnby a84e669a1f
Add missing accessedAt values when creating users 2023-08-22 21:34:23 -04:00
Jake Barnby efd25d6a70
Merge remote-tracking branch 'origin/feat-git-integration' into feat-framework-router-v2
# Conflicts:
#	app/controllers/api/users.php
#	composer.json
#	composer.lock
#	tests/e2e/Services/Storage/StorageBase.php
2023-08-22 17:58:42 -04:00
prateek banga 78385a59c6 adds remaining provider controllers 2023-08-22 22:15:31 +05:30
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