1
0
Fork 0
mirror of synced 2024-07-06 07:00:56 +12:00
appwrite/app/config
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
..
avatars format files in app, src, tests 2022-05-23 14:54:50 +00:00
locale Update fr.json 2022-06-10 15:53:45 +02:00
specs Revert sdk-generator to master 2022-08-10 18:02:23 +12:00
storage chore: run linter 2022-06-20 11:24:05 +02:00
auth.php Merge branch 'appwrite:master' into feat-XXX-authentik-oauth 2022-07-06 11:02:59 +02:00
collections.php Merge remote-tracking branch 'origin/fix-datetime-attributes' into refactor-permissions-inc-queries-update-datetime-fixes 2022-08-14 23:11:05 +12:00
errors.php Update app/config/errors.php 2022-08-14 17:06:48 +12:00
events.php Merge branch 'appwrite:master' into feat-XXX-authentik-oauth 2022-07-06 11:02:59 +02:00
platforms.php Update platforms.php 2022-07-20 16:59:03 +01:00
providers.php Merge branch 'appwrite:master' into feat-disqus-Oauth-provider 2022-08-05 21:24:19 +05:30
roles.php Update configs 2022-08-03 21:52:04 +12:00
runtimes.php fix linter issues in app directory 2022-05-30 17:41:25 +00:00
scopes.php Merge branch 'appwrite:master' into feat-XXX-authentik-oauth 2022-07-06 11:02:59 +02:00
services.php Merge branch 'appwrite:master' into feat-XXX-authentik-oauth 2022-07-06 11:02:59 +02:00
variables.php sync: with master 2022-07-25 12:17:08 +02:00