Release 1.2.0

CHANGELOG.md

@@ -1,31 +1,59 @@
-# Changes with 1.1.4 (unreleased)
+# Changes with 1.2.0
+
+This new release backport stuff from the main fork of Sonerezh. A big thanks to
+the community, and @gs11.
 
 #### Bug / Security fixes:
-* Merge #318 (fix #277): Getting "Undefined index: id [APP/Model/User.php, line 152]" During Installation (thanks to GaneshKandu)
+
+* Merge #339: Time to merge (thanks to gs11)
+* Merge #318 (fix #277): Getting "Undefined index: id [APP/Model/User.php, line
+  152]" During Installation (thanks to GaneshKandu)
+* Merge #312: Player now shows artist instead of band
+* Merge #309: Fix related to MySQL and SQLite
 * Merge #306: Upgraded CakePHP to 2.9.8 (thanks to gs11)
+* Merge #304: Changed select grouping so that albums with the same name are
+  listed
+* Merge #300: Removed slow subquery from album view
+* Merge #293: Implemented database cleaning
+* Merge #287: Removed trailing slash in subdirectory path added by CakePHP for
+  some folders
 * Fix #263: Something wrong with files with non-latin characters in name
 * Fix #241: Install script doesn't create the database
-* Fix #214: Optimization: enable caching for albums covers (thanks to MightyCreak)
-* Fix #152: IndexedDB does not function in private browsing mode (documentation improvement)
+* Fix #214: Optimization: enable caching for albums covers (thanks to
+  MightyCreak)
+* Fix #152: IndexedDB does not function in private browsing mode (documentation
+  improvement)
 * Fix #107: Replace avconv with ffmpeg
 
+Fixes from gs11's fork:
+
+* Fixed detection of tag 'DISCNUMBER' without 'DISCTOTAL' for OGG files
+* Fixed detection of disc number without a disc total in the string (e.g. '01'
+  instead of '01/02')
+* Fixed year not showing for album with multiple CDs
+
 #### New features
+
 * Merge #293: Implement database update (thanks to gs11)
+* German translation (thanks to soulsymphonies)
 
 # Changes with 1.1.3
 
 ### Bug / Security fixes:
+
 * Revert the pull request #236 because it introduces instabilities with the database
 
 # Changes with 1.1.2
 
 #### New features:
+
 * You can now download a track
 * Issue #223: sort the "Albums" page by band or by album
 * Issue #214: log failed authentication attempts to prevent brute-force attacks
 * Issue #179 #114: pre-load next song
 
 #### Bug / Security fixes:
+
 * Merge #215: Playlist title cannot be empty (Thanks to disc)
 * Merge #236: Fix missing albums in recently added albums (Thanks to fcharlier)
 * Fix #207: Broken disc info on OGG files
@@ -45,23 +73,27 @@
 # Changes with 1.1.1
 
 #### Bug / Security fixes:
+
 * Fix #174: Add lock system on import process
 * Fix #173: CSRF protection broke the 'add to playlist' form
 * Ohter bugfixes
 
 # Changes with 1.1.0
 
 #### New features:
+
 * The import function has been entirely refactored
 * New CLI to import your music
 
 #### Improvements:
+
 * Issue #148: Upgrade CakePHP to 2.8
 * Upgrade Twitter Bootstrap to 3.3.6
 * Import view with debug report if warnings or errors happened
 * PHP7 support
 
 #### Bug / Security fixes:
+
 * PRs #158 #159 #162: Typo fix (Thanks to MightyCreak,NumEricR and nodiscc)
 * Fix #161: CSRF vulnerability
 * Fix #155: Fatal error with getID3 lib and PHP7
@@ -72,34 +104,40 @@
 # Changes with 1.0.0
 
 #### New features:
+
 * Docker compatibility
 * The first row on the album view shows the 6 latest albums added
 
 #### Improvements:
+
 * Code readability
 
 #### Bug / Security fixes:
+
 * Fix #142: Mp3 files without Id3 tags all showns as "Unknown"
 * Fix #122: Songs are duplicated when i attempt to update database
 
 # Changes with 1.0.0-beta2
 
 #### New features:
+
 * French translation (using the browser language)
 
 Improvements:
 * Improve queue behavior on the "search" view
 
-Changes with 1.0.0-beta
------------------------
-New features:
+# Changes with 1.0.0-beta
+
+#### New features:
+
 * #61: Set multiple root folders
 * #46: Forgot my password system
 * #45: Email notifications system
 * #43: 'Remember Me' feature
 * Sonerezh now works with PostgreSQL and SQlite (not recommended)
 
-Improvements:
+#### Improvements:
+
 * Improvements on queue behavior
 * #117: Port option on database installation
 * #82: Improve Raspberry Pi compatibility (Thanks to kletellier)
@@ -110,7 +148,8 @@ Improvements:
 * #7: Improve OGG metadata tags support
 * Performance improvement in algorithm sorting
 
-Bug / Security fixes:
+#### Bug / Security fixes:
+
 * Fix #120: Error 500 on settings page
 * Fix #73: Newly created playlists aren't listed
 * Fix #48 #64: Ask for password twice when trying to update it) (Thanks to FoxiesCuties)

README.md

@@ -15,24 +15,3 @@ Some Handy Links
 [Sonerezh on Twitter](https://twitter.com/snrzh).
 
 Don't forget to [support us](https://www.sonerezh.bzh/support) !
-
-development-new branch
-----------------------
-
-This is a branch to continue development while the main project is temporarily paused
-Changes implemented:
-
-- Merged commit in PR https://github.com/Sonerezh/sonerezh/pull/300 (Removed slow subquery from albums view)
-- Merged commit in PR https://github.com/Sonerezh/sonerezh/pull/304 (Changed select grouping so that albums with the same name are listed)
-- Merged commit in PR https://github.com/Sonerezh/sonerezh/pull/287 (Removed trailing slash in subdirectory path added by CakePHP for some folders)
-- Merged commit in PR https://github.com/Sonerezh/sonerezh/pull/306 (Upgraded CakePHP to 2.9.8)
-- Merged commit in PR https://github.com/Sonerezh/sonerezh/pull/293 (Implemented database cleaning)
-- Merged commit in PR https://github.com/Sonerezh/sonerezh/pull/309 (Corrected Songs number in statistics)
-- Made compatible with MySQL setting ONLY_FULL_GROUP_BY + removed old unecessary SQLite code
-- Implemented re-parsing of metadata for modified files
-- Fixed some magic numbers in code
-- Merged commit in PR https://github.com/Sonerezh/sonerezh/pull/312 (Player now shows artist instead of band)
-- Bugfix for https://github.com/gs11/sonerezh/issues/7 (Re-parsing of metadata for modified files)
-- Fixed detection of tag 'DISCNUMBER' without 'DISCTOTAL' for OGG files
-- Fixed detection of disc number without a disc total in the string (e.g. '01' instead of '01/02')
-- Fixed year not showing for album with multiple CDs

app/Config/bootstrap.php

@@ -114,7 +114,7 @@
 /**
  * Sonerezh constants declarations
  */
-define('SONEREZH_VERSION', 'v1.1.4-dev');
+define('SONEREZH_VERSION', 'v1.2.0');
 define('THUMBNAILS_DIR', 'thumbnails');
 define('RESIZED_DIR', IMAGES.'resized'.DS);
 define('AVATARS_DIR', 'avatars');