Skip to content

Commit

Permalink
Merge pull request #1157 from nextcloud/photos2
Browse files Browse the repository at this point in the history
  • Loading branch information
marcelklehr authored Aug 23, 2022
2 parents 7f9168f + 60a5b1d commit 7687e21
Show file tree
Hide file tree
Showing 137 changed files with 29,908 additions and 14,397 deletions.
1 change: 1 addition & 0 deletions .php_cs.dist → .php-cs-fixer.dist.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
$config = new Config();
$config
->getFinder()
->ignoreVCSIgnored(true)
->notPath('build')
->notPath('l10n')
->notPath('src')
Expand Down
12 changes: 12 additions & 0 deletions appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
<author mail="skjnldsv@protonmail.com">John Molakvoæ</author>
<namespace>Photos</namespace>
<category>multimedia</category>
<types>
<dav/>
</types>

<website>https://github.com/nextcloud/photos</website>
<bugs>https://github.com/nextcloud/photos/issues</bugs>
Expand All @@ -25,4 +28,13 @@
<order>1</order>
</navigation>
</navigations>

<sabre>
<collections>
<collection>OCA\Photos\Sabre\RootCollection</collection>
</collections>
<plugins>
<plugin>OCA\Photos\Sabre\Album\PropFindPlugin</plugin>
</plugins>
</sabre>
</info>
24 changes: 24 additions & 0 deletions appinfo/routes.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,30 @@
'path' => '',
]
],
['name' => 'page#index', 'url' => '/folders/{path}', 'verb' => 'GET', 'postfix' => 'folders',
'requirements' => [
'path' => '.*',
],
'defaults' => [
'path' => '',
]
],
['name' => 'page#index', 'url' => '/folders/{path}', 'verb' => 'GET', 'postfix' => 'folders',
'requirements' => [
'path' => '.*',
],
'defaults' => [
'path' => '',
]
],
['name' => 'page#index', 'url' => '/faces/{path}', 'verb' => 'GET', 'postfix' => 'faces',
'requirements' => [
'path' => '.*',
],
'defaults' => [
'path' => '',
]
],
['name' => 'page#index', 'url' => '/shared/{path}', 'verb' => 'GET', 'postfix' => 'shared',
'requirements' => [
'path' => '.*',
Expand Down
8 changes: 5 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,10 @@
"psalm:update-baseline": "psalm --update-baseline"
},
"require-dev": {
"nextcloud/coding-standard": "^0.5.0",
"nextcloud/coding-standard": "1.0",
"phpunit/phpunit": "^9",
"vimeo/psalm": "^4.22"
"vimeo/psalm": "^4.22",
"christophwurst/nextcloud": "dev-master",
"sabre/dav": "^4.2.1"
}
}
}
Loading

0 comments on commit 7687e21

Please sign in to comment.