CodeMirror/appwrite
1
0
Fork 0
mirror of synced 2024-08-04 13:01:45 +12:00
Code Issues Projects Releases Wiki Activity
13431 commits 233 branches 387 tags 315 MiB
Commit graph

7640 commits

Author SHA1 Message Date
Jake Barnby
a679f2f767 Improve permission parameter descriptions 2022-08-26 16:37:06 +12:00
Jake Barnby
a320e220c3 Console fixes 2022-08-26 15:34:26 +12:00
Jake Barnby
57048400dc Merge branch 'refactor-permissions-inc-console-fix' of github.com:appwrite/appwrite into refactor-permissions-inc-console-fix 2022-08-26 15:01:39 +12:00
Jake Barnby
593c62116c Review fixes 2022-08-26 15:01:16 +12:00
Jake Barnby
f945ab79ec
Apply suggestions from code review 
Co-authored-by: Damodar Lohani <lohanidamodar@users.noreply.github.com>
 2022-08-26 14:52:25 +12:00
Jake Barnby
8307b2148f Remove redundant auth exceptions catches 2022-08-26 14:23:23 +12:00
Steven
60a4563908 Fix usage tests 2022-08-25 22:15:11 +00:00
Matej Bačo
78f65401e8 Attempt to fix usage tests 2022-08-25 14:56:15 +00:00
Jake Barnby
e25fbd1c2a Fix default for usage params 2022-08-25 23:51:59 +12:00
Jake Barnby
b12fc12caa Fix usage for datetime attributes 2022-08-25 23:49:45 +12:00
Jake Barnby
9ccffe9af2 Inherit permissions after role checks to ensure users can update document permissions created by server with other users roles 2022-08-25 23:46:56 +12:00
Jake Barnby
e6e126dff4 Catch AuthorzationExceptions from database to throw 401 instead of 500 2022-08-25 23:30:26 +12:00
Matej Bačo
bc73b7bbf0 Fix bugs after merge 2022-08-25 10:28:13 +00:00
Matej Bačo
e44efb43d1 Fix exception params 2022-08-25 10:13:36 +00:00
Matej Bačo
9d440552bd Merge remote-tracking branch 'origin/feat-list-endpoints-queries' into feat-variables-api 2022-08-25 10:02:27 +00:00
Matej Bačo
c85363f355 Fix bugs after merge 2022-08-25 09:59:28 +00:00
Matej Bačo
6a22768c9c Merge remote-tracking branch 'origin/feat-list-users-queries' into feat-list-endpoints-queries 2022-08-25 09:35:06 +00:00
Matej Bačo
f15f8e7bf0 Linter fix 2022-08-25 09:34:36 +00:00
Matej Baco
8513bb2dbe Merge branch 'feat-list-endpoints-queries' into feat-variables-api 2022-08-25 11:14:42 +02:00
Matej Baco
fd1068a600 Merge branch 'feat-list-users-queries' into feat-list-endpoints-queries 2022-08-25 10:56:06 +02:00
Jake Barnby
7159f9c187 Merge remote-tracking branch 'origin/origin/datetime-attributes' 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
#	src/Appwrite/Usage/Calculators/Database.php
 2022-08-25 20:53:52 +12:00
Matej Baco
c6e614d896 Merge branch 'refactor-permissions-inc-console-fix' into feat-list-users-queries 2022-08-25 10:38:43 +02:00
fogelito
064d538023 Merge remote-tracking branch 'origin/origin/datetime-attributes' into origin/datetime-attributes 2022-08-25 11:14:48 +03:00
fogelito
c30189f903 Vincent Changes Apply 2022-08-25 11:14:27 +03:00
Shmuel Fogel
c04734048f
Update app/controllers/api/databases.php 
Co-authored-by: Vincent (Wen Yu) Ge <wenyu1999@hotmail.com>
 2022-08-25 11:05:01 +03:00
Jake Barnby
e7298b13b0 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/workers/builds.php
#	src/Appwrite/Stats/Usage.php
#	src/Appwrite/Usage/Calculators/Database.php
 2022-08-25 18:26:30 +12: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
