CodeMirror/appwrite
1
0
Fork 0
mirror of synced 2024-08-19 04:01:38 +12:00
Code Issues Projects Releases Wiki Activity
17933 commits 229 branches 398 tags 310 MiB
Commit graph

477 commits

Author SHA1 Message Date
Jake Barnby
f9d2976c1d
Merge remote-tracking branch 'origin/1.1.x' into feat-graphql-support 
# Conflicts:
#	CHANGES.md
#	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/init.php
#	app/tasks/sdks.php
#	composer.lock
#	docker-compose.yml
 2022-11-16 19:37:35 +13:00
Bradley Schofield
3c71164741 Merge branch '1.1.x' into feat-implement-session-length-api 2022-11-14 15:30:38 +00:00
Jake Barnby
a47bfe71bf
Merge remote-tracking branch 'origin/1.2.x' into feat-graphql-support 
# Conflicts:
#	CHANGES.md
#	composer.json
#	composer.lock
#	tests/e2e/Services/Functions/FunctionsCustomServerTest.php
 2022-11-04 21:32:57 +13:00
geisterfurz007
e891424c17 fix: empty payload deleting single user session 2022-10-31 21:01:49 +01:00
Vincent (Wen Yu) Ge
9a1f54baf1
Merge branch 'master' into doc-unique-id 2022-10-21 17:43:52 -04:00
Damodar Lohani
dfa35e0a0b fix periods on usage endpoints 2022-10-21 05:45:25 +00:00
Jake Barnby
a2b1941a47
Merge remote-tracking branch 'origin/master' into feat-graphql-support 
# Conflicts:
#	CONTRIBUTING.md
#	composer.json
#	composer.lock
#	docs/references/teams/list-teams.md
 2022-10-19 13:17:56 +13:00
Piotr Rogowski
833e3f8ce1
Fix User not found exception 2022-10-14 18:17:00 +02:00
Jake Barnby
fd8d4f4a1b
Add type property to hash algorithms to allow resolving union type implementation 2022-10-11 12:27:03 +13:00
Akshay Rana
da9133ae85 fixed: wrong error message show on adding duplicate number to a user 2022-10-04 23:48:15 +05:30
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
Jake Barnby
69d42fc980
Fix create scrypt user route param defaults types 2022-09-29 16:52:57 +13:00
Christy Jacob
ba0be549e3
Merge pull request #3881 from appwrite/fix-null-required-param 
Fix: Null required ID params
 2022-09-23 00:37:17 +05:30
Matej Bačo
a983e792d8 Refactor required param values 2022-09-19 10:05:42 +00:00
Steven Nguyen
00a4929301 Fix date format for usage APIs 2022-09-15 23:48:09 +00:00
Christy Jacob
626e4b1b8a feat: update getSessions to listSessions in users and accounts API 2022-09-14 03:43:04 +05:30
Christy Jacob
937674a373 feat: update getLogs to listLogs in users and account API 2022-09-14 02:35:03 +05:30
Christy Jacob
183bb2e92d feat: update getMemberships to listMemberships in Users API 2022-09-14 02:28:28 +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
01fb4045bd Sync with 0.16 2022-09-07 14:11:10 +03:00
Eldad Fux
1f17fb34e4 Merge branch '0.16.x' of https://github.com/appwrite/appwrite into fix-response-syntax 2022-09-07 14:07:40 +03:00
Eldad Fux
0895a25615 Fixed response syntax with new FW version 2022-09-07 14:02:36 +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
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
Matej Bačo
281eb2fafe Merge remote-tracking branch 'origin/refactor-permissions-inc-console-fix' into feat-list-users-queries 2022-08-26 07:40:35 +00:00
Steven
60a4563908 Fix usage tests 2022-08-25 22:15:11 +00:00
Matej Bačo
bc73b7bbf0 Fix bugs after merge 2022-08-25 10:28:13 +00:00
Matej Bačo
f15f8e7bf0 Linter fix 2022-08-25 09:34:36 +00:00
Matej Baco
c6e614d896 Merge branch 'refactor-permissions-inc-console-fix' into feat-list-users-queries 2022-08-25 10:38:43 +02:00
Jake Barnby
625608804e Merge remote-tracking branch 'origin/0.16.x' into refactor-permissions-inc-console-fix 
# 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/databases.php
#	app/controllers/api/storage.php
#	app/workers/builds.php
#	src/Appwrite/Stats/Usage.php
#	src/Appwrite/Usage/Calculators/Database.php
 2022-08-25 18:21:15 +12:00
