1
0
Fork 0
mirror of synced 2024-07-15 11:25:53 +12:00
Commit graph

562 commits

Author SHA1 Message Date
prateek banga 78a53aee37 adds messaging event and updates messaging worker 2023-09-05 22:40:48 +05:30
Christy Jacob 21dc3b16b0 chore: update changelog 2023-08-30 18:36:40 -04:00
Christy Jacob 861921526e fix: remove redundant name property 2023-08-30 18:34:20 -04:00
Christy Jacob 74012158b3 fix: variable names 2023-08-30 17:54:26 -04:00
Christy Jacob 75e957ed4a fix: missing variable in email templates 2023-08-30 17:48:25 -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 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 11dca76a70 Update teams.php 2023-08-28 06:53:02 +01:00
Matej Bačo 596e59f2cc response format fix, smtp QA fixes 2023-08-25 17:13:25 +02:00
Jake Barnby 537756551e
Fix missing accessedAt 2023-08-22 21:36:04 -04:00
Jake Barnby 942705b5f3
Fix database upgrade 2023-08-21 23:25:55 -04:00
Jake Barnby a77ff0a9b0
Merge remote-tracking branch 'origin/1.4.x' into chore-1.4.x-upgrade
# Conflicts:
#	app/config/specs/open-api3-latest-client.json
#	app/config/specs/open-api3-latest-console.json
#	app/config/specs/open-api3-latest-server.json
#	app/config/specs/swagger2-latest-client.json
#	app/config/specs/swagger2-latest-console.json
#	app/config/specs/swagger2-latest-server.json
2023-08-17 19:54:25 -04:00
Jake Barnby 861ed521a0
Merge branch '1.4.x' into fix-team-update-membership
# Conflicts:
#	app/config/specs/open-api3-1.4.x-client.json
#	app/config/specs/open-api3-1.4.x-console.json
#	app/config/specs/open-api3-1.4.x-server.json
#	app/config/specs/open-api3-latest-client.json
#	app/config/specs/open-api3-latest-console.json
#	app/config/specs/open-api3-latest-server.json
#	app/config/specs/swagger2-1.4.x-client.json
#	app/config/specs/swagger2-1.4.x-console.json
#	app/config/specs/swagger2-1.4.x-server.json
#	app/config/specs/swagger2-latest-client.json
#	app/config/specs/swagger2-latest-console.json
#	app/config/specs/swagger2-latest-server.json
2023-08-17 17:51:24 -04:00
Steven Nguyen f3fa7922d4
Merge branch 'cl-1.4.x' into feat-user-identities-cl-1.4.x 2023-08-08 08:34:01 -07: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
Steven Nguyen a235024268
Separate OAuth2 info from Sessions into Identities
This allows us to retain the OAuth2 info even if the session is
deleted. This also provides a foundation for allowing multiple emails,
phone numbers, etc, not from an OAuth2 provider.
2023-08-02 15:36:06 -07:00
Dakshi 12228ccef4 converted desc to sentence case 2023-08-01 20:56:48 +05:30
Steven Nguyen 611524476b
Merge branch 'master' into feat-master-to-1.4.x 2023-07-26 13:33:49 -07:00
Christy Jacob 0feaf41fcb Merge branch 'feat-db-pools-master' of https://github.com/appwrite/appwrite into feat-db-pools 2023-07-20 11:53:36 +00:00
Steven Nguyen 187f3dc6ff
Update get logs APIs to return userId from data
The audit userId is actually the internal id and the user id is in the
data attribute.
2023-07-19 22:49:51 -07:00
Steven Nguyen 2befa60350
Track a user's last activity
A user will have an accessedAt timestamp that will update at most once
per day if they make some API call. This timestamp can then be used
find active users and calculate daily, weekly, and monthly active users.

