Elgato_dark/appwrite
1
0
Fork 0
mirror of https://github.com/appwrite/appwrite synced 2026-05-23 08:58:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3
12283 commits 1266 branches 495 tags 510 MiB
Commit graph

1716 commits

Author SHA1 Message Date
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
39231f8cf9 Lint 2022-08-16 19:26:40 +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
Jake Barnby
f672269a8c Handle aggregates per resource type at the controller level 2022-08-16 17:54:44 +12: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
fogelito
f52d28e75f Auth tests 2022-08-15 22:18:37 +03:00
Jake Barnby
b53f185ec6 Remove permissions processor 2022-08-16 00:56:19 +12:00
shimon
0dc485d8d7 some fixes 2022-08-15 12:05:41 +03:00
Jake Barnby
33970276b2 Self review 2022-08-15 19:20:10 +12:00
Eldad Fux
6f74c565e8 Fixed docblock 2022-08-15 09:55:37 +03:00
Jake Barnby
86f209800a Merge remote-tracking branch 'origin/origin/datetime-attributes' into refactor-permissions-inc-queries-update-datetime-fixes 
# Conflicts:
#	composer.json
#	composer.lock
#	src/Appwrite/Utopia/Response/Model/AttributeDatetime.php
 2022-08-15 16:43:47 +12:00
Jake Barnby
7c34387d22 Update specs + console SDK 2022-08-15 16:39:30 +12:00
Steven
6b618a5824 Merge branch 'origin/datetime-attributes' into feat-datetime-attributes-with-database-query-update 2022-08-15 01:45:56 +00: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
Eldad Fux
f88a64df1c Fix for linter 2022-08-14 22:01:58 +03:00
Eldad Fux
9b897629ba Fixed code generator 2022-08-14 21:57:23 +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
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
shimon
ab27e0a74d some fixes 2022-08-14 18:01:34 +03:00
Eldad Fux
53b60c9244 Fix for linter 2022-08-14 17:22:51 +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
fogelito
74ae43b092 global const for TYPE_DATETIME_EXAMPLE change value 2022-08-14 16:56:55 +03:00
Eldad Fux
1da208ad10 Fix adapter name 2022-08-14 16:53:19 +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
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
fogelito
9b9f2fe428 global const for TYPE_DATETIME_EXAMPLE 2022-08-14 13:27:07 +03:00
Damodar Lohani
89b2234c17 update stdout and stderr description 2022-08-14 09:29:46 +00:00
Christy Jacob
fb81627b83 feat: update exception class 2022-08-14 12:49:19 +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
Christy Jacob
c2f7cd6d19 feat: remove logger as an entity 2022-08-14 11:06:04 +05:30
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
fe5d3a1892 Use permission helpers 2022-08-14 17:21:11 +12: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
Jake Barnby
70758927cd Test fixes 2022-08-14 02:55:15 +12: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
Eldad A. Fux
ba239de8be
Merge branch '0.16.x' into fix-unit-tests 2022-08-13 12:28:33 +03: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
Jake Barnby
737ebe408c Don't add create permission to documents/files if missing 2022-08-13 18:34:04 +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
Christy Jacob
9693c6e941 Merge branch 'master' of github.com:appwrite/appwrite into 0.16.x 2022-08-12 21:44:36 +05:30
Bradley Schofield
160433ec9c
Update src/Appwrite/Utopia/Response/Model/AlgoArgon2.php 
Co-authored-by: Eldad A. Fux <eldad.fux@gmail.com>
 2022-08-12 16:55:47 +01:00
Bradley Schofield
693e18e5d9
Update src/Appwrite/Utopia/Response/Model/AlgoArgon2.php 
Co-authored-by: Eldad A. Fux <eldad.fux@gmail.com>
 2022-08-12 16:55:33 +01:00
Bradley Schofield
b8d07cf43f
Update src/Appwrite/Utopia/Response/Model/AlgoArgon2.php 
Co-authored-by: Eldad A. Fux <eldad.fux@gmail.com>
 2022-08-12 16:54:31 +01:00
Jake Barnby
09b001e891 PR fixes 2022-08-13 02:41:57 +12: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
47129afcfa Remove constants from response models 2022-08-12 03:00:29 +01:00
Damodar Lohani
5424b85685 update execution response model 2022-08-10 07:20:16 +00:00
Christy Jacob
0b813ed159
Merge pull request #3649 from appwrite/fix-deployment-example 
Deployment object model example updated
 2022-08-10 02:01:59 +05:30
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
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
fogelito
01106d801a Merge branch 'origin/datetime-attributes' of github.com:appwrite/appwrite into origin/datetime-api 
 Conflicts:
	composer.lock
	src/Appwrite/Stats/Usage.php
 2022-08-09 14:44:11 +03:00
fogelito
82a240998b Merge branch '0.16.x' of github.com:appwrite/appwrite into origin/datetime-attributes 
 Conflicts:
	composer.lock
	src/Appwrite/Stats/Usage.php
 2022-08-09 14:20:26 +03:00