Steven
66ff297103 Refactor Queries Validation 2022-08-22 19:16:20 +00:00
Damodar Lohani
2205ecd9c6 null safety checks 2022-08-20 11:20:31 +00:00
Steven
3890dea35b Add additional Validators for Queries 2022-08-19 23:20:22 +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
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
Damodar Lohani
d4f02402bd Merge branch 'feat-audits-label' of https://github.com/appwrite/appwrite into feat-usage-updates 2022-08-17 10:38:16 +00:00
shimon
e94c7eba83 more audit labels on users new routes 2022-08-17 13:01:16 +03:00
Damodar Lohani
a1e6f7bdf4 Merge branch 'feat-audits-label' of https://github.com/appwrite/appwrite into feat-usage-updates 2022-08-17 09:34:40 +00:00
shimon
88f6a67802 sync with 0.16 2022-08-17 10:36:38 +03: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
Damodar Lohani
3bc0aa8dca fix merge issues 2022-08-17 02:35:55 +00:00
Damodar Lohani
80dfa85c82 Merge branch 'feat-audits-label' of https://github.com/appwrite/appwrite into feat-usage-updates 2022-08-17 00:45:07 +00:00
Matej Bačo
7a1dfbfb8d Fix passwordUpdate time for non-pass users 2022-08-16 15:56:54 +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
shimon
de42895096 fill gaps from merge 2022-08-16 14:27:50 +03:00
shimon
beaad6c49d fill gaps from merge 2022-08-16 13:19:38 +03: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
shimon
8f8f033d1a fill gaps from merge 2022-08-16 12:00:28 +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
9770f10a8c fill gaps from merge 2022-08-15 20:33:44 +03:00
shimon
f091774afd fill gaps from merge 2022-08-15 20:04:23 +03:00
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
Christy Jacob
7723c633a0 feat: fix tests 2022-08-15 13:24:54 +05:30
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
Eldad A. Fux
340cfb0104
Update app/controllers/api/users.php 2022-08-14 20:01:32 +03:00
Eldad Fux
7d83f9d644 Removed import path 2022-08-14 19:29:07 +03: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
Eldad A. Fux
d641fbb635
Merge pull request #3588 from appwrite/feat-simplify-exceptions 
Simplify Exception Creation
 2022-08-14 15:27:52 +03: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
Damodar Lohani
5120158bdb Merge branch 'feat-audits-label' of https://github.com/appwrite/appwrite into feat-usage-updates 2022-08-14 11:39:41 +00: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
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
shimon
630954c94e some fixes 2022-08-13 17:55:27 +03: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
shimon
51e3fc8cab some fixes 2022-08-13 12:59:34 +03:00
shimon
48b2fb0b36 Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-audits-label 2022-08-13 10:34:25 +03:00
Damodar Lohani
02074a93ef remove unused import 2022-08-13 04:55:42 +00: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
Bradley Schofield
83c1129ed5 Add TODO Warning 2022-08-12 17:01:25 +01:00
Bradley Schofield
930120fc4d
Update app/controllers/api/users.php 
Co-authored-by: Eldad A. Fux <eldad.fux@gmail.com>
 2022-08-12 16:55:58 +01:00
