Skip to content

Commit d56e34f

Browse files
electeriouselecterious
committed
Merge pull request #417 from electerious/develop
Lychee v3.0.7
2 parents 7879869 + 12eb927 commit d56e34f

Some content is hidden

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

41 files changed

+464
-528
lines changed

‎Dockerfile

-31
This file was deleted.

‎README.md

+4
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,10 @@ Lychee supports [Twitter Cards](https://dev.twitter.com/docs/cards) and [Open Gr
4343

4444
Lychee uses [Imagick](http://www.imagemagick.org) when installed on your server. In this case you will benefit from a faster processing of your uploads, better looking thumbnails and intermediate sized images for small screen devices. You can disable the usage of [Imagick](http://www.imagemagick.org) in [the settings](docs/Settings.md).
4545

46+
### Docker
47+
48+
Browse the [Docker Hub Registry](https://hub.docker.com/r/kdelfour/lychee-docker/) for various automated Lychee-Docker builds. We recommed to use [lychee-docker](https://hub.docker.com/r/kdelfour/lychee-docker/) by [kdelfour](https://github.com/kdelfour).
49+
4650
### Plugins and Extensions
4751

4852
The plugin-system of Lychee allows you to execute scripts, when a certain action fires. Plugins are hooks, which are injected directly into Lychee. [Plugin documentation »](docs/Plugins.md)

‎dist/main.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/main.js

+6-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/view.js

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/Changelog.md

+8
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
## v3.0.7
2+
3+
Released November 15, 2015
4+
5+
- Internal changes and updated dependencies
6+
- `New` PHP-version-check now requires PHP >= 5.5
7+
- `New` Preloading of big photos (#185)
8+
19
## v3.0.6
210

311
Released September 13, 2015

‎docs/Installation.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
### 1. Requirements
2-
Everything you need is a web-server with PHP 5.3 or later and a MySQL-Database.
2+
Everything you need is a web-server with PHP 5.5 or later and a MySQL-Database.
33

44
The following PHP extensions must be activated:
55

‎index.html

+64-47
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
<meta name="keywords" content="">
1010
<meta name="description" content="">
1111

12-
<!-- CSS -->
1312
<link type="text/css" rel="stylesheet" href="dist/main.css">
1413

1514
<link rel="shortcut icon" href="favicon.ico">
@@ -33,88 +32,106 @@
3332
<div id="loading"></div>
3433

3534
<!-- Header -->
36-
<header>
35+
<header class="header">
3736

38-
<!-- Title -->
39-
<a id="title"></a>
37+
<div class="header__toolbar header__toolbar--public">
4038

41-
<!-- Buttons -->
42-
<div class="toolbar" id="tools_albums">
43-
<a class="button button--left" id="button_settings" title="Settings">
44-
<svg class="iconic"><use xlink:href="#cog"></use></svg>
45-
</a>
46-
<a class="button button--left" id="button_signin" title="Sign In">
39+
<a class="button" id="button_signin" title="Sign In">
4740
<svg class="iconic"><use xlink:href="#account-login"></use></svg>
4841
</a>
49-
<a id="hostedwith">Hosted with Lychee</a>
50-
<a class="button button--right button_add" title="Add">
42+
43+
<a class="header__title"></a>
44+
45+
<a class="header__hostedwith">Hosted with Lychee</a>
46+
47+
</div>
48+
<div class="header__toolbar header__toolbar--albums">
49+
50+
<a class="button" id="button_settings" title="Settings">
51+
<svg class="iconic"><use xlink:href="#cog"></use></svg>
52+
</a>
53+
54+
<a class="header__title"></a>
55+
56+
<input class="header__search" type="text" name="search" placeholder="Search …">
57+
<a class="header__clear">&times;</a>
58+
<a class="header__divider"></a>
59+
<a class="button button_add" title="Add">
5160
<svg class="iconic"><use xlink:href="#plus"></use></svg>
5261
</a>
53-
<a class="button_divider"></a>
54-
<input id="search" type="text" name="search" placeholder="Search …">
55-
<a id="clearSearch">&times;</a>
62+
5663
</div>
57-
<div class="toolbar" id="tools_album">
58-
<a class="button button--left" id="button_back_home" title="Close Album">
64+
<div class="header__toolbar header__toolbar--album">
65+
66+
<a class="button" id="button_back_home" title="Close Album">
5967
<svg class="iconic"><use xlink:href="#chevron-left"></use></svg>
6068
</a>
61-
<a class="button button--right button_add" title="Add">
62-
<svg class="iconic"><use xlink:href="#plus"></use></svg>
69+
70+
<a class="header__title"></a>
71+
72+
<a class="button button--eye" id="button_share_album" title="Share Album">
73+
<svg class="iconic iconic--eye"><use xlink:href="#eye"></use></svg>
6374
</a>
64-
<a class="button_divider"></a>
65-
<a class="button button--right" id="button_trash_album" title="Delete Album">
66-
<svg class="iconic"><use xlink:href="#trash"></use></svg>
75+
<a class="button" id="button_archive" title="Download Album">
76+
<svg class="iconic"><use xlink:href="#cloud-download"></use></svg>
6777
</a>
68-
<a class="button button--right button--info" id="button_info_album" title="About Album">
78+
<a class="button button--info" id="button_info_album" title="About Album">
6979
<svg class="iconic"><use xlink:href="#info"></use></svg>
7080
</a>
71-
<a class="button button--right" id="button_archive" title="Download Album">
72-
<svg class="iconic"><use xlink:href="#cloud-download"></use></svg>
81+
<a class="button" id="button_trash_album" title="Delete Album">
82+
<svg class="iconic"><use xlink:href="#trash"></use></svg>
7383
</a>
74-
<a class="button button--right button--eye" id="button_share_album" title="Share Album">
75-
<svg class="iconic iconic--eye"><use xlink:href="#eye"></use></svg>
84+
<a class="header__divider"></a>
85+
<a class="button button_add" title="Add">
86+
<svg class="iconic"><use xlink:href="#plus"></use></svg>
7687
</a>
88+
7789
</div>
78-
<div class="toolbar" id="tools_photo">
79-
<a class="button button--left" id="button_back" title="Close Photo">
90+
<div class="header__toolbar header__toolbar--photo">
91+
92+
<a class="button" id="button_back" title="Close Photo">
8093
<svg class="iconic"><use xlink:href="#chevron-left"></use></svg>
8194
</a>
82-
<a class="button button--right" id="button_more" title="More">
83-
<svg class="iconic"><use xlink:href="#ellipses"></use></svg>
84-
</a>
85-
<a class="button_divider"></a>
86-
<a class="button button--right" id="button_trash" title="Delete">
87-
<svg class="iconic"><use xlink:href="#trash"></use></svg>
95+
96+
<a class="header__title"></a>
97+
98+
<a class="button button--star" id="button_star" title="Star Photo">
99+
<svg class="iconic"><use xlink:href="#star"></use></svg>
88100
</a>
89-
<a class="button button--right" id="button_move" title="Move">
90-
<svg class="iconic"><use xlink:href="#folder"></use></svg>
101+
<a class="button button--eye" id="button_share" title="Share Photo">
102+
<svg class="iconic"><use xlink:href="#eye"></use></svg>
91103
</a>
92-
<a class="button button--right button--info" id="button_info" title="About Photo">
104+
<a class="header__divider"></a>
105+
<a class="button button--info" id="button_info" title="About Photo">
93106
<svg class="iconic"><use xlink:href="#info"></use></svg>
94107
</a>
95-
<a class="button_divider"></a>
96-
<a class="button button--right button--eye" id="button_share" title="Share Photo">
97-
<svg class="iconic"><use xlink:href="#eye"></use></svg>
108+
<a class="button" id="button_move" title="Move">
109+
<svg class="iconic"><use xlink:href="#folder"></use></svg>
98110
</a>
99-
<a class="button button--right button--star" id="button_star" title="Star Photo">
100-
<svg class="iconic"><use xlink:href="#star"></use></svg>
111+
<a class="button" id="button_trash" title="Delete">
112+
<svg class="iconic"><use xlink:href="#trash"></use></svg>
101113
</a>
114+
<a class="header__divider"></a>
115+
<a class="button" id="button_more" title="More">
116+
<svg class="iconic"><use xlink:href="#ellipses"></use></svg>
117+
</a>
118+
102119
</div>
103120

104121
</header>
105122

106123
<!-- Content -->
107-
<div id="content"></div>
124+
<div class="content"></div>
108125

109126
<!-- ImageView -->
110127
<div id="imageview"></div>
111128

112129
<!-- Sidebar -->
113-
<div id="sidebar">
114-
<div class='header'>
130+
<div class="sidebar">
131+
<div class="sidebar__header">
115132
<h1>About</h1>
116133
</div>
117-
<div class='wrapper'></div>
134+
<div class="sidebar__wrapper"></div>
118135
</div>
119136

120137
<!-- Upload -->

‎php/api.php

+1-7
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,6 @@
55
# @copyright 2015 by Tobias Reich
66
###
77

8-
@ini_set('max_execution_time', '200');
9-
@ini_set('post_max_size', '200M');
10-
@ini_set('upload_max_size', '200M');
11-
@ini_set('upload_max_filesize', '20M');
12-
@ini_set('max_file_uploads', '100');
13-
148
if (!empty($_POST['function'])||!empty($_GET['function'])) {
159

1610
session_start();
@@ -96,4 +90,4 @@
9690

9791
}
9892

99-
?>
93+
?>

‎plugins/check/index.php

+7-4
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
echo('-----------' . PHP_EOL);
2727

2828
# PHP Version
29-
if (floatval(phpversion())<5.3) $error .= ('Error: Upgrade to PHP 5.3 or higher' . PHP_EOL);
29+
if (floatval(phpversion())<5.5) $error .= ('Error: Upgrade to PHP 5.5 or higher' . PHP_EOL);
3030

3131
# Extensions
3232
if (!extension_loaded('session')) $error .= ('Error: PHP session extension not activated' . PHP_EOL);
@@ -89,6 +89,12 @@
8989
# Check mysql version
9090
if ($database->server_version<50500) echo('Warning: Lychee uses the GBK charset to avoid sql injections on your MySQL version. Please update to MySQL 5.5 or higher to enable UTF-8 support.' . PHP_EOL);
9191

92+
# About GD
93+
$gdVersion = gd_info();
94+
if (!$gdVersion['JPEG Support']) $error .= ('Error: PHP gd extension without jpeg support' . PHP_EOL);
95+
if (!$gdVersion['PNG Support']) $error .= ('Error: PHP gd extension without png support' . PHP_EOL);
96+
if (!$gdVersion['GIF Read Support'] || !$gdVersion['GIF Create Support']) $error .= ('Error: PHP gd extension without full gif support' . PHP_EOL);
97+
9298
# Output
9399
if ($error==='') echo('No critical problems found. Lychee should work without problems!' . PHP_EOL);
94100
else echo $error;
@@ -108,9 +114,6 @@
108114
if (!isset($imagickVersion, $imagickVersion['versionNumber'])||$imagickVersion==='') $imagickVersion = '-';
109115
else $imagickVersion = $imagickVersion['versionNumber'];
110116

111-
# About GD
112-
$gdVersion = gd_info();
113-
114117
# Output system information
115118
echo('Lychee Version: ' . $json['version'] . PHP_EOL);
116119
echo('DB Version: ' . $settings['version'] . PHP_EOL);

‎src/commands/start

-9
This file was deleted.

‎src/gulpfile.js

+1
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ paths.main = {
9696
],
9797
styles: [
9898
'node_modules/basiccontext/src/styles/main.scss',
99+
'node_modules/basiccontext/src/styles/addons/popin.scss',
99100
'node_modules/basicmodal/src/styles/main.scss',
100101
'./styles/main.scss'
101102
],

‎src/package.json

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "Lychee",
3-
"version": "3.0.6",
3+
"version": "3.0.7",
44
"description": "Self-hosted photo-management done right.",
55
"authors": "Tobias Reich <[email protected]>",
66
"license": "MIT",
@@ -10,18 +10,18 @@
1010
"url": "https://github.com/electerious/Lychee.git"
1111
},
1212
"devDependencies": {
13-
"basiccontext": "^3.3.1",
14-
"basicmodal": "^3.1.2",
13+
"basiccontext": "^3.5.0",
14+
"basicmodal": "^3.1.7",
1515
"gulp": "^3.9.0",
16-
"gulp-autoprefixer": "3.0.1",
17-
"gulp-babel": "^5.2.1",
16+
"gulp-autoprefixer": "3.1.0",
17+
"gulp-babel": "^5.3.0",
1818
"gulp-concat": "^2.6.0",
19-
"gulp-inject": "^1.5.0",
20-
"gulp-load-plugins": "^1.0.0-rc",
19+
"gulp-inject": "^3.0.0",
20+
"gulp-load-plugins": "^1.1.0",
2121
"gulp-minify-css": "^1.2.1",
22-
"gulp-rimraf": "^0.1.1",
23-
"gulp-sass": "^2.0.4",
24-
"gulp-uglify": "^1.4.1",
22+
"gulp-rimraf": "^0.2.0",
23+
"gulp-sass": "^2.1.0",
24+
"gulp-uglify": "^1.5.1",
2525
"jquery": "^2.1.4",
2626
"mousetrap": "^1.5.3"
2727
}

‎src/scripts/album.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ album.getID = function() {
3030

3131
}
3232

33-
album.load = function(albumID, refresh) {
33+
album.load = function(albumID, refresh = false) {
3434

3535
password.get(albumID, function() {
3636

37-
if (!refresh) lychee.animate('#content', 'contentZoomOut')
37+
if (refresh===false) lychee.animate('.content', 'contentZoomOut')
3838

3939
let startTime = new Date().getTime()
4040

@@ -81,8 +81,8 @@ album.load = function(albumID, refresh) {
8181

8282
view.album.init()
8383

84-
if (!refresh) {
85-
lychee.animate('#content', 'contentZoomIn')
84+
if (refresh===false) {
85+
lychee.animate(lychee.content, 'contentZoomIn')
8686
header.setMode('album')
8787
}
8888

‎src/scripts/albums.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ albums.load = function() {
1313

1414
let startTime = new Date().getTime()
1515

16-
lychee.animate('#content', 'contentZoomOut')
16+
lychee.animate('.content', 'contentZoomOut')
1717

1818
if (albums.json===null) {
1919

@@ -38,7 +38,7 @@ albums.load = function() {
3838
setTimeout(() => {
3939
header.setMode('albums')
4040
view.albums.init()
41-
lychee.animate('#content', 'contentZoomIn')
41+
lychee.animate(lychee.content, 'contentZoomIn')
4242
}, waitTime)
4343

4444
})
@@ -48,7 +48,7 @@ albums.load = function() {
4848
setTimeout(() => {
4949
header.setMode('albums')
5050
view.albums.init()
51-
lychee.animate('#content', 'contentZoomIn')
51+
lychee.animate(lychee.content, 'contentZoomIn')
5252
}, 300)
5353

5454
}

0 commit comments

Comments
 (0)