1
0
Fork 0
mirror of synced 2024-07-16 03:46:02 +12:00
Commit graph

537 commits

Author SHA1 Message Date
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
Bradley Schofield 4dfafd1169 Merge branch 'master' into feat-implement-session-length-api 2022-11-04 16:11:38 +00:00
Bradley Schofield e1f9a8e0ce Clean up a couple things and fix tests 2022-11-04 14:48:29 +00:00
Bradley Schofield 4cfc3b3a7f Update authDuration fallback value 2022-11-04 10:12:02 +00:00
Bradley Schofield cddacfbb78 Handle Eldad's Comments 2022-11-01 14:43:18 +00:00
Bradley Schofield 5dc8a2dee0 Add Tests and fix bugs 2022-11-01 11:15:45 +00:00
Bradley Schofield d34359fd49 Implement Variable Session Duration 2022-10-31 14:54:15 +00:00
Eldad Fux 54469e9b4d Unused classes 2022-10-21 08:41:12 +03:00
Vincent (Wen Yu) Ge 4cee87273c
Merge branch 'master' into doc-unique-id 2022-10-04 10:51:38 -04:00
Vincent (Wen Yu) Ge ae2100244f Update unique() to be ID.unique() 2022-10-03 20:22:28 +00:00
Christy Jacob 54d14a5151
Merge pull request #3883 from appwrite/fix-get-membership-response
Fix: Get Membership response
2022-09-23 11:42:33 +05:30
Matej Bačo c42bf2d8da Fix documentation response model 2022-09-19 11:43:21 +00:00
Matej Bačo a983e792d8 Refactor required param values 2022-09-19 10:05:42 +00:00
Christy Jacob 105e5fe71c feat: rename getMemberships to listMemberships 2022-09-14 01:44:56 +05:30
shimon 834e4e03e3 Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-audits-label-desc-decoupling
 Conflicts:
	app/controllers/api/storage.php
2022-09-08 15:13:22 +03:00
Eldad Fux c442a5bce2 Fix linter test 2022-09-07 14:23:57 +03:00
Eldad Fux c22c28bc67 Fixed indentation 2022-09-07 14:14:53 +03:00
Eldad Fux 01fb4045bd Sync with 0.16 2022-09-07 14:11:10 +03:00
shimon 1362902082 audit event name reformation 2022-09-05 11:00:08 +03:00
shimon 5d16c39d5f account labels 2022-09-04 11:13:44 +03:00
Jake Barnby b9148d380b
Fix only variables can passed by reference errors 2022-08-31 11:31:43 +12:00
Christy Jacob 7591f68970
Merge pull request #3702 from appwrite/feat-list-endpoints-queries
Feat: List endpoint queries
2022-08-30 14:56:09 +02:00
Matej Bačo 63c02677a0
PR review changes 2022-08-30 13:55:23 +02:00
Matej Bačo 2b3dc48bf1 PR review changes 2022-08-30 08:21:34 +00:00
Jake Barnby 44970cc628 Sync master 2022-08-28 11:01:46 +12:00
Matej Baco fd1068a600 Merge branch 'feat-list-users-queries' into feat-list-endpoints-queries 2022-08-25 10:56:06 +02:00
Matej Bačo 65d09705ac Simplify class name 2022-08-24 18:25:15 +00:00
Jake Barnby ea4b177b83 Fix team permissions 2022-08-24 20:26:47 +12:00
Matej Bačo 531d57feff Upgrade listMemberships queries 2022-08-23 13:16:46 +00:00
Matej Bačo 2d82eed4be Linter fix 2022-08-23 13:10:27 +00:00
Matej Bačo 79560c13e6 Upgrade teamListLogs queries 2022-08-23 12:50:52 +00:00
Matej Bačo 6c971f6ece Upgrade listTeams queries 2022-08-23 08:56:28 +00:00
Jake Barnby cb6fc7f618 Merge branch 'origin/datetime-attributes' into refactor-permissions-inc-console-fix
# Conflicts:
#	.gitignore
#	app/config/collections.php
#	app/controllers/api/account.php
#	app/controllers/api/databases.php
#	app/controllers/api/storage.php
#	app/controllers/api/users.php
#	composer.lock
#	tests/e2e/Services/Account/AccountCustomClientTest.php
2022-08-19 16:49:34 +12:00
Jake Barnby 7019be987c Merge remote-tracking branch 'origin/0.16.x' into origin/datetime-attributes
# 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
#	app/controllers/api/account.php
#	app/controllers/api/users.php
#	app/controllers/shared/api.php
#	app/workers/deletes.php
#	composer.lock
#	docker-compose.yml
#	phpunit.xml
#	src/Appwrite/Event/Delete.php
2022-08-19 16:20:19 +12:00
Jake Barnby 66539bbe3a Review updates for role helper usage 2022-08-19 16:04:33 +12:00
shimon 2dc8fba40a Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-audits-label
 Conflicts:
	app/controllers/api/account.php
	app/controllers/api/users.php
	composer.json
	composer.lock
