arno/lychee
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into uploader

Browse Source 
Conflicts:
	assets/min/main.js
This commit is contained in:
Tobias Reich 2014-07-26 15:54:12 +02:00
commit aa07c985a0
4 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
assets/js/album.js
View File

@ -308,10 +308,10 @@ album = {
if ($(".message .choice input[name='password']:checked").val()==="password") { if ($(".message .choice input[name='password']:checked").val()==="password") {
password = md5($(".message input.text").val()); password = md5($(".message input.text").val());
album.json.password = true; album.json.password = 1;
} else { } else {
password = ""; password = "";
album.json.password = false; album.json.password = 0;
} }
if ($(".message .choice input[name='listed']:checked").val()==="listed") listed = true; if ($(".message .choice input[name='listed']:checked").val()==="listed") listed = true;
@ -323,8 +323,11 @@ album = {
if (visible.album()) { if (visible.album()) {
album.json.public = (album.json.public==0) ? 1 : 0; album.json.public = (album.json.public==0) ? 1 : 0;
album.json.password = (album.json.public==0) ? 0 : album.json.password;
view.album.public(); view.album.public();
view.album.password(); view.album.password();
if (album.json.public==1) contextMenu.shareAlbum(albumID, e); if (album.json.public==1) contextMenu.shareAlbum(albumID, e);
} }

4
assets/js/lychee.js
View File

@ -8,8 +8,8 @@
var lychee = { var lychee = {
title: "", title: "",
version: "2.5.5", version: "2.5.6",
version_code: "020505", version_code: "020506",
api_path: "php/api.php", api_path: "php/api.php",
update_path: "http://lychee.electerious.com/version/index.php", update_path: "http://lychee.electerious.com/version/index.php",

2
build/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "Lychee", "name": "Lychee",
"version": "2.5.0", "version": "2.5.6",
"description": "Self-hosted photo-management done right.", "description": "Self-hosted photo-management done right.",
"authors": "Tobias Reich <tobias.reich.ich@gmail.com>", "authors": "Tobias Reich <tobias.reich.ich@gmail.com>",
"license": "MIT", "license": "MIT",

15
docs/Changelog.md
View File

@ -1,3 +1,18 @@
## v2.5.6
Released July 25, 2014
- `New` Choose if album should be listed public (#177)
- `New` Gulp instead of Grunt with autoprefixer
- `Improved` Slightly better performance when opening big albums
- `Improved` Checksum with sha1 instead of md5 (#179)
- `Fixed` Missing public badge on public albums
- `Fixed` Wrong path for public photos in view.php
- `Fixed` Wrong link to thumbs when searching
- `Fixed` Wrong date in album view when takestamp was null
- `Fixed` It wasn't possible to rename albums while searching
- `Fixed` It was possible to right-click on SmartAlbums after searching
## v2.5.5 ## v2.5.5
Released July 5, 2014 Released July 5, 2014