Jake Barnby
3149a298a7 Aggregate before role checks 2022-08-25 15:51:21 +12:00
Jake Barnby
002b30d110 Fix missing check for existing validity on listFiles 2022-08-25 13:05:31 +12:00
Jake Barnby
b434dfb6b8 Fix missing check for existing validity on listDocuments 2022-08-25 13:04:47 +12:00
Steven
fc38771d69 Merge branch 'refactor-permissions-inc-console-fix' into feat-list-users-queries 2022-08-24 18:52:39 +00:00
Matej Bačo
b1dfd94d49 Add indexes for internal queries 2022-08-24 18:41:26 +00:00
Matej Bačo
65d09705ac Simplify class name 2022-08-24 18:25:15 +00:00
Christy Jacob
2b131eec54 feat: linter issues 2022-08-24 23:05:10 +05:30
Christy Jacob
7c9d8fcf64 feat: update worker class 2022-08-24 22:56:30 +05:30
Christy Jacob
7844a74c1a feat: update worker class 2022-08-24 22:14:40 +05:30
Christy Jacob
47b206c445 feat: update maintenance task 2022-08-24 21:58:04 +05:30
Christy Jacob
c3205b8266 feat: update environment vars 2022-08-24 21:45:39 +05:30
Christy Jacob
59e7e5caa7 feat: linter issues 2022-08-24 21:03:54 +05:30
Christy Jacob
9cfefe58bf feat: refactoring classes 2022-08-24 20:52:54 +05:30
Matej Bačo
cb6a186c5d PR review changes 2022-08-24 15:07:18 +00:00
Christy Jacob
85bfdd8f54 feat: refactoring classes 2022-08-24 20:26:41 +05:30
Matej Bačo
b765ad603d Merge remote-tracking branch 'origin/refactor-permissions-inc-console-fix' into feat-variables-api 2022-08-24 14:12:41 +00:00
Matej Bačo
4b01ff3f51 Use new query methods 2022-08-24 14:10:56 +00:00
Jake Barnby
d4b270e527 Better storage permission checks 2022-08-25 01:24:54 +12:00
Jake Barnby
0d3c1cba9a Better database permission checks 2022-08-25 01:24:19 +12:00
Matej Bačo
bd7395cb44 Bug fixing, upgrade tests to new syntax 2022-08-24 09:22:13 +00:00
Christy Jacob
d3308a4d42 Merge branch 'master' of github.com:appwrite/appwrite into feat-db-pools 2022-08-24 14:40:06 +05:30
Christy Jacob
ceb11f839f feat: fix realtime tests 2022-08-24 14:21:26 +05:30
Jake Barnby
dabaa49f8d Remove redundant extra permissions checks for document read/update/delete 2022-08-24 20:50:05 +12:00
Jake Barnby
714bbc0af0 Fix default bucket missing create permission 2022-08-24 20:27:27 +12:00
Jake Barnby
ea4b177b83 Fix team permissions 2022-08-24 20:26:47 +12:00
Matej Bačo
01a57d91ad Fix listDocument queries validation 2022-08-23 16:33:08 +00:00
Matej Bačo
7fb74027d4 Upgrade listDocuments queries 2022-08-23 15:18:59 +00: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
b1348dbdd8 Upgrade account logs queries 2022-08-23 13:06:59 +00:00
Matej Bačo
36903d6358 Upgrade document&collection&database logs queries 2022-08-23 13:03:38 +00:00
Matej Bačo
79560c13e6 Upgrade teamListLogs queries 2022-08-23 12:50:52 +00:00
Matej Bačo
e068bcdbc1 Upgrade listCollections queries 2022-08-23 12:30:28 +00:00
Matej Bačo
94acd32d69 Upgrade listDatabases queries 2022-08-23 09:40:17 +00:00
Matej Bačo
17e41eee1d Upgrade listExecutions queries 2022-08-23 09:26:34 +00:00
Matej Bačo
a92f96bf80 Upgrade listDeployments queries 2022-08-23 09:12:48 +00:00
Matej Bačo
1eee0baa28 Upgrade listFunctions queries 2022-08-23 09:02:06 +00:00
Matej Bačo
6c971f6ece Upgrade listTeams queries 2022-08-23 08:56:28 +00:00
Matej Bačo
d1f6cb31d6 Upgrade listFiles queries 2022-08-23 08:49:39 +00:00
Matej Bačo
6fcd3757fe Upgrade listBuckets queries 2022-08-23 08:37:55 +00:00
Matej Bačo
e780c90dd6 Merge branch 'feat-list-users-queries' into feat-list-endpoints-queries 2022-08-23 08:10:13 +00:00
Jake Barnby
7784422f84 Fix maintenance worker 2022-08-23 17:23:01 +12:00
Jake Barnby
00441885d2 Remove fallback setting for missing permissions 2022-08-23 13:42:53 +12:00
Jake Barnby
e989735e89 Remove permissions processor 2022-08-23 13:42:25 +12:00
Steven
66ff297103 Refactor Queries Validation 2022-08-22 19:16:20 +00:00
Jake Barnby
eb1476b28b Apply validator updates to OpenAPI3 2022-08-22 14:27:17 +12:00
Damodar Lohani
fa165a735b linter fix 2022-08-21 10:16:55 +00:00
Damodar Lohani
0d57c67cc0 use same method to parse usage params labels 2022-08-21 02:10:42 +00:00
Damodar Lohani
77958b465e update database usage params label 2022-08-21 02:10:21 +00:00
Damodar Lohani
6af467398b update usage labels 2022-08-21 02:04:52 +00:00
Damodar Lohani
c5a8e470c5 update usage labels to match audits labels pattern 2022-08-21 02:03:19 +00:00
Damodar Lohani
2205ecd9c6 null safety checks 2022-08-20 11:20:31 +00:00
Christy Jacob
7952dac85e feat: linter fixes 2022-08-20 07:41:07 +00:00
Steven
e70eb61717 Fix bug with list documents and new queries 2022-08-20 00:47:10 +00:00
Steven
2bde7aa02b Fix databases tests 2022-08-20 00:15:18 +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
fe0b778fac Add indexes to users collection 2022-08-19 21:10:15 +00:00
Christy Jacob
ca25d329ae feat: update date time calculation 2022-08-19 20:22:38 +05:30
Steven
c1cdad5566 Merge branch 'refactor-permissions-inc-console-fix' into feat-list-users-queries 2022-08-19 14:50:50 +00:00
Matej Bačo
926d1c6459 Fix incorrect endpoint information 2022-08-19 14:14:39 +00:00
Bradley Schofield
d4ba9441b6 Run Linter 2022-08-19 11:26:09 +01:00
Bradley Schofield
0d81918685 Merge remote-tracking branch 'origin/refactor-permissions-inc-console-fix' into feat-variables-api 2022-08-19 11:25:39 +01:00
Christy Jacob
dbd7afeda0 feat: update default values 2022-08-19 09:58:11 +00:00
Christy Jacob
74a5bd2556 feat: update default values 2022-08-19 09:54:26 +00:00
Christy Jacob
e104f553cb feat: use datetime filters for acessedAt 2022-08-19 09:41:22 +00:00
Christy Jacob
f09cce93ee feat: use datetime filters for acessedAt 2022-08-19 09:37:35 +00:00
Christy Jacob
2a750eaa73 Merge branch 'refactor-permissions-inc-console-fix' of https://github.com/appwrite/appwrite into feat-improve-keys 2022-08-19 09:32:22 +00:00
Christy Jacob
278afd77c0 Merge branch 'origin/datetime-attributes' of https://github.com/appwrite/appwrite into feat-improve-keys 2022-08-19 09:20:08 +00:00
Jake Barnby
399df17a3d Fix application reference 2022-08-19 20:49:13 +12:00
Jake Barnby
c1c3a7c7ae Remove redundant exception 2022-08-19 20:31:19 +12:00
Jake Barnby
e4392bdbfb Merge fixes 
(cherry picked from commit 24875e352d)
 2022-08-19 17:12:20 +12:00
