Commit aa07c985 authored by Tobias Reich's avatar Tobias Reich
Browse files

Merge branch 'master' into uploader

Conflicts:
	assets/min/main.js
parents 31ed7cb0 a7785177
......@@ -308,10 +308,10 @@ album = {
if ($(".message .choice input[name='password']:checked").val()==="password") {
password = md5($(".message input.text").val());
album.json.password = true;
album.json.password = 1;
} else {
password = "";
album.json.password = false;
album.json.password = 0;
}
if ($(".message .choice input[name='listed']:checked").val()==="listed") listed = true;
......@@ -323,8 +323,11 @@ album = {
if (visible.album()) {
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.password();
if (album.json.public==1) contextMenu.shareAlbum(albumID, e);
}
......
......@@ -8,8 +8,8 @@
var lychee = {
title: "",
version: "2.5.5",
version_code: "020505",
version: "2.5.6",
version_code: "020506",
api_path: "php/api.php",
update_path: "http://lychee.electerious.com/version/index.php",
......
{
"name": "Lychee",
"version": "2.5.0",
"version": "2.5.6",
"description": "Self-hosted photo-management done right.",
"authors": "Tobias Reich <tobias.reich.ich@gmail.com>",
"license": "MIT",
......
## 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
Released July 5, 2014
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment