Skip to content

Commit

Permalink
Merge pull request #550 from nextcloud/feat/virtual-grid
Browse files Browse the repository at this point in the history
[stable20] Feat/virtual grid
  • Loading branch information
skjnldsv authored Nov 25, 2020
2 parents 8453cfc + 766de95 commit 665b79d
Show file tree
Hide file tree
Showing 60 changed files with 4,827 additions and 5,647 deletions.
5 changes: 4 additions & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
module.exports = {
extends: [
'@nextcloud'
]
],
globals: {
appName: true
}
};
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

## Why is this so awesome?

* **📸 Beautiful Photo und Video Timeline**
* **📸 Beautiful Photo and Video Timeline**
* **⭐ Favorites and Tagging:** Favorite and tag your photos!
* **Slideshow and easy sharing:** Show slideshows and share your photos or albums easy
* **Albums:** Create albums from your contents
Expand Down
2 changes: 1 addition & 1 deletion appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<name>Photos</name>
<summary>Your memories under your control</summary>
<description>Your memories under your control</description>
<version>1.2.0</version>
<version>1.2.1</version>
<licence>agpl</licence>
<author mail="skjnldsv@protonmail.com">John Molakvoæ</author>
<namespace>Photos</namespace>
Expand Down
4 changes: 4 additions & 0 deletions appinfo/routes.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,11 @@

return [
'routes' => [
['name' => 'api#setUserConfig', 'url' => '/api/v1/config/{key}', 'verb' => 'PUT'],
['name' => 'api#serviceWorker', 'url' => '/service-worker.js', 'verb' => 'GET'],

['name' => 'page#index', 'url' => '/', 'verb' => 'GET'],
['name' => 'page#index', 'url' => '/videos', 'verb' => 'GET', 'postfix' => 'videos'],
['name' => 'page#index', 'url' => '/favorites', 'verb' => 'GET', 'postfix' => 'favorites'],
['name' => 'page#index', 'url' => '/albums/{path}', 'verb' => 'GET', 'postfix' => 'albums',
'requirements' => [
Expand Down
111 changes: 2 additions & 109 deletions js/photos-0.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/photos-0.js.map

Large diffs are not rendered by default.

117 changes: 115 additions & 2 deletions js/photos-1.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/photos-1.js.map

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions js/photos-10.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions js/photos-10.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 665b79d

Please sign in to comment.