Bradley Schofield
7af92b3b30 Fix Endpoint Order 2022-08-12 15:10:41 +01:00
shimon
b5f977e46d adding user to audits labels 2022-08-11 16:19:05 +03:00
Damodar Lohani
e666ae2b2e fix users usage endpoint 2022-08-11 02:11:31 +00:00
Damodar Lohani
5647f957a7 users metrics via route labels 2022-08-11 01:43:02 +00:00
Damodar Lohani
16fe9e241a Merge branch 'feat-audits-label' of https://github.com/appwrite/appwrite into feat-usage-updates 2022-08-10 01:49:27 +00:00
shimon
d2519c9a5b addressing comments 2022-08-09 17:38:54 +03:00
Damodar Lohani
bce998cb53 update imports and fix database usage 2022-08-09 06:28:38 +00:00
shimon
62ef532801 leftovers 2022-08-08 17:32:54 +03: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
Matej Bačo
15b5df10a4 Fix search attribute regarding phone number 2022-07-28 09:36:08 +00: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
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
7e08575245 builds, stats 2022-07-11 18:12:41 +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
5a10a9494f
Update SCrypt tests 2022-06-24 14:30:39 +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
48177e8d03 docs: update new phone docs 2022-06-20 16:47:49 +02: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
Torsten Dittmann
1eb91bc91e feat: add ui for phone authentication 2022-06-14 17:41:58 +02:00
Matej Bačo
697bb569ef Fix tests 2022-06-14 11:38:47 +00:00
Matej Bačo
0aaa5779ab Linter fixes 2022-06-14 11:08:54 +00:00
Matej Bačo
f0cd4437d8 Rebuilds, improve tests 2022-06-14 10:40:51 +00:00
Matej Bačo
64ee483665 Implemented hashhing import API endpoints, fixed SCrypt 2022-06-14 09:05:46 +00:00
Matej Bačo
6f76fb3613 WIP: Separate hashing endpoints 2022-06-13 15:11:31 +00:00
Matej Bačo
bdaf9bcdb8 Removed hashhing algo from endpoints except import 2022-06-13 12:53:28 +00:00
Torsten Dittmann
68264a0fe0 fix: tests and adaption to review 2022-06-13 14:43:17 +02:00
Matej Bačo
7cb40f3c77 Fix order of params 2022-06-10 08:03:25 +00:00
Matej Bačo
0d94e4c9ce Merge branch 'master' into feat-password-hash-algos 2022-06-10 08:03:09 +00:00
Torsten Dittmann
369c851532
Update app/controllers/api/users.php 
Co-authored-by: Eldad A. Fux <eldad.fux@gmail.com>
 2022-06-09 21:11:49 +02:00
Torsten Dittmann
dc25883685 feat: add update and verification method for account and users 2022-06-08 14:50:31 +02:00
Torsten Dittmann
8ce669da6f feat: initial phone authentication 2022-06-08 11:00:38 +02:00
Everly Precia Suresh
c61dd1e261 remove unecessary semi colons 2022-05-31 14:24:01 +00:00
Everly Precia Suresh
746dc72439 fix merge conflicts 2022-05-31 11:32:46 +00:00
Everly Precia Suresh
8f624e115b refactor users.php 2022-05-25 13:36:25 +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
0aa8aad2a9 fix: remove wrongly placed remove 2022-05-16 12:34:14 +02:00
Torsten Dittmann
bb0db796f7 feat: account update status 2022-05-16 11:58:17 +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
54530b9c0d fix: remove unused phpdocs 2022-05-12 16:26:12 +02:00
Torsten Dittmann
bf0506ecc7 feat: add user memberships endpoint 2022-05-12 15:20:06 +02:00
Torsten Dittmann
0525d2cc7b fix: remove eventData 2022-05-10 15:52:55 +02:00
Torsten Dittmann
8012de5c4d fix: rename webhook event header to plural 2022-05-10 14:13:53 +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
f5844df97b
Merge branch 'master' into feat-user-tokens-subquery 2022-05-08 16:39:24 +02:00
Torsten Dittmann
2cc2a40377 Merge branch '0.14.x' of https://github.com/appwrite/appwrite into feat-new-event-model 2022-05-08 15:11:14 +02:00
Matej Bačo
b0df349a23 QA fixes 2022-05-06 08:58:36 +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
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
e0426598fc Fix unfinished todos 2022-04-26 10:36:49 +00:00
Torsten Dittmann
487d38db95 fix(user): search integrity 2022-04-26 12:07:33 +02:00
Torsten Dittmann
379d074269 fix: users audit logs 2022-04-20 16:03:40 +02:00
Torsten Dittmann
8ec435ed1f sync: changes 2022-04-17 22:34:32 +02:00