To ensure consistent updates to the user the $user from the resource
is always updated to the user making the request, including requests
like Create Account, Update Team Membership Status, and Create Phone
Session (confirmation). This ensures the shutdown can update the
accessedAt timestamp if there was a $user set.
2023-07-19 22:22:58 -07: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
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
Steven Nguyen fce230dca8
Fix team delete
Ensure all memberships are deleted and the cached users are
invalidated so that the nested memberships will refresh.
2023-07-17 17:21:16 -07:00
jaivix 4db919b42d linting and wording updates based on stnguyen90 feedback 2023-07-13 00:33:38 +05:30
Steven Nguyen 300d916621
Update get logs APIs to return userId from data
The audit userId is actually the internal id and the user id is in the
data attribute.
2023-07-12 10:27:57 -07:00
Damodar Lohani 0cff44b909 update description 2023-07-11 06:41:30 +00:00
Damodar Lohani 1207fb3cb1
Update teams.php 2023-07-11 11:56:42 +05:45
jaivix a6671a5caa fixed team creation response if teamId already exists 2023-07-09 16:50:09 +05:30
shimon 57bc7d0584 functions/builds/deletes worker 2023-06-11 17:08:48 +03:00
shimon f1466c05cf refactor workers 2023-05-29 16:58:45 +03:00
fogelito f6153b7626 Use array instead of variadic 2023-05-16 15:56:20 +03:00
fogelito 5e4ff01568 getByType 2023-05-01 12:18:50 +03:00
fogelito 9dcf4c0984 validations changes 2023-04-25 14:35:49 +03:00
Damodar Lohani ac9f434c85 more fixes and reset endpoints 2023-04-19 08:44:22 +00:00
Damodar Lohani 0177ddccb3 use custom templates to send email when enabled 2023-04-19 08:29:29 +00:00
Damodar Lohani d394715b56 Merge remote-tracking branch 'origin/master' into feat-custom-smtp 2023-04-13 01:35:56 +00:00
Torsten Dittmann 34d27fb4d0 fix: prefs for teams 2023-04-12 18:03:08 +02:00
Jake Barnby d86d604624
Reviews fixes 2023-04-12 03:32:14 +12: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 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
Torsten Dittmann c1ba898cec feat: rename update team sdk method 2023-03-23 13:04:16 +01:00
Damodar Lohani 893d305453 fix template issues 2023-03-17 00:55:00 +00:00
Torsten Dittmann 08d588aeb1 fix: remove unnecessary owner check 2023-03-15 11:55:21 +01:00
Damodar Lohani c7db44b45f default sms template 2023-03-14 09:07:42 +00:00
Torsten Dittmann bfdb7830d0 fix: update team prefs endpoint 2023-03-14 04:40:17 +05:30
Damodar Lohani 82498459db update project smtp using hook 2023-03-13 09:21:16 +00:00
Damodar Lohani 07010a5192 set SMTP config from project 2023-03-12 02:14:03 +00:00
Torsten Dittmann 10150aad3e feat: only owners are allowed to update attributes 2023-03-10 21:57:13 +05:30
Torsten Dittmann 01edc57806 Merge branch '1.3.x' of https://github.com/appwrite/appwrite into feat-team-prefs 2023-03-09 16:04:20 +05:30
Steven Nguyen 85a2d623a6
Update APIs to check X-Appwrite-Timestamp header
Appwrite will refer to the X-Appwrite-Timestamp header for when the
request was originally sent and reject the request if the Timestamp
is older than the updatedAt timestamp of the document.
2023-03-07 10:54:52 -08:00
Torsten Dittmann 496da61cd9 feat: team preferences 2023-03-06 19:54:02 +05:30
Torsten Dittmann ae32536be2 Merge branch 'master' of https://github.com/appwrite/appwrite into chore-release-1-3-console-sdk 2023-02-28 14:45:34 +05:30
Steven Nguyen c5ebcbab2b
Add offline support labels on endpoints 2023-02-23 14:47:45 -08:00
Damodar Lohani 4948aedfb5 Merge remote-tracking branch 'origin/master' into 1.3.x 2023-02-20 03:51:54 +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
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
Vincent (Wen Yu) Ge b25dc38a63 clarify custom ID vs unique ID 2023-01-20 22:22:16 +00:00
Damodar Lohani 1466e7b770
Update app/controllers/api/teams.php
Co-authored-by: Vincent (Wen Yu) Ge <vincent@appwrite.io>
2023-01-18 09:33:47 +05:45
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
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 afaa64b54b fix invitation after merge 2023-01-13 06:05:16 +00:00
Damodar Lohani 3146ec363d
Merge branch 'master' into feat-team-invite-improvements 2023-01-13 11:39:20 +05:45
Damodar Lohani f41e3b1e8f Merge remote-tracking branch 'origin/master' into feat-db-pools-master-sync 2023-01-12 07:25:23 +00:00
Damodar Lohani b06ce91297 fix formatting 2023-01-09 11:11:55 +00:00
Damodar Lohani 8d40220114 remove var dumps 2023-01-09 11:10:50 +00:00
Damodar Lohani 11b3739360 fix when either email or phone were empty 2023-01-09 11:10:02 +00:00
Damodar Lohani a2642ecc67 send phone invite only if email is empty 2023-01-09 10:59:28 +00:00
Damodar Lohani 34b2280207 fix format 2023-01-09 09:18:13 +00:00
Damodar Lohani 8f351ad7b2 set email and phone attribute once user found 2023-01-09 09:17:39 +00:00
Damodar Lohani bc7b98821a fix error 2023-01-09 08:56:18 +00:00
Damodar Lohani 32b8a1edfe fix param order in action 2023-01-09 08:44:02 +00:00
Damodar Lohani 29ef377b60 refactor privileged/app user check 2023-01-09 08:29:33 +00:00
Damodar Lohani 63a981591d fix error and param order 2023-01-09 08:25:15 +00:00
Damodar Lohani a812bfb686 format fix 2023-01-09 05:55:07 +00:00
Damodar Lohani 2e154c06bc different test and messaging integration as well 2023-01-09 05:46:02 +00:00
Bradley Schofield c0daed3644 Refactor names and cleanup code 2022-12-20 16:11:30 +00:00
Damodar Lohani b7d17e82da fix: membership invite email 2022-12-16 06:15:23 +00:00
Damodar Lohani 495da1bfd4 fix: template path 2022-12-16 06:11:12 +00:00
Damodar Lohani 5d195659bd refactor: mails refactor 2022-12-15 09:22:05 +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
Christy Jacob 69d5a25c62 Merge branch 'master' of github.com:appwrite/appwrite into feat-db-pools 2022-12-07 15:39:44 +04:00
Matej Bačo 8b71e318c2 Fix tests bug 2022-11-24 11:55:49 +00:00
Matej Bačo efe093ce3c
Fix unsaved changes in team inv 2022-11-24 12:35:26 +01:00
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 0b883df5ec Fix Tests 2022-11-14 09:42:18 +00:00
Bradley Schofield 66b805829c Move authDuration into auths attribute in project 2022-11-14 09:30:45 +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