diff --git a/CHANGELOG.md b/CHANGELOG.md index c9842f9ac..b7f4aea51 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,12 @@ # Change Log All notable changes to this project will be documented in this file. +## [Unreleased] +### Fixed +- Added missing shaarli logo. +- Overwrite existing doc and static folders when installing. +- Added line break to infinoted title, used by front page shortcut. + ## [0.13.1] - 2017-01-22 ### Added - Added new locale for Japanese (ja). @@ -192,6 +198,7 @@ All notable changes to this project will be documented in this file. - Fixed issue that could allow someone to start a module setup process without being logged in to Plinth. +[Unreleased]: https://github.com/freedombox/Plinth/compare/v0.13.1...HEAD [0.13.1]: https://github.com/freedombox/Plinth/compare/v0.13.0...v0.13.1 [0.13.0]: https://github.com/freedombox/Plinth/compare/v0.12.0...v0.13.0 [0.12.0]: https://github.com/freedombox/Plinth/compare/v0.11.0...v0.12.0 diff --git a/LICENSES b/LICENSES index 193c3c3d8..938375ef6 100644 --- a/LICENSES +++ b/LICENSES @@ -53,7 +53,7 @@ otherwise. - static/themes/default/icons/radicale.png :: [[http://radicale.org/][GPL-3.0]] - static/themes/default/icons/repro.png :: [[https://www.resiprocate.org/Main_Page][BSD-3-clause]] - static/themes/default/icons/roundcube.png :: [[https://roundcube.net/][GPL-3+]] +- static/themes/default/icons/shaarli.png :: [[https://github.com/shaarli/Shaarli][zlib/libpng]] - static/themes/default/icons/transmission.png :: [[https://transmissionbt.com/][GPL]] - static/themes/default/icons/ttrss.png :: [[https://tt-rss.org/gitlab/fox/tt-rss][GPL]] - static/themes/default/icons/xmpp.png :: [[https://www.ejabberd.im/][GPL3]] -- static/themes/default/icons/shaarli.png :: [[https://github.com/shaarli/Shaarli][zlib/libpng]] \ No newline at end of file diff --git a/setup.py b/setup.py index aa1b3f841..426b0ca66 100755 --- a/setup.py +++ b/setup.py @@ -113,7 +113,7 @@ class CustomClean(clean): """Execute clean command""" subprocess.check_call(['rm', '-rf', 'Plinth.egg-info/']) subprocess.check_call(['make', '-C', 'doc', 'clean']) - + for dir_path, dir_names, file_names in os.walk('plinth/locale/'): for file_name in file_names: if file_name.endswith('.mo'): @@ -143,16 +143,14 @@ class CustomInstallData(install_data): # Recursively overwrite directories for target, source in DIRECTORIES_TO_COPY: - if self.root: target = change_root(self.root, target) - if os.path.exists(target): - remove_tree(target) + remove_tree(target) log.info("recursive copy '%s' to '%s'", source, target) - shutil.copytree(source, target,symlinks=True) + shutil.copytree(source, target, symlinks=True) find_packages = setuptools.PEP420PackageFinder.find