nextcloud
/
photos
mirror of https://github.com/nextcloud/photos
0
0
Fork 0
Code Issues Releases Wiki Activity
2,930 Commits 88 Branches 363 Tags 1.3 GiB
Commit Graph

207 Commits

Author SHA1 Message Date
Simon Spannagel bff6581467 Fix comparisons in isCollaborator 
Signed-off-by: Simon Spannagel <simonspa@kth.se>
 2023-01-24 07:13:58 +01:00
Simon Spannagel b89d47d1eb SharedAlbumRoot: correctly check if user is collaborator 
Signed-off-by: Simon Spannagel <simonspa@kth.se>
 2023-01-24 07:13:58 +01:00
Simon Spannagel 7059fa97b1 AlbumMapper: add method to check if user is collaborator for album 
Signed-off-by: Simon Spannagel <simonspa@kth.se>
 2023-01-24 07:13:58 +01:00
Simon Spannagel 4e6a6627ae reuse user delete method to remove collaborators 
Signed-off-by: Simon Spannagel <simonspa@kth.se>
 2023-01-24 07:13:07 +01:00
Simon Spannagel b7c2d61432 Remove photos from user if they removed themselves 
Signed-off-by: Simon Spannagel <simonspa@kth.se>
 2023-01-24 07:13:07 +01:00
Simon Spannagel 436c40cc92 Shared albums: remove photos from collaborators when removed 
Signed-off-by: Simon Spannagel <simonspa@kth.se>
 2023-01-24 07:13:07 +01:00
Simon Spannagel 6aa4c504aa Fix user folder access, not member but local variable 
Signed-off-by: Simon Spannagel <simonspa@kth.se>
 2023-01-22 13:58:04 +01:00
Simon Spannagel 3a8e9353b7 Fix comparison in PreviewController: album Ids are int 
Signed-off-by: Simon Spannagel <simonspa@kth.se>
 2023-01-22 13:57:48 +01:00
Simon Spannagel 3f6bf4acc1 Listen to NodeDeletedEvent to remove photos from albums 
Signed-off-by: Simon Spannagel <simonspa@kth.se>
 2023-01-22 13:13:05 +01:00
John Molakvoæ 8f7cb0c081
Fix version20003Date20221102170153 migration 
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
 2022-11-25 12:58:13 +01:00
Louis Chemineau 595dcf15fb Prevent throwing an error in node deletion hook 
Fix #35287

Signed-off-by: Louis Chemineau <louis@chmn.me>
 2022-11-23 12:00:35 +01:00
Nico Kaiser 4ace26638d Remove broken icons.css references 
Signed-off-by: Nico Kaiser <nico@kaiser.me>
 2022-11-08 11:14:26 +01:00
Louis Chemineau 20e3e61ad5 Add primary key index to collaborators table 
- Create new `photos_albums_collabs` table
     - with an `id` auto-incremented column
     - with a primary key using the `id` column
     - with a unique index instead of a unique constraint
- Move data from `photos_collaborators` to `photos_albums_collabs`
- Delete `photos_collaborators` table

Signed-off-by: Louis Chemineau <louis@chmn.me>
 2022-11-03 12:58:33 +01:00
Louis fbd1ed3693
Merge pull request #1374 from nextcloud/fix/tag-translations 
Make tag translations work by loading recognize translations
 2022-10-20 13:54:08 +02:00
Louis 4045020519
Merge pull request #1389 from nextcloud/artonge/fix/share_album_content_fetching 
Fix logic of share album content fetching
 2022-10-20 12:16:15 +02:00
Louis Chemineau 8dcc543386 Fix logic of share album content fetching 
Signed-off-by: Louis Chemineau <louis@chmn.me>
 2022-10-19 16:40:45 +02:00
Marcel Klehr b854213f07 Make tag translations work by loading recognize translations 
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
 2022-10-19 16:04:26 +02:00
Louis Chemineau ddb276bb09 Limit auth backend to public albums 
Signed-off-by: Louis Chemineau <louis@chmn.me>
 2022-10-18 17:35:36 +02:00
John Molakvoæ e69199b162
Make sure the default photos folder exists if none 
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
 2022-10-11 15:41:18 +02:00
Louis Chemineau b93db5fc8e Fix e2e tests 
Signed-off-by: Louis Chemineau <louis@chmn.me>
 2022-10-10 20:10:03 +02:00
Louis Chemineau 01e1ca0c12 Remove public upload code 
Signed-off-by: Louis Chemineau <louis@chmn.me>
 2022-10-10 12:23:52 +02:00