Jake Barnby
24875e352d Merge fixes 2022-08-19 17:05:39 +12: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
5f990ecb6d Fix imports 2022-08-19 16:28:40 +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
9819088563 Lint 2022-08-19 16:05:00 +12:00
Jake Barnby
66539bbe3a Review updates for role helper usage 2022-08-19 16:04:33 +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
db9faebcc9
Update app/controllers/api/account.php 
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
 2022-08-18 16:04:19 +05:45
Damodar Lohani
3e43424129 Merge branch '0.16.x' of https://github.com/appwrite/appwrite into feat-usage-updates 2022-08-18 00:49:31 +00:00
Damodar Lohani
4d482ebb81 fix accounts PR 2022-08-18 00:31:56 +00:00
fogelito
c21b563614 Merge branch 'refactor-permissions-inc-console-fix' of github.com:appwrite/appwrite into datetime-jake-tz 
 Conflicts:
	app/controllers/general.php
	composer.json
	composer.lock
 2022-08-17 21:04:23 +03:00
shimon
d1aa3fea4f sync with 0.16 2022-08-17 18:03:53 +03:00
shimon
a2af9fef2d sync with 0.16 2022-08-17 17:57:56 +03:00
shimon
9fc2e4c3a5 sync with 0.16 2022-08-17 17:29:22 +03:00
shimon
cc9a166146 Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-audits-label 
 Conflicts:
	app/controllers/api/storage.php
	app/controllers/shared/api.php
 2022-08-17 17:08:54 +03:00
Bradley Schofield
86ad8b7e98 Update function.phtml 2022-08-17 14:45:19 +01:00
Bradley Schofield
80ff661aeb Continue working on response filters 2022-08-17 14:08:09 +01:00
shimon
73095a325e addressing comments 2022-08-17 16:02:01 +03:00
Damodar Lohani
c0119e6a0d fix formatting 2022-08-17 11:10:17 +00:00
shimon
9cdb67a661 addressing comments 2022-08-17 14:09:15 +03:00
Damodar Lohani
6b11fa26ce rename and remove unused param 2022-08-17 10:55:01 +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
Damodar Lohani
0d97580361 fix usage params in execution 2022-08-17 10:13:50 +00:00
shimon
e94c7eba83 more audit labels on users new routes 2022-08-17 13:01:16 +03:00
Damodar Lohani
4b43847bd8 update latest spec 2022-08-17 09:57:36 +00: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
Bradley Schofield
407c150631 Merge branch '0.16.x' into feat-response-filters-0.16.x 2022-08-17 10:34:01 +01:00
shimon
835ef0ffc1 small fix 2022-08-17 12:25:47 +03:00
shimon
9c68cff317 Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-file-cache-cleanup 
 Conflicts:
	composer.json
	composer.lock
 2022-08-17 11:16:09 +03:00
shimon
88f6a67802 sync with 0.16 2022-08-17 10:36:38 +03:00
shimon
cc887beae9 sync with 0.16 2022-08-17 10:32:42 +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
Jake Barnby
163782d4cd Merge branch 'origin/datetime-attributes' into refactor-permissions-inc-console-fix 
# Conflicts:
#	composer.lock
#	public/dist/scripts/app-all.js
#	public/dist/scripts/app-dep.js
#	public/dist/scripts/app.js
 2022-08-17 15:34:41 +12:00
Jake Barnby
f36f176849 Role helper usage 2022-08-17 15:11:49 +12: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
Christy Jacob
4b0c707fd3 Merge branch 'origin/datetime-attributes' of https://github.com/appwrite/appwrite into feat-ui-datetime 2022-08-16 20:37:05 +00:00
Eldad A. Fux
69a4f51d58
Merge pull request #3656 from appwrite/feat-functions-console-logs 
Functions Console Logs Capture
 2022-08-16 23:23:53 +03:00
Eldad A. Fux
e0abc972ff
Merge pull request #3681 from appwrite/feat-missing-phone-param 
Changed provider name from phone to sms and added phone param to create endpoints
 2022-08-16 21:01:54 +03:00