2022-08-17 10:05:37 +03:00
Jake Barnby b09aaabd14 Fix teams exception 2022-08-17 00:14:22 +12:00
shimon 923a741c5a Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-audits-label
 Conflicts:
	app/controllers/api/account.php
	app/controllers/api/functions.php
	app/controllers/api/users.php
2022-08-16 12:47:51 +03:00
Jake Barnby bbf7f8d8c3 Merge remote-tracking branch 'origin/origin/datetime-attributes' into refactor-permissions-inc-console-fix
# Conflicts:
#	app/controllers/api/databases.php
#	app/controllers/api/storage.php
#	src/Appwrite/Extend/Exception.php
2022-08-16 20:30:00 +12:00
Jake Barnby fb34ecfa7d Merge remote-tracking branch 'origin/0.16.x' into datetime-attributes-merge
# Conflicts:
#	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
2022-08-16 19:20:26 +12:00
Christy Jacob 5b7b39a300
Revert "Fix Endpoint Order" 2022-08-16 12:29:03 +05:30
shimon 590c1467bc Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-audits-label
 Conflicts:
	app/controllers/api/account.php
	app/controllers/api/functions.php
	app/controllers/api/users.php
2022-08-15 18:19:59 +03:00
Jake Barnby 77a28a2de7 Don't use ID helper with existing ID's 2022-08-15 23:24:31 +12:00
Christy Jacob 509f9083c9 Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-reorder-endpoints-2 2022-08-15 12:43:24 +05:30
Jake Barnby 66f518b531 Fix team membership delete 2022-08-15 18:04:00 +12:00
Eldad Fux 98fc8669e1 Merge branch '0.16.x' of https://github.com/appwrite/appwrite into feat-password-hash-algos 2022-08-14 19:23:30 +03:00
Jake Barnby 613a0f8006 ID and test fixes 2022-08-15 02:22:38 +12:00
Jake Barnby 9c260164ef Merge remote-tracking branch 'origin/feat-datetime-attributes-with-database-query-update' into refactor-permissions-inc-queries-update-datetime-fixes
# Conflicts:
#	app/controllers/api/databases.php
#	app/controllers/api/storage.php
#	app/controllers/general.php
#	app/controllers/shared/api.php
#	composer.json
#	composer.lock
2022-08-14 23:46:34 +12:00
Jake Barnby 6a5de3e0b6 Merge remote-tracking branch 'origin/fix-datetime-attributes' into refactor-permissions-inc-queries-update-datetime-fixes
# Conflicts:
#	app/config/collections.php
#	app/controllers/api/databases.php
#	app/controllers/api/projects.php
#	app/controllers/api/teams.php
#	composer.json
#	composer.lock
#	tests/e2e/Services/Account/AccountBase.php
#	tests/e2e/Services/Databases/DatabasesBase.php
#	tests/e2e/Services/Functions/FunctionsCustomServerTest.php
#	tests/e2e/Services/Projects/ProjectsConsoleClientTest.php
#	tests/e2e/Services/Storage/StorageBase.php
#	tests/e2e/Services/Storage/StorageCustomClientTest.php
#	tests/e2e/Services/Storage/StorageCustomServerTest.php
#	tests/e2e/Services/Teams/TeamsBase.php
#	tests/e2e/Services/Webhooks/WebhooksBase.php
#	tests/e2e/Services/Webhooks/WebhooksCustomClientTest.php
#	tests/e2e/Services/Webhooks/WebhooksCustomServerTest.php
#	tests/unit/Auth/AuthTest.php
2022-08-14 23:11:05 +12:00
Jake Barnby b007acfa95 ID updates 2022-08-14 22:33:36 +12:00
Christy Jacob 979768fc9f Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-reorder-endpoints-2 2022-08-14 14:42:14 +05:30
Christy Jacob 70d2ebf55b feat: tests 2022-08-14 14:25:59 +05:30
Christy Jacob a5bc0a61ca feat: exceptions on more files 2022-08-14 12:26:12 +05:30
Steven 610ec1a6a4 Update database query syntax 2022-08-14 05:44:55 +00:00
Jake Barnby fe5d3a1892 Use permission helpers 2022-08-14 17:21:11 +12:00
Jake Barnby ed712fb196 Merge remote-tracking branch 'origin/0.16.x' into refactor-permissions-inc-console-fix
# Conflicts:
#	app/controllers/general.php
#	composer.lock
2022-08-14 02:31:06 +12:00
Jake Barnby 68cc919aaa Test fixes 2022-08-14 02:10:28 +12:00
Eldad Fux 3c7a7f0fa4 Merge branch '0.16.x' of https://github.com/appwrite/appwrite into origin/datetime-attributes 2022-08-13 06:21:50 +03:00
Steven 1abe9d4c01 Merge branch '0.16.x' into fix-datetime-attributes 2022-08-12 22:54:33 +00:00
Jake Barnby 09b001e891 PR fixes 2022-08-13 02:41:57 +12:00
Bradley Schofield 7af92b3b30 Fix Endpoint Order 2022-08-12 15:10:41 +01:00
shimon 1af95fcdaa Tidy up 2022-08-12 16:21:32 +03:00
shimon 90cfac9b52 replace request param extractions 2022-08-12 14:01:12 +03:00
Jake Barnby 1d7c25b561 Single role per permissions entry 2022-08-12 22:36:59 +12:00
shimon b5f977e46d adding user to audits labels 2022-08-11 16:19:05 +03:00
shimon d2519c9a5b addressing comments 2022-08-09 17:38:54 +03:00
Jake Barnby 216486a4c6 Fix DB tests 2022-08-09 18:03:41 +12:00
Jake Barnby fb0168ea50 Fix erroneous whitespace 2022-08-09 14:48:39 +12:00
shimon 2d7a2bb57f leftovers 2022-08-08 18:23:45 +03:00
shimon 62ef532801 leftovers 2022-08-08 17:32:54 +03:00
Bradley Schofield 43660d9c8f Merge branch 'master' into feat-simplify-exceptions 2022-08-08 15:03:01 +01:00
Jake Barnby e8af744c97 More write ref updates 2022-08-05 18:00:56 +12:00
Jake Barnby bed6eb70af Replace write refs 2022-08-05 17:23:32 +12:00
Jake Barnby ce38e74ba2 Update remaining services to new permissions 2022-08-02 21:21:53 +12:00
Bradley Schofield 3c808ca895 Fix problem with Exception class 2022-07-26 15:56:59 +01:00
Bradley Schofield 96c6c0ff00 Migrate all exceptions to new signature 2022-07-26 15:24:32 +01:00
Matej Bačo dbccf39a9f Merge branch 'master' into feat-password-hash-algos 2022-07-25 12:37:07 +00:00
Fawzi E. Abdulfattah 3f09575740
get the invitee info from the db
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2022-07-25 06:09:35 +02:00
Fawzi E. Abdulfattah 9f45bce55f Fixing #3583 - create team membership to return added person name and email
Signed-off-by: Fawzi E. Abdulfattah <iifawzie@gmail.com>
2022-07-23 01:51:58 +02:00
fogelito 0816dd15f9 remove comments 2022-07-14 16:12:44 +03:00
fogelito 45ac40cc85 change function names 2022-07-13 17:02:49 +03:00
fogelito f384a3352b change class from database:: to dateTime:: 2022-07-12 16:32:39 +03:00
fogelito 29436c1e5f Datetime change for joined and invited 2022-07-07 10:44:28 +03:00
fogelito ae4cb685c0 expire 2022-07-05 21:55:20 +03:00
fogelito acba505144 addCookie timestamp 2022-07-05 21:24:10 +03:00
fogelito 8628105eef Model changes 2022-07-04 12:55:11 +03:00
Torsten Dittmann e83cf382fd fix: all sdks and specs 2022-06-28 13:21:28 +02:00
Matej Bačo d9a88515bc Merge remote-tracking branch 'origin/0.15.x' into feat-password-hash-algos 2022-06-21 14:03:19 +00:00
Torsten Dittmann 511898afc9 Merge branch '0.15.x' of https://github.com/appwrite/appwrite into origin/feat-internal-id 2022-06-20 15:34:27 +02:00
Torsten Dittmann bbdf70ee90 feat: use new $createdAt and $updatedAt attributes 2022-06-15 14:46:52 +02:00
fogelito 0d1b1ddef6 Adding Account + teams + users Internal Ids to colleactions 2022-06-14 20:15:22 +03:00
Matej Bačo 0aaa5779ab Linter fixes 2022-06-14 11:08:54 +00:00
Matej Bačo 0d94e4c9ce Merge branch 'master' into feat-password-hash-algos 2022-06-10 08:03:09 +00:00
Torsten Dittmann 3d297e825f
Merge pull request #3296 from stnguyen90/fix-2955-add-team-member-toast
Update success, loading, and error message for add team member
2022-06-01 16:24:45 +02:00
Steven 4a87e73a45 Update success, loading, and error message for add team member
Remove text indicating invitations since no emails are sent when adding
a user via the Admin console.
2022-05-31 22:00:37 -07:00
Steven ec1c4fd5c3 Bypass SMTP host check for admins adding team members
Since no email is sent when adding team members for admins, there shouldn't
be any need to check the SMTP host.
2022-05-31 20:50:19 -07:00
Everly Precia Suresh c61dd1e261 remove unecessary semi colons 2022-05-31 14:24:01 +00:00
Everly Precia Suresh 60a73c74a5 fix multi-line params in controllers 2022-05-23 16:42:27 +00:00
Everly Precia Suresh 19300ccdd7 format files in app, src, tests 2022-05-23 14:54:50 +00:00
Torsten Dittmann bb0db796f7 feat: account update status 2022-05-16 11:58:17 +02:00
Torsten Dittmann 158ecce959 Merge branch 'master' of https://github.com/appwrite/appwrite into 0.14.x 2022-05-12 20:41:04 +02:00
Torsten Dittmann 8fcc37e287
Merge pull request #3211 from appwrite/feat-api-user-memberships
feat(api): user memberships
2022-05-12 20:14:19 +02:00
Torsten Dittmann 9455a7c573
Merge pull request #3144 from appwrite/feat-array-limits
Feat: Array API limits
2022-05-12 19:03:29 +02:00
Torsten Dittmann bf0506ecc7 feat: add user memberships endpoint 2022-05-12 15:20:06 +02:00
Torsten Dittmann 57246b14d7 fix: add missing teams update audit 2022-05-09 14:57:42 +02:00
Torsten Dittmann fdd16e44c6 Merge branch '0.14.x' of https://github.com/appwrite/appwrite into feat-new-event-model 2022-05-09 09:12:06 +02:00
Matej Bačo 4c642b99c5 Merge remote-tracking branch 'origin/0.14.x' into feat-sessions-subquery 2022-05-08 18:50:41 +00:00
Torsten Dittmann 33414b58b1 Merge branch '0.14.x' of https://github.com/appwrite/appwrite into feat-new-event-model 2022-05-08 17:25:01 +02:00
Torsten Dittmann 3990ef7fa2 Merge branch 'master' of https://github.com/appwrite/appwrite into 0.14.x 2022-05-08 17:15:25 +02:00
Torsten Dittmann 40fbc7aa60
Merge pull request #3156 from appwrite/feat-user-tokens-subquery
Feat: User tokens subcollection
2022-05-08 17:09:49 +02:00
Torsten Dittmann 9c88906c7e
Merge pull request #3184 from appwrite/fix-team-user
Fix: Team User Creation
2022-05-08 16:47:01 +02:00
Torsten Dittmann f5844df97b
Merge branch 'master' into feat-user-tokens-subquery 2022-05-08 16:39:24 +02:00
Torsten Dittmann df1f8735a9
Merge pull request #3158 from appwrite/feat-user-memberships-subquery
Feat: User membership subquery
2022-05-08 16:35:33 +02:00
Matej Bačo cc1ddc87d9 Fix tema user creation 2022-05-06 11:03:41 +00:00
Matej Bačo 814bb5c6b6 Finish hashing controllers 2022-05-05 11:21:31 +00:00
Matej Bačo bc1b62f7da Merge branch 'master' into feat-password-hash-algos 2022-05-04 13:33:32 +00:00
Everly Precia Suresh 65a246bd21 add type for locale 2022-05-04 09:51:48 +00:00
Everly Precia Suresh 20b4119ee9 add primitive types to params 2022-05-03 13:21:25 +00:00
Everly Precia Suresh 76cd825112 refactor teams.php 2022-05-03 11:57:26 +00:00
Matej Bačo 5aa009d843 Rename const 2022-05-01 07:54:58 +00:00
Matej Bačo 4d2d7eddaf PR review changes 2022-05-01 07:53:59 +00:00
Matej Bačo 92d6ed6089 Implement memberships subquery 2022-04-27 12:44:47 +00:00
Matej Bačo 50082c3512 Implement user tokens subcollection 2022-04-27 11:06:53 +00:00
Matej Bačo dd8f96ea63 Define const APP_LIMIT_ATTRIBUTE_COUNT 2022-04-26 13:29:23 +00:00
Torsten Dittmann 297d076caf Merge branch '0.14.x' of https://github.com/appwrite/appwrite into feat-new-event-model 2022-04-26 12:39:13 +02:00
Matej Bačo de7e70e275 Tests fix 2022-04-26 08:52:59 +00:00