Louis Chemineau 142fe83638 Make public pages work 
Signed-off-by: Louis Chemineau <louis@chmn.me>
 2022-10-10 12:23:52 +02:00
Louis Chemineau a2890b03e7 Refactor getting album storage folder 
Signed-off-by: Louis Chemineau <louis@chmn.me>
 2022-10-10 12:23:52 +02:00
Louis Chemineau dc44603b7c Remove useless initial state 
Signed-off-by: Louis Chemineau <louis@chmn.me>
 2022-10-10 12:23:52 +02:00
Louis Chemineau fb218a1ee7 Apply suggestions 
Signed-off-by: Louis Chemineau <louis@chmn.me>
 2022-10-10 12:23:52 +02:00
Louis Chemineau 57373f329a Cleaning before review 
Signed-off-by: Louis Chemineau <louis@chmn.me>
 2022-10-10 12:23:52 +02:00
Louis Chemineau e88d44909d Revert "Display album's name instead of token" 
This reverts commit 2de383f22f04d82c14696f4f084c0e2c592d3d1f.

Signed-off-by: Louis Chemineau <louis@chmn.me>
 2022-10-10 12:23:52 +02:00
Louis Chemineau a7979d22ab Generate token in the backend 
Signed-off-by: Louis Chemineau <louis@chmn.me>
 2022-10-10 12:23:52 +02:00
Louis Chemineau bb97d6eb84 Apply review suggestions 
Signed-off-by: Louis Chemineau <louis@chmn.me>
 2022-10-10 12:23:52 +02:00
Louis Chemineau 5dfa6df07a Display album's name instead of token 
Signed-off-by: Louis Chemineau <louis@chmn.me>
 2022-10-10 12:23:52 +02:00
Louis Chemineau ff01726c6b Add public link logic 
Signed-off-by: Louis Chemineau <louis@chmn.me>
 2022-10-10 12:23:52 +02:00
Louis Chemineau 769064eecd Fix psalm errors 
Signed-off-by: Louis Chemineau <louis@chmn.me>
 2022-09-27 11:37:04 +02:00
John Molakvoæ 804b92fcf4
Do not get all the files list when fetching the albums list 
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
 2022-09-23 10:39:57 +02:00
John Molakvoæ e737b083e5
Fix Trashbin deletion event 
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
 2022-09-22 16:05:24 +02:00
Louis Chemineau b1e99c1d08 Allow album owner to get file added by collaborators 
Signed-off-by: Louis Chemineau <louis@chmn.me>
 2022-09-20 13:31:00 +02:00
Louis 49b937a203
Merge pull request #1247 from nextcloud/polish/albums 
Polish albums - second round
 2022-09-20 11:41:49 +02:00
Louis Chemineau cdf57cbf60 Support receiving two albums with the same names 
Signed-off-by: Louis Chemineau <louis@chmn.me>
 2022-09-20 10:50:14 +02:00
Louis Chemineau 8b1d98e523 Disambiguate `album_id` on group by 
Signed-off-by: Louis Chemineau <louis@chmn.me>
 2022-09-20 10:45:27 +02:00
Arthur Schiwon f82a1763a5
owner really must allow null 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2022-09-19 19:04:20 +02:00
Vincent Petry 33cbb68f75
Update lib/Migration/Version20001Date20220830131446.php 
Co-authored-by: blizzz <blizzz@arthur-schiwon.de>
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2022-09-19 18:04:58 +02:00
Vincent Petry cb82c6e686
Make photos_albums_files.owner nullable for beta migrations 
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2022-09-19 17:18:38 +02:00
John Molakvoæ ae9a429b7c
Fix missing owner 
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
 2022-09-17 10:32:08 +02:00
John Molakvoæ 76300e9a7c
Add Albums upload 
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
 2022-09-17 10:32:06 +02:00
Louis Chemineau f8b106783e Add public sharing 
Signed-off-by: Louis Chemineau <louis@chmn.me>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
 2022-09-16 15:31:00 +00:00
Louis Chemineau 73e726a3dc Rename collaborator.source to .type 
And do the mapping in the frontend

Signed-off-by: Louis Chemineau <louis@chmn.me>
 2022-09-16 14:41:29 +02:00
Louis Chemineau 58947bb618 Use album owner if album file owner is null 
Signed-off-by: Louis Chemineau <louis@chmn.me>
 2022-09-16 14:41:29 +02:00
Louis Chemineau 331e2c742f Overall polishing of backend code for albums 
Signed-off-by: Louis Chemineau <louis@chmn.me>
 2022-09-16 14:41:29 +02:00
Louis Chemineau 35af106097 Add collaborators management views 
Signed-off-by: Louis Chemineau <louis@chmn.me>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
 2022-09-16 07:44:28 +00:00
John Molakvoæ dd48e4992d
Merge pull request #1225 from nextcloud/feat/upload-albums 2022-09-13 12:45:58 +02:00
John Molakvoæ 8c4bc0d0ca
Album upload 
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
 2022-09-13 12:43:56 +02:00
John Molakvoæ b07696089a
Allow to PUT files into an album 
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
 2022-09-13 12:33:13 +02:00
John Molakvoæ 8f1003f132
Catch invalid fileInfo in propFind 
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
 2022-09-13 12:29:27 +02:00
John Molakvoæ 000b7de594
Catch invalid fileInfo in propFind 
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
 2022-09-13 12:29:05 +02:00
John Molakvoæ 6c24c0d4e7
Syntax fix 
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
 2022-09-10 08:40:25 +02:00
Louis Chemineau 2ed149136b
Handle node deletion event 
To remove files from album when they are deleted.

Signed-off-by: Louis Chemineau <louis@chmn.me>
 2022-09-09 08:14:01 +02:00
John Molakvoæ 510ab59794 Fix viewer editor permissions 
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
 2022-09-06 13:20:27 +02:00
John Molakvoæ a07c06ff69
Implement default Photos folder 
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
 2022-08-30 11:38:41 +02:00
Carl Schwan 33462ff40c
Use stub implementation 
Signed-off-by: Carl Schwan <carl@carlschwan.eu>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
 2022-08-23 15:37:57 +02:00
Marcel Klehr 41da638fc1 Implement isRecognizeInstalled check 
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
 2022-08-23 14:30:18 +02:00
Louis Chemineau c8bf3a52d6 Add Albums view 
Signed-off-by: Louis Chemineau <louis@chmn.me>
 2022-08-22 20:04:58 +02:00
Robin Appelman ef3780dad0 expose location and last-photo in dav 
Signed-off-by: Louis Chemineau <louis@chmn.me>
 2022-08-22 20:03:52 +02:00
Robin Appelman f4dea80783 store album location and last added photo 
Signed-off-by: Louis Chemineau <louis@chmn.me>
 2022-08-22 20:03:52 +02:00
Robin Appelman fe215a8575 expose more metadata 
Signed-off-by: Louis Chemineau <louis@chmn.me>
 2022-08-22 20:03:52 +02:00
Robin Appelman 6bb2c7a864 cast to int 
Signed-off-by: Louis Chemineau <louis@chmn.me>
 2022-08-22 20:03:52 +02:00
Robin Appelman 3b62ffb0f9 better error for duplicate 
Signed-off-by: Louis Chemineau <louis@chmn.me>
 2022-08-22 20:03:52 +02:00
Robin Appelman 9c68a0fbfe fix copyright headers 
Signed-off-by: Louis Chemineau <louis@chmn.me>
 2022-08-22 20:03:52 +02:00
Robin Appelman 62dbf99ec0 use unique filenames in albums 
Signed-off-by: Louis Chemineau <louis@chmn.me>
 2022-08-22 20:03:52 +02:00
Robin Appelman 3cd7fede24 dav api 
Signed-off-by: Louis Chemineau <louis@chmn.me>
 2022-08-22 20:03:51 +02:00
Robin Appelman 4aa8a0a78f retreive more metadata for album files 
Signed-off-by: Louis Chemineau <louis@chmn.me>
 2022-08-22 20:03:51 +02:00
Robin Appelman 10f44aacc8 add album database management bits 
Signed-off-by: Louis Chemineau <louis@chmn.me>
 2022-08-22 20:03:51 +02:00
John Molakvoæ be2a1097cf
Update php styling for 7.4 
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
 2022-05-10 08:44:27 +02:00
Marcel Klehr 825e01d721 Implement .nomedia/.noimage filter 
for Timeline and Tags

fixes #234

Signed-off-by: Marcel Klehr <mklehr@gmx.net>
 2022-03-17 14:06:58 +01:00
John Molakvoæ 05f51cc88e
Revert "allow image/x-dcraw (eg .cr2) in photos" 2021-09-06 09:20:36 +02:00
Andreas Böckler 3e647c9645 allow image/x-dcraw (eg .cr2) in photos 2021-08-06 23:51:39 +02:00
John Molakvoæ (skjnldsv) 4c682bb9c5 Lint fix 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
 2021-08-04 07:25:11 +00:00
Roeland Jago Douma 3c16d2785c
Some fixes 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2021-01-04 13:04:02 +01:00
Jakob Röhrl c1e3e97f22
show if tags are installed 
Signed-off-by: Jakob Röhrl <jakob.roehrl@web.de>
 2020-10-27 09:36:45 +01:00