Matej Bačo
7a1dfbfb8d Fix passwordUpdate time for non-pass users 2022-08-16 15:56:54 +00:00
shimon
1abd57567f linter fix 2022-08-16 18:02:17 +03:00
shimon
7ad7d1807e fill gaps from merge 2022-08-16 17:56:05 +03:00
Matej Bačo
7d9f973c62 Fix escaping, write tests for stdout/stderr, upgrade runtimes to V2 2022-08-16 14:49:08 +00:00
shimon
5d284b8c27 fill gaps from merge 2022-08-16 16:20:35 +03: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
Christy Jacob
51cb03a93e feat: linter fix 2022-08-16 17:58:30 +05:30
Jake Barnby
b09aaabd14 Fix teams exception 2022-08-17 00:14:22 +12:00
Matej Bačo
1e96f8c3d9 Revert changes regarding AccountAPI createAccount 2022-08-16 12:05:46 +00:00
Matej Bačo
eaf9cd59e9 Fix OpenAPI3 nested anyOf/oneOf 2022-08-16 11:40:19 +00:00
shimon
de42895096 fill gaps from merge 2022-08-16 14:27:50 +03:00
Jake Barnby
e3ec275a51 Cleaner permission checks 2022-08-16 23:26:38 +12:00
Matej Bačo
f10cf58ec3 Update console sdk 2022-08-16 10:42:21 +00: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
Jake Barnby
1aa36b6b2c Simplify permission checks 2022-08-16 21:08:14 +12:00
Jake Barnby
326220762e Exception fixes 2022-08-16 21:07:30 +12:00
shimon
8f8f033d1a fill gaps from merge 2022-08-16 12:00:28 +03:00
Bradley Schofield
9a705ed44d Update function.phtml 2022-08-16 09:50:49 +01:00
Jake Barnby
5d84d6d43f Lint 2022-08-16 20:33:06 +12: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
Jake Barnby
f672269a8c Handle aggregates per resource type at the controller level 2022-08-16 17:54:44 +12:00
Damodar Lohani
34fd6763e1
Update app/controllers/api/account.php 
Co-authored-by: Eldad A. Fux <eldad.fux@gmail.com>
 2022-08-16 11:14:55 +05:45
Damodar Lohani
4fb743e934 fix lint errors 2022-08-16 05:23:51 +00:00
Damodar Lohani
94d9bb8a18 Merge branch '0.16.x' of https://github.com/appwrite/appwrite into feat-functions-console-logs 2022-08-16 04:42:03 +00:00
Damodar Lohani
078b1ec377 updating to use if condition 2022-08-16 04:34:49 +00:00
fogelito
9b85a89e71 Projects tests 2022-08-15 20:37:26 +03:00
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
Bradley Schofield
e1cc6bc624 Start work on response filters for 0.16 2022-08-15 16:09:09 +01:00
fogelito
f1d186d6ae filters for collections 2022-08-15 18:03:03 +03:00
shimon
f64c82a8cb addressing comments 2022-08-15 17:03:03 +03:00
shimon
f12ccfa02a prefix removed from storage audits label 2022-08-15 16:59:58 +03:00
shimon
df0bdeb8a3 some fixes 2022-08-15 16:55:11 +03:00
Jake Barnby
bf2fa212aa Fix setting defaults 2022-08-16 01:16:20 +12:00
Jake Barnby
28e7934aeb Update document/file validator allowed permissions 2022-08-16 01:02:02 +12:00
Jake Barnby
b53f185ec6 Remove permissions processor 2022-08-16 00:56:19 +12:00
shimon
67d12d3120 some fixes 2022-08-15 15:16:32 +03:00
Jake Barnby
77a28a2de7 Don't use ID helper with existing ID's 2022-08-15 23:24:31 +12:00
shimon
edecd8dc22 some fixes 2022-08-15 13:52:20 +03:00
Jake Barnby
813e9135c6 Review fixes 2022-08-15 22:11:17 +12:00
Christy Jacob
51afc8bdfb feat: generate latest specs 2022-08-15 14:37:41 +05:30
shimon
0dc485d8d7 some fixes 2022-08-15 12:05:41 +03:00
Eldad A. Fux
72e524963c
Update app/controllers/api/account.php 
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
 2022-08-15 11:30:58 +03:00
Christy Jacob
7723c633a0 feat: fix tests 2022-08-15 13:24:54 +05:30
Damodar Lohani
246d9b94b7
null safety 2022-08-15 13:27:02 +05:45
Jake Barnby
33970276b2 Self review 2022-08-15 19:20:10 +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
Damodar Lohani
c0d05132df fix usage metric typo in database 2022-08-15 05:50:36 +00:00
Damodar Lohani
a5aa20ac5c Merge branch 'feat-audits-label' of https://github.com/appwrite/appwrite into feat-usage-updates 2022-08-15 05:35:14 +00:00
Jake Barnby
7c34387d22 Update specs + console SDK 2022-08-15 16:39:30 +12:00
shimon
5e476a2e5a some fixes 2022-08-15 07:29:44 +03:00
Jake Barnby
d5a1872f93 Spec + dist + lock update 2022-08-15 12:21:11 +12:00
Jake Barnby
cb4a256d5f Merge remote-tracking branch 'origin/feat-ui-datetime' into refactor-permissions-inc-queries-update-datetime-fixes 
# 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
#	composer.lock
#	public/dist/scripts/app-all.js
#	public/dist/scripts/app-dep.js
#	public/dist/scripts/app.js
#	public/dist/styles/default-ltr.css
#	public/dist/styles/default-rtl.css
#	public/scripts/dependencies/appwrite.js
 2022-08-15 12:05:52 +12:00
