1
0
Fork 0
mirror of synced 2024-07-09 08:27:01 +12:00
Commit graph

97 commits

Author SHA1 Message Date
shimon 8147f3ee7d rolling back usage flow 2023-08-20 15:29:43 +03: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 8400394857
Add an endpoint to update user labels 2023-06-09 10:18:51 -07:00
Steven Nguyen 85a40bf82d
Add a new labels attribute to the Users collection
This labels attribute can be used apply labels to users. These labels
can eventually be used:

* with permissions to grant access
* to filter users in the Users collection
2023-06-05 14:12:28 -07:00
Jake Barnby 47586fedb5
Remove invalid test 2023-03-24 23:09:49 +13:00
Jake Barnby 702000ac2f
Remove redundant test 2023-03-24 22:28:39 +13:00
Damodar Lohani 6b6f9edbd6
Merge branch '1.3.x' into feat-13x-master-sync 2023-02-21 07:38:46 +05:45
Damodar Lohani 5acd78463a Merge remote-tracking branch 'origin/feat-db-pools' into feat-db-pools-master-sync 2023-02-16 00:44:29 +00:00
shimon 0f5b6665fa addressing comments 2023-02-05 23:06:32 +02:00
shimon 5850a454e0 addressing comments 2023-02-05 22:07:46 +02:00
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
Damodar Lohani fe472e5b36 Merge branch '1.3.x' of https://github.com/appwrite/appwrite into feat-password-history 2023-01-16 05:04:13 +00:00
shimon a0554ca91e usage test 2023-01-15 12:25:03 +02:00
shimon 9a2f734d3a compose.lock 2023-01-12 18:06:20 +02:00
Matej Bačo ccc9432219 Merge branch 'master' into fix-1.2.x-conflicts 2022-12-27 08:29:10 +01:00
shimon 44af531881 tests adjustments 2022-12-26 11:11:13 +02:00
Jake Barnby e86994b597
Add retries for flaky tests 2022-12-22 16:12:45 +13:00
Damodar Lohani 7a9b9f2710 remove test 2022-12-18 08:53:01 +00:00
Damodar Lohani 0eae73e7b8 fix: password comparison 2022-12-18 06:27:41 +00:00
fogelito f96128e14f Changing Id 2022-12-14 17:42:25 +02:00
Piotr Rogowski b65a8c86c5
Add tests 2022-10-15 22:09:10 +02:00
Akshay Rana 57bbf346aa added: test case - failure case to add same number to different user 2022-10-05 23:40:11 +05:30
Akshay Rana 737a0ab6d7 added: test case - update user phone number & user search by new phone number 2022-10-05 17:30:53 +05:30
Matej Bačo 215c02ac47 e2e tests for password re-hashing 2022-09-19 08:43:59 +00:00
Jake Barnby e8a8069a67
Fix realtime test 2022-09-06 16:13:24 +12:00
Matej Bačo 56282fb2fa Fix users logs test 2022-08-29 09:16:18 +00:00
Steven 146cb6a0d8 Fix list user logs tests 2022-08-19 23:31:02 +00:00
Steven a5bc07c9e4 Merge branch 'feat-list-users-queries' into feat-list-user-logs-queries 2022-08-19 22:00:54 +00:00
Steven f03510ef6b Fix test after merge 2022-08-19 21:09:50 +00:00
Steven c1cdad5566 Merge branch 'refactor-permissions-inc-console-fix' into feat-list-users-queries 2022-08-19 14:50:50 +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
Steven 27f69e3c09 Consolidate List User Logs API params
Replace limit and offset params with a single queries param since the
Queries V2 change now allows for different types of queries.
2022-08-19 00:09:34 +00:00
Steven f0d66985f7 Consolidate List Users API params
Replace search, limit, offset, cursor, cursorDirection, and orderType
params with a single queries param since the Queries V2 change now
allows for different types of queries.
2022-08-18 19:30:39 +00:00
Matej Bačo 2814a6f680 Linter fix 2022-08-16 13:03:38 +00:00
Matej Bačo 3088535806 Added phone number to UsersAPI createUser + tests 2022-08-16 13:02:28 +00:00
Eldad Fux 7d83f9d644 Removed import path 2022-08-14 19:29:07 +03: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
fogelito 8628105eef Model changes 2022-07-04 12:55:11 +03:00
Matej Bačo bd9cb92035 Fix tests 2022-06-22 08:00:12 +00: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
Matej Baco 62ec121a5e Improved docs 2022-06-17 11:25:28 +02:00
Matej Bačo 0aaee54a63 Fix snake_case 2022-06-16 09:21:35 +00:00
Matej Bačo 0aaa5779ab Linter fixes 2022-06-14 11:08:54 +00:00
Matej Bačo 476a73d1b1 Add signing in tests 2022-06-14 10:49:46 +00:00
Matej Bačo f0cd4437d8 Rebuilds, improve tests 2022-06-14 10:40:51 +00:00
Torsten Dittmann 8d465c67c2 feat: account sessions for emails 2022-06-14 10:17:50 +02:00
Everly Precia Suresh 19300ccdd7 format files in app, src, tests 2022-05-23 14:54:50 +00:00