Commit Graph
5983 Commits
Author SHA1 Message Date
Wess CopeandChristy Jacob 97117f2fde Update src/Appwrite/Auth/OAuth2/Etsy.php
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2022-08-09 08:15:38 -04:00
Wess CopeandChristy Jacob 27e54fae4c Update src/Appwrite/Auth/OAuth2/Etsy.php
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2022-08-09 08:15:28 -04:00
Wess CopeandChristy Jacob f1887449ab Update src/Appwrite/Auth/OAuth2/Etsy.php
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2022-08-09 08:15:19 -04:00
Bradley Schofield bf3c15708d Update Variable Attribute Desc 2022-08-09 13:13:46 +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
Bradley Schofield af0c111d2e Rollback Func Correctly 2022-08-09 13:00:16 +01:00
Bradley Schofield fb091f1b48 Revert "Rollback Func.php"
This reverts commit fe88ea4f9a.
2022-08-09 12:59:35 +01:00
Bradley Schofield fe88ea4f9a Rollback Func.php 2022-08-09 12:58:59 +01: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
Damodar Lohani 59477a9fa9 functions stats 2022-08-09 08:19:45 +00:00
Damodar Lohani b50863ff9f update aggregator 2022-08-09 07:12:04 +00: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
Damodar Lohani 7affd0579e usage refactor setups 2022-08-09 01:22:18 +00:00
Christy Jacob 82e39ccf52 feat: review comments 2022-08-09 01:12:13 +05:30
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
Damodar Lohani 84a9dcf6cb formatting 2022-08-08 06:59:52 +00:00
Damodar Lohani 01823d18c6 Merge branch 'feat-usage-updates' of https://github.com/appwrite/appwrite into feat-refactor-usage-stats 2022-08-08 02:20:58 +00:00
Damodar Lohani 98330cdfa1 fixes 2022-08-08 02:20:54 +00: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
Damodar Lohani 178414cef4 Merge branch 'feat-usage-updates' of https://github.com/appwrite/appwrite into feat-refactor-usage-stats 2022-08-08 01:59:37 +00:00
Damodar Lohani 6ea4098679 new metrics aggregation 2022-08-08 01:33:34 +00: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 ParhiandChristy Jacob 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 ParhiandChristy Jacob 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 ParhiandChristy Jacob 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 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
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
Damodar Lohani 0d62f30d7b rename file 2022-08-04 12:36:04 +05:45
Damodar Lohani 34794d2554 Merge branch 'master' of https://github.com/appwrite/appwrite into feat-usage-updates 2022-08-04 06:03:39 +00:00
Damodar Lohani a0e056abc1 fix indentation 2022-08-04 06:03:04 +00:00
Bradley Schofield f62ad19ecd Fix old function tests 2022-08-03 13:32:50 +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