Corentin Mors b28469bfb0
Instant feel 
Signed-off-by: Corentin Mors <corentin.mors@dashlane.com>
 2020-10-23 15:05:46 +02:00
John Molakvoæ (skjnldsv) 3a71094efa
Pass preview availability too 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2020-10-23 14:14:48 +02:00
John Molakvoæ (skjnldsv) f612c264bb Non-cropped layout 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
 2020-10-16 07:10:00 +00:00
Corentin Mors 3f7ea970e4
Implement "your video" tab 
Signed-off-by: Corentin Mors <corentin.mors@dashlane.com>
 2020-10-14 18:03:21 +02:00
John Molakvoæ f888afecbc
Merge branch 'master' into 208-show-png 2020-10-12 17:14:19 +02:00
John Molakvoæ d9f733d8cd
Merge pull request #318 from steiny2k/heic 
Allow heic images in the photos overview
 2020-09-16 10:43:58 +02:00
Roeland Jago Douma 92dcc4d93c
Show groupfolders in shared folders 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-07-24 08:37:42 +02:00
Morris Jobke f8ba6fd428
Use IBootstrap for the app 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2020-07-14 04:25:56 +02:00
John Molakvoæ (skjnldsv) b8f714a62a
Add php cs 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2020-07-13 12:30:53 +02:00
John Molakvoæ (skjnldsv) e88fcd0854
Bump dist & fix script loading name 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2020-07-13 12:25:16 +02:00
Sebastian Steinmetz 411861c778 Allow heic images in the photos overview 
Signed-off-by: Sebastian Steinmetz <462714+steiny2k@users.noreply.github.com>
 2020-04-29 09:57:56 +02:00
Frank Lanitz 005726c31d Enable support for image/png 
Signed-off-by: Frank Lanitz <frank@frank.uvena.de>
 2020-04-10 16:05:33 +02:00
Roeland Jago Douma bcb0f07e43
Don't flatten out albums 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-02-27 15:29:48 +01:00
Robin Appelman ecfc59437a ignore unavailable storages while scanning for albums 2020-02-25 17:55:15 +01:00
Roeland Jago Douma 5acd996190
Respect .noimage and .nomedia files 
Fixes #75

When a folder has a .noimage or .nomedia node. Just don't show the
folder in the album overview. Ignore it and do not traverse it.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-01-27 08:59:09 +01:00
Jakob Röhrl 1287d14f21 fix map link 
Signed-off-by: Jakob Röhrl <jakob.roehrl@web.de>
 2020-01-15 10:27:49 +01:00
John Molakvoæ (skjnldsv) f9ac77f41c
Remove undeeded scripts 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2019-12-10 08:51:21 +01:00
John Molakvoæ (skjnldsv) ea4f253335
Fix client load requirement for sidebar 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
 2019-12-05 16:44:41 +01:00
Jakob 74120cc0e3 UI 
Signed-off-by: Jakob <jakob.roehrl@web.de>
 2019-12-04 11:50:33 +01:00
Jakob 10778fd6be get map info 
Signed-off-by: Jakob <jakob.roehrl@web.de>
 2019-12-04 10:42:57 +01:00
Jakob c73e919829 1st try 
Signed-off-by: Jakob <jakob.roehrl@web.de>
 2019-11-28 19:19:09 +01:00
John Molakvoæ (skjnldsv) bae4efe62f
Proper mimes, initialstate and video loading placeholder 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2019-11-18 16:09:46 +01:00
Roeland Jago Douma f17052118d
Use relative path 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-11-18 13:50:38 +01:00
John Molakvoæ (skjnldsv) e6e6b217de
Use albums/shared endpoint 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2019-11-14 17:25:42 +01:00
John Molakvoæ (skjnldsv) 00ec425d5a
Fix default usable state 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2019-11-14 12:33:01 +01:00
Roeland Jago Douma 1cc1366eb3
Require CSRF 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-11-13 09:20:09 +01:00
Roeland Jago Douma c88707760e
Merge remote-tracking branch 'origin/master' into enh/albums 2019-11-13 09:19:09 +01:00
Roeland Jago Douma f895fa76ee
Add album fetch routes 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-11-11 08:16:12 +01:00
John Molakvoæ (skjnldsv) ae28cc9b2d
Added navigation, albums, init tags 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2019-11-07 19:45:14 +01:00
John Molakvoæ (skjnldsv) 9c94a3e10f
This is photos 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2019-11-04 18:54:03 +01:00