shimon
c0d8337417 some fixes 2022-08-14 23:45:05 +03:00
shimon
104e6564f7 some fixes 2022-08-14 23:06:21 +03:00
shimon
cabe989555 some fixes 2022-08-14 22:42:20 +03:00
shimon
1109004727 some fixes 2022-08-14 22:27:43 +03:00
Eldad Fux
95181546b4 Adpated tests 2022-08-14 21:09:24 +03:00
shimon
857803e362 some fixes 2022-08-14 21:02:38 +03:00
Eldad Fux
98e2564330 Merge branch 'feat-password-hash-algos' of https://github.com/appwrite/appwrite into feat-missing-phone-param 2022-08-14 20:22:52 +03:00
Eldad Fux
bd77354926 Fixed test 2022-08-14 20:22:01 +03:00
Eldad A. Fux
340cfb0104
Update app/controllers/api/users.php 2022-08-14 20:01:32 +03:00
Eldad Fux
22c38a484f Merge branch 'feat-password-hash-algos' of https://github.com/appwrite/appwrite into feat-missing-phone-param 2022-08-14 19:43:53 +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
Eldad Fux
2ed9199bf1 Added the ability to create a user with a phone number 2022-08-14 18:10:12 +03:00
shimon
ab27e0a74d some fixes 2022-08-14 18:01:34 +03:00
Jake Barnby
613a0f8006 ID and test fixes 2022-08-15 02:22:38 +12:00
Eldad Fux
b36c24c508 Decouple Auth code from SMS provider adapter 2022-08-14 17:19:58 +03:00
Eldad Fux
25f176875d Changed provider name from phone to sms 2022-08-14 16:43:41 +03: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
Damodar Lohani
8fdec117cd fix usage params 2022-08-14 12:04:49 +00:00
Damodar Lohani
e26e2e44cc fix usage attributes 2022-08-14 12:03:21 +00:00
Damodar Lohani
07ace68d75 latest spec and sdk 2022-08-14 11:59:40 +00: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
Christy Jacob
26634cdf0b feat: linter fix 2022-08-14 15:52:19 +05:30
Christy Jacob
bb4693ddfc feat: update email session endpoint 2022-08-14 15:41:21 +05:30
Damodar Lohani
d9745b3477 fix execution list UI 2022-08-14 09:23:41 +00: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
Damodar Lohani
3ce8565513 hide execution stdout and stderr on client side response 2022-08-14 08:54:11 +00:00
Damodar Lohani
734454ee85 hiding stdout and stderr on client execution response 2022-08-14 08:44:17 +00:00
Christy Jacob
ebb9af1eb2 feat: re-order functions endpoint 2022-08-14 13:56:11 +05:30
Christy Jacob
8e24dbe22f feat: update exception class 2022-08-14 13:35:11 +05:30
Christy Jacob
cfab9221f2 feat: exceptions on more files 2022-08-14 12:32:41 +05:30
Christy Jacob
a5bc0a61ca feat: exceptions on more files 2022-08-14 12:26:12 +05:30
Christy Jacob
662bfe0ab8 feat: address issues on projects.php 2022-08-14 11:39:46 +05:30
Steven
610ec1a6a4 Update database query syntax 2022-08-14 05:44:55 +00:00
Christy Jacob
c6f0b14e92 feat: address issues on init.php 2022-08-14 11:05:25 +05:30
Jake Barnby
a8698b6065 Lint 2022-08-14 17:24:50 +12:00
Jake Barnby
c627226ac9 Merge branch 'refactor-permissions-inc-console-fix' of github.com:appwrite/appwrite into refactor-permissions-inc-console-fix 2022-08-14 17:21:44 +12:00
Jake Barnby
b2e659bd3f Review fixes 2022-08-14 17:21:33 +12:00
Jake Barnby
fe5d3a1892 Use permission helpers 2022-08-14 17:21:11 +12:00
Jake Barnby
89dd4be9f1
Update app/config/errors.php 
Co-authored-by: Eldad A. Fux <eldad.fux@gmail.com>
 2022-08-14 17:06:48 +12:00
Bradley Schofield
237f5264d9 Fix vars exception, change cachedoc usage, 2022-08-13 20:18:48 +01:00
shimon
d132202662 some fixes 2022-08-13 20:29:33 +03:00
shimon
02f57cd69d Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-file-cache-cleanup 
 Conflicts:
	composer.lock
 2022-08-13 18:45:29 +03:00
shimon
af56db4048 some fixes 2022-08-13 18:36:44 +03:00
Christy Jacob
5296e61d35 feat: address issues on accounts controller 2022-08-13 20:45:19 +05:30
shimon
630954c94e some fixes 2022-08-13 17:55:27 +03:00
Christy Jacob
8b23dcd69e fix: update constructor, remove account entity, add missing ID error 2022-08-13 20:14:04 +05:30
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
bdc8202422 Bad request for create permission on document/file 2022-08-14 02:24:28 +12:00
Jake Barnby
68cc919aaa Test fixes 2022-08-14 02:10:28 +12:00
Jake Barnby
c6c5ce0619 Fix create file permissions not resetting after create 2022-08-13 23:51:26 +12:00
Eldad A. Fux
5b4a3805bf
Merge pull request #3522 from wess/feat-etsy-auth 
Adds Etsy to OAuth providers
 2022-08-13 13:05:43 +03:00