Torsten Dittmann
08ba652464 fix: tests 2022-08-09 12:45:15 +02:00
Jake Barnby
1ddd34059b Append type to open bracket to ensure permissions containing a permission type name are not removed 2022-08-09 13:23:03 +12:00
Bishwajeet Parhi
4ac204d230
Merge branch 'appwrite:master' into feat-disqus-Oauth-provider 2022-08-08 21:21:47 +05:30
Wen Yu Ge
75595dd07f Deployment payload example updated 2022-08-08 10:45:45 -04:00
Bradley Schofield
43660d9c8f Merge branch 'master' into feat-simplify-exceptions 2022-08-08 15:03:01 +01:00
Bishwajeet Parhi
f4c5b4c11d lints fixed 2022-08-08 12:44:11 +00:00
Jake Barnby
4b78169152 Fix setting default permissions 2022-08-08 22:59:16 +12:00
Torsten Dittmann
641740db77 fix: response model with nullable defaults 2022-08-08 12:35:28 +02:00
Jake Barnby
686c42ae07 Add permission allowed for user type check function 2022-08-08 22:26:07 +12:00
Jake Barnby
ac11617655 Handle null permissions when processing aggregates 2022-08-08 22:19:47 +12:00
shimon
f4c1a5ea35 response::send 2022-08-07 14:01:00 +03:00
Eldad A. Fux
e93c3483c8
Merge pull request #3640 from appwrite/fix-deployment-object 
Add possible status codes to deployment object.
 2022-08-06 07:20:55 +03:00
Bishwajeet Parhi
6c653d8f2a remove whitespace 2022-08-05 16:21:47 +00:00
Bishwajeet Parhi
999962d161 add comments denoting return type and parameters if any 2022-08-05 16:09:38 +00:00
Bishwajeet Parhi
9cd10686bb
Update src/Appwrite/Auth/OAuth2/Disqus.php 
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
 2022-08-05 21:25:41 +05:30
Bishwajeet Parhi
6fdf578919
Update src/Appwrite/Auth/OAuth2/Disqus.php 
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
 2022-08-05 21:25:34 +05:30
Bishwajeet Parhi
dab0a8ec27
Update src/Appwrite/Auth/OAuth2/Disqus.php 
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
 2022-08-05 21:25:21 +05:30
Bishwajeet Parhi
3f15035c1a
Merge branch 'appwrite:master' into feat-disqus-Oauth-provider 2022-08-05 21:24:19 +05:30
Matej Bačo
6c21723ecb
Merge branch 'appwrite:master' into shiftra 2022-08-05 13:32:06 +02:00
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
Jake Barnby
08609af053 Add permissions process function to add default 2022-08-05 17:24:11 +12:00
Jake Barnby
62b1eba836 Replace write refs 2022-08-05 17:23:18 +12:00
Vincent (Wen Yu) Ge
c6223fd6b0 add possible status codes 2022-08-04 17:51:57 +00:00
Jake Barnby
7b9fb32fae Update role references 2022-08-03 21:52:34 +12:00
Jake Barnby
1ab86c9331 Role reference updates 2022-08-03 16:17:49 +12:00
Jake Barnby
ce38e74ba2 Update remaining services to new permissions 2022-08-02 21:21:53 +12:00
Jake Barnby
4520114780 Refactor storage to use new permissions 2022-08-02 21:19:15 +12:00
Jake Barnby
9a182d615a Refactor databases to use new permissions 2022-08-02 21:18:49 +12:00
Torsten Dittmann
bf9533007b tests: fix unit tests 2022-08-01 12:22:04 +02:00
Matej Bačo
8c825d477f Merge commit '8d99860c55cff4ab1291a51ee5b6c7900641e1eb' into shiftra 2022-08-01 04:37:30 +00:00
shimon
45ad0f6bdf Reference comments 2022-07-30 22:10:30 +03:00
shimon
5511a93e9c Expires header returned to the endpoints 2022-07-28 18:24:18 +03:00
Torsten Dittmann
a4588cc848 Merge branch 'master' of https://github.com/appwrite/appwrite into origin/datetime-api 2022-07-28 14:49:28 +02:00
Torsten Dittmann
e3fee55e3d Merge branch 'origin/datetime-api' of https://github.com/appwrite/appwrite into origin/datetime-api 2022-07-28 14:45:15 +02:00
Torsten Dittmann
7b95c46cf5 Merge branch 'master' of https://github.com/appwrite/appwrite into origin/datetime-api 2022-07-28 14:40:45 +02:00
Torsten Dittmann
bd550f8a1e feat: ui for datetime attribute 2022-07-28 14:38:54 +02:00
fogelito
fcc4ed396a Change $conditions to TYPE_DATETIME 2022-07-28 15:03:14 +03:00
fogelito
ba40ac4e90 Change models Class name 2022-07-28 13:26:22 +03:00