Skip to content

Commit 7687e21

Browse files
authored
Merge pull request #1157 from nextcloud/photos2
2 parents 7f9168f + 60a5b1d commit 7687e21

137 files changed

Lines changed: 29908 additions & 14397 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.php_cs.dist renamed to .php-cs-fixer.dist.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
$config = new Config();
1010
$config
1111
->getFinder()
12+
->ignoreVCSIgnored(true)
1213
->notPath('build')
1314
->notPath('l10n')
1415
->notPath('src')

appinfo/info.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010
<author mail="skjnldsv@protonmail.com">John Molakvoæ</author>
1111
<namespace>Photos</namespace>
1212
<category>multimedia</category>
13+
<types>
14+
<dav/>
15+
</types>
1316

1417
<website>https://github.com/nextcloud/photos</website>
1518
<bugs>https://github.com/nextcloud/photos/issues</bugs>
@@ -25,4 +28,13 @@
2528
<order>1</order>
2629
</navigation>
2730
</navigations>
31+
32+
<sabre>
33+
<collections>
34+
<collection>OCA\Photos\Sabre\RootCollection</collection>
35+
</collections>
36+
<plugins>
37+
<plugin>OCA\Photos\Sabre\Album\PropFindPlugin</plugin>
38+
</plugins>
39+
</sabre>
2840
</info>

appinfo/routes.php

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,30 @@
3838
'path' => '',
3939
]
4040
],
41+
['name' => 'page#index', 'url' => '/folders/{path}', 'verb' => 'GET', 'postfix' => 'folders',
42+
'requirements' => [
43+
'path' => '.*',
44+
],
45+
'defaults' => [
46+
'path' => '',
47+
]
48+
],
49+
['name' => 'page#index', 'url' => '/folders/{path}', 'verb' => 'GET', 'postfix' => 'folders',
50+
'requirements' => [
51+
'path' => '.*',
52+
],
53+
'defaults' => [
54+
'path' => '',
55+
]
56+
],
57+
['name' => 'page#index', 'url' => '/faces/{path}', 'verb' => 'GET', 'postfix' => 'faces',
58+
'requirements' => [
59+
'path' => '.*',
60+
],
61+
'defaults' => [
62+
'path' => '',
63+
]
64+
],
4165
['name' => 'page#index', 'url' => '/shared/{path}', 'verb' => 'GET', 'postfix' => 'shared',
4266
'requirements' => [
4367
'path' => '.*',

composer.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,10 @@
1515
"psalm:update-baseline": "psalm --update-baseline"
1616
},
1717
"require-dev": {
18-
"nextcloud/coding-standard": "^0.5.0",
18+
"nextcloud/coding-standard": "1.0",
1919
"phpunit/phpunit": "^9",
20-
"vimeo/psalm": "^4.22"
20+
"vimeo/psalm": "^4.22",
21+
"christophwurst/nextcloud": "dev-master",
22+
"sabre/dav": "^4.2.1"
2123
}
22-
}
24+
}

0 commit comments

Comments
 (0)