shimon
51e3fc8cab some fixes 2022-08-13 12:59:34 +03:00
Eldad A. Fux
a91584853c
Merge pull request #3558 from appwrite/fix-teams-roles-no-owner 
Fix teams roles no owner
 2022-08-13 12:37:11 +03:00
Eldad A. Fux
1accc36d8c
Merge pull request #3599 from appwrite/feat-upgrade-database-docker-images 
feat: upgrade mariadb and redis
 2022-08-13 12:25:07 +03:00
Jake Barnby
a44e9f2c09 Add bucket/file permissions comps 2022-08-13 21:02:32 +12:00
Jake Barnby
0cd1b232ed Fix hidden forms 2022-08-13 21:01:33 +12:00
Christy Jacob
3ded17badf fix: linter 2022-08-13 13:40:39 +05:30
shimon
45c46c1794 sync with 0.16 2022-08-13 11:02:00 +03:00
Christy Jacob
d2bf8b25de feat: update db pools 2022-08-13 13:27:04 +05:30
Jake Barnby
62200eda9e Pull secondary form into matrix component to allow multiple in the same page 2022-08-13 19:47:04 +12:00
shimon
e8a2e30bb5 Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-file-cache-cleanup 2022-08-13 10:35:54 +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
shimon
cc9dad6bb8 Tidy up 2022-08-13 10:34:03 +03:00
Jake Barnby
3c8acac758 Show permission block for documents if document security is enabled 2022-08-13 18:34:47 +12:00
Jake Barnby
737ebe408c Don't add create permission to documents/files if missing 2022-08-13 18:34:04 +12:00
Jake Barnby
c66a1991d8 Make permissions matrix reusable 2022-08-13 18:33:11 +12:00
Damodar Lohani
792d657a4f formatting fixes 2022-08-13 05:10:34 +00:00
Damodar Lohani
560bd97fcd organize metrics 2022-08-13 05:02:18 +00:00
Damodar Lohani
c1c325505b organize metrics 2022-08-13 05:01:43 +00:00
Damodar Lohani
85f39ec0ef organize metrics 2022-08-13 05:00:22 +00:00
Damodar Lohani
02074a93ef remove unused import 2022-08-13 04:55:42 +00:00
Damodar Lohani
7717897357 update variable description 2022-08-13 04:55:34 +00:00
Damodar Lohani
3d25ef1be5 refactor case 2022-08-13 04:51:52 +00:00
Damodar Lohani
d688187e23 update metrics value 2022-08-13 04:39:01 +00:00
Damodar Lohani
74a159ab99 fix key 2022-08-13 03:44:57 +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
Damodar Lohani
be00b64b7e Merge branch 'feat-audits-label' of https://github.com/appwrite/appwrite into feat-usage-updates 2022-08-13 03:14:28 +00:00
Steven
1abe9d4c01 Merge branch '0.16.x' into fix-datetime-attributes 2022-08-12 22:54:33 +00:00
Christy Jacob
9693c6e941 Merge branch 'master' of github.com:appwrite/appwrite into 0.16.x 2022-08-12 21:44:36 +05:30
Christy Jacob
4521907b83 feat: refactor workers 2022-08-12 21:39:45 +05:30
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
cb87c248d5 Rebuild Specs, SDKs and start working on subqueries 2022-08-12 16:51:24 +01:00
Jake Barnby
8d4191b1a0 Lint 2022-08-13 02:46:50 +12:00
Jake Barnby
09b001e891 PR fixes 2022-08-13 02:41:57 +12:00
Bradley Schofield
d86e4ac0b6 Run Linter 2022-08-12 15:15:58 +01:00
Bradley Schofield
d9104ceced Update capitalisation on some names 2022-08-12 15:15:36 +01: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
Bradley Schofield
26fad5e8fe Move Variables view to before settings in function 2022-08-12 13:57:45 +01:00
Bradley Schofield
23c3135051 Regenerate Spec and SDK 2022-08-12 13:56:30 +01:00
Jake Barnby
d2b9102f84 Merge remote-tracking branch 'origin/0.16.x' into refactor-permissions-inc-console-fix 
# Conflicts:
#	tests/e2e/Services/Databases/DatabasesBase.php
#	tests/e2e/Services/Databases/DatabasesCustomServerTest.php
 2022-08-13 00:54:27 +12:00
Bradley Schofield
8a2f8ed6ee Merge branch '0.16.x' into feat-variables-api 2022-08-12 13:35:01 +01:00
Jake Barnby
c104860448 Use roles validator for function execution 2022-08-13 00:23:58 +12:00
Jake Barnby
f278517276 Validate permission role input exists 2022-08-12 23:44:27 +12:00
shimon
90cfac9b52 replace request param extractions 2022-08-12 14:01:12 +03:00
Jake Barnby
76f86c74ad Allow updating existing permission rows 2022-08-12 22:37:52 +12:00
Jake Barnby
1d7c25b561 Single role per permissions entry 2022-08-12 22:36:59 +12:00
Jake Barnby
770c08725f Add role suggestions 2022-08-12 14:59:44 +12:00
Jake Barnby
1234cc8152 Styling 2022-08-12 14:59:11 +12:00
Bradley Schofield
072755ce7d Rename users page to Authentication 2022-08-12 02:41:31 +01:00
Jake Barnby
0226478c63 Add cast from csv to array 2022-08-12 13:05:54 +12:00
Eldad A. Fux
057feaf5bd
Merge pull request #3654 from appwrite/fix-password-reset-redirect 
Fix password reset redirect and alert
 2022-08-11 18:34:52 +03:00
shimon
e86aab5e88 ident 2022-08-11 16:47:53 +03:00
Jake Barnby
a5e6c04cb0 Working permission row addition and removal 2022-08-12 01:22:39 +12:00
shimon
b5f977e46d adding user to audits labels 2022-08-11 16:19:05 +03:00
Eldad A. Fux
0f3efde288
Merge pull request #3587 from appwrite/format-remove-unused-param 
Remove unused property
 2022-08-11 14:23:47 +03:00
Eldad A. Fux
f4bbcc9fa3
Merge pull request #3619 from appwrite/fix-phone-search 
Fix: User Search attribute (phone)
 2022-08-11 14:20:44 +03:00
shimon
6a4fee641d clean 2022-08-11 12:04:05 +03:00
shimon
2d8abac0e3 clean 2022-08-11 11:47:18 +03:00
Damodar Lohani
f8721329ba fix network name 2022-08-11 08:34:14 +00:00
Damodar Lohani
13f915cc77 UI update 2022-08-11 08:25:44 +00:00
Damodar Lohani
f0827fef38 formatting issues 2022-08-11 07:02:40 +00:00
Damodar Lohani
cd9efec4d2 refactor 2022-08-11 06:49:20 +00:00
Damodar Lohani
1753dbe8b0 fix formatting 2022-08-11 06:18:37 +00:00
Damodar Lohani
d05e1fdfb3 enable ignoring stats on admin requests 2022-08-11 06:16:10 +00:00
Damodar Lohani
b5f5aff626 fix response and project usage issues 2022-08-11 06:05:38 +00:00
Damodar Lohani
63371ce76e functions usage stats using route labels 2022-08-11 05:25:39 +00:00
Damodar Lohani
c5993ba8b9 storage usage stats via route labels 2022-08-11 02:18:22 +00: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
73f675aebe Merge branch 'feat-audits-label' of https://github.com/appwrite/appwrite into feat-usage-updates 2022-08-11 01:15:29 +00:00
Christy Jacob
cd5f3f2f2b feat: update mock endpoint spec 2022-08-11 00:00:59 +05:30
Christy Jacob
b4e944e9ba feat: run linter 2022-08-10 19:19:58 +05:30
Christy Jacob
741824ef87 feat: move server list to app resource 2022-08-10 19:15:04 +05:30
Bradley Schofield
15fbe86124 Fix variables not being correctly used 2022-08-10 14:43:05 +01:00
Christy Jacob
9fe28e830a feat: add platform to sdk generation script 2022-08-10 18:30:57 +05:30
Christy Jacob
4f218ea6d3 feat: add new mock endpoint for sdk generator tests 2022-08-10 18:22:12 +05:30
Jake Barnby
531247deb4 Collection UI updates 2022-08-10 22:23:53 +12:00
shimon
ac827f6861 cache ver updated 2022-08-10 13:13:05 +03:00
Damodar Lohani
e3cca44dce formatting 2022-08-10 09:56:03 +00:00
Damodar Lohani
9002bbe77e update response format 2022-08-10 09:50:05 +00:00
Bradley Schofield
c566f1e7c9 Fix Tests 2: Electric Boogaloo 2022-08-10 10:32:48 +01:00
shimon
5a15d29a22 sync with 0.16.x 2022-08-10 12:22:55 +03:00
shimon
d31c23d25a Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-audits-label 
 Conflicts:
	app/controllers/api/databases.php
 2022-08-10 12:18:05 +03:00
Damodar Lohani
cb369dd326 update account routes usage labels 2022-08-10 08:45:10 +00:00
Damodar Lohani
c7d6d38ab7 update UI to include logs 2022-08-10 07:24:13 +00:00
Damodar Lohani
391d1127ca update container to accept new response format 2022-08-10 07:19:07 +00:00
shimon
f9b8a0a661 disabling route from cache 2022-08-10 10:08:48 +03:00
Jake Barnby
25e893f712 Revert sdk-generator to master 2022-08-10 18:02:23 +12:00
Jake Barnby
8d83b6ada3 Fix realtime abuse check 2022-08-10 17:42:20 +12:00
Damodar Lohani
8aa7486e71 database usage stats working via labels 2022-08-10 02:33:46 +00:00
Damodar Lohani
ebf3d813cb refactor database usage to labels 2022-08-10 02:18:18 +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
Bradley Schofield
4faa903fb3 Fix Password Reset Alert and Redirect 2022-08-09 17:30:06 +01:00
Bradley Schofield
2215e4db49 Add Parent Database ID to collection and documents 2022-08-09 17:18:43 +01:00
Bradley Schofield
42e0895dad Fix Tests 2022-08-09 16:29:24 +01:00
shimon
d2519c9a5b addressing comments 2022-08-09 17:38:54 +03:00
Wess Cope
9e2e883c82
Update app/config/providers.php 
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
 2022-08-09 10:14:10 -04:00
Torsten Dittmann
d9c7bbd3d2 fix: scripts for filters and charts 2022-08-09 16:05:34 +02:00
shimon
a261dcd171 init from master 2022-08-09 16:43:37 +03:00
Torsten Dittmann
5db5f7217f Merge branch 'origin/datetime-attributes' of https://github.com/appwrite/appwrite into feat-ui-datetime 2022-08-09 14:49:08 +02:00
Bradley Schofield
6882ffaa00 Merge branch '0.16.x' into feat-variables-api 2022-08-09 13:37:24 +01:00
Bradley Schofield
603cb1db34 Update init.php 2022-08-09 13:32:33 +01:00
Bradley Schofield
d4da9d823b Add API Descriptions and use APP_LIMIT_COUNT 2022-08-09 13:11:50 +01:00
shimon
092e682591 Merge branch 'master' of github.com:appwrite/appwrite into feat-file-cache-cleanup 
 Conflicts:
	app/controllers/shared/api.php
 2022-08-09 15:02:29 +03:00
shimon
a937cde7a3 init 2022-08-09 14:57:33 +03:00
Bradley Schofield
c4d453b738 Update Variables API Signature 2022-08-09 12:56:45 +01:00
fogelito
db5d737235 Merge branch '0.16.x' of github.com:appwrite/appwrite into origin/datetime-api 
 Conflicts:
	tests/e2e/Services/Databases/DatabasesBase.php
 2022-08-09 14:37:21 +03:00
Christy Jacob
6a6c7d4b90
Merge pull request #3547 from appwrite/fix-update-status-codes 
Use 202 when resources are created asyncronously
 2022-08-09 14:42:40 +05:30
Christy Jacob
21a3037bdf feat: review comments 2022-08-09 14:22:30 +05:30
Jake Barnby
3611f9df94 Parameter order fix 2022-08-09 18:58:08 +12:00
shimon
eb9ca5d7e3 leftovers 2022-08-09 09:49:55 +03:00
Damodar Lohani
bce998cb53 update imports and fix database usage 2022-08-09 06:28:38 +00:00
Christy Jacob
f26f2d9e9b feat: review comments 2022-08-09 11:43:34 +05:30
Damodar Lohani
99c1f14581 white space fix 2022-08-09 06:07:05 +00:00
Christy Jacob
410597eca7 feat: review comments 2022-08-09 11:35:25 +05:30
Jake Barnby
216486a4c6 Fix DB tests 2022-08-09 18:03:41 +12:00
Christy Jacob
8cae6bb627 feat: review comments 2022-08-09 11:26:53 +05:30
Damodar Lohani
ebac3f5547 usage containers updated 2022-08-09 05:52:53 +00:00
Damodar Lohani
c2b016cb5f update usage interval environment variables 2022-08-09 05:29:24 +00:00
Christy Jacob
7e470d2cb5 feat: review comments 2022-08-09 10:54:17 +05:30
Jake Barnby
fb0168ea50 Fix erroneous whitespace 2022-08-09 14:48:39 +12:00
Christy Jacob
4bced29ec9 feat: review comments 2022-08-09 01:36:36 +05:30
Christy Jacob
82e39ccf52 feat: review comments 2022-08-09 01:12:13 +05:30
shimon
9eb1c3a731 leftovers 2022-08-08 18:44:45 +03:00
shimon
6e0b7cc650 leftovers 2022-08-08 18:44:11 +03:00
shimon
2d7a2bb57f leftovers 2022-08-08 18:23:45 +03:00
shimon
8a79748b6d leftovers 2022-08-08 17:48:51 +03:00
Bradley Schofield
bf050ece0f Fix Exceptions 2022-08-08 15:44:07 +01: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
shimon
89f164bdd7 resource namespace 2022-08-08 15:19:41 +03:00
Jake Barnby
69a79f660f Storage permission check fixes 2022-08-08 22:58:36 +12:00
Jake Barnby
20f621d05c Databases permission check fixes 2022-08-08 22:58:28 +12:00
shimon
a6a9ad8cc0 databases controller 2022-08-08 11:14:27 +03:00
Damodar Lohani
1b1ba985a9 Merge branch 'master' of https://github.com/appwrite/appwrite into feat-usage-updates 2022-08-08 02:18:49 +00:00
shimon
e9ef94e8af account controller 2022-08-07 18:49:30 +03:00
shimon
c8196c41d4 api::payload 2022-08-07 18:09:37 +03:00
shimon
ec39ff267c api::parseLabel 2022-08-07 17:30:47 +03:00
shimon
f4c1a5ea35 response::send 2022-08-07 14:01:00 +03:00
Bishwajeet Parhi
3f15035c1a
Merge branch 'appwrite:master' into feat-disqus-Oauth-provider 2022-08-05 21:24:19 +05:30
Christy Jacob
1dc9f5e842 feat: add new attributes for API Keys 2022-08-05 17:38:04 +05:30
Matej Bačo
6c21723ecb
Merge branch 'appwrite:master' into shiftra 2022-08-05 13:32:06 +02:00
Christy Jacob
c96f1e76e2 feat: add new attributes for API Keys 2022-08-05 15:50:48 +05:30
Christy Jacob
78d02f50af
Merge pull request #3180 from Aragur/feat-XXX-authentik-oauth 
feat: Add authentik as a OAuth provider
 2022-08-05 13:06:05 +05:30
Simon Giesel
0477551293
Update app/config/providers.php 
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
 2022-08-05 08:53:31 +02:00