diff --git a/ChangeLog b/ChangeLog index 72e553f9..6f5dcaa7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2018-11-16 Version 1.5.0 + +* Merged Polish translation by @xro, #299 +* Updated infrastructure + 2017-11-28 Version 1.4.1 * Updated MIME type for AZW3 download, #265 diff --git a/Gemfile.lock b/Gemfile.lock index 6e699174..489279ed 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -4,13 +4,14 @@ GEM addressable (2.5.2) public_suffix (>= 2.0.2, < 4.0) builder (3.2.3) - capybara (3.1.1) + capybara (3.11.0) addressable mini_mime (>= 0.1.3) nokogiri (~> 1.8) rack (>= 1.6.0) rack-test (>= 0.6.3) - xpath (~> 3.0) + regexp_parser (~> 1.2) + xpath (~> 3.2) capybara-screenshot (1.0.21) capybara (>= 1.0, < 4) launchy @@ -32,7 +33,7 @@ GEM gherkin (~> 4.0) cucumber-wire (0.0.1) diff-lcs (1.3) - ffi (1.9.23) + ffi (1.9.25) gherkin (4.1.3) json (2.1.0) launchy (2.4.3) @@ -40,18 +41,19 @@ GEM less (2.6.0) commonjs (~> 0.2.7) libv8 (3.16.14.19) - mini_mime (1.0.0) + mini_mime (1.0.1) mini_portile2 (2.3.0) multi_json (1.13.1) multi_test (0.1.2) - nokogiri (1.8.2) + nokogiri (1.8.5) mini_portile2 (~> 2.3.0) - public_suffix (3.0.2) - rack (2.0.5) - rack-test (1.0.0) + public_suffix (3.0.3) + rack (2.0.6) + rack-test (1.1.0) rack (>= 1.0, < 3) rake (12.3.1) ref (2.0.0) + regexp_parser (1.3.0) rspec (3.7.0) rspec-core (~> 3.7.0) rspec-expectations (~> 3.7.0) @@ -65,14 +67,14 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.7.0) rspec-support (3.7.1) - rubyzip (1.2.1) + rubyzip (1.2.2) selenium-webdriver (3.12.0) childprocess (~> 0.5) rubyzip (~> 1.2) therubyracer (0.12.3) libv8 (~> 3.16.14.15) ref - xpath (3.1.0) + xpath (3.2.0) nokogiri (~> 1.8) PLATFORMS diff --git a/Rakefile.rb b/Rakefile.rb index cdd77df9..b2512fb9 100755 --- a/Rakefile.rb +++ b/Rakefile.rb @@ -15,7 +15,7 @@ require 'logger' APPNAME = 'BicBucStriim' -VERSION = '1.4.1' +VERSION = '1.5.0' SOURCE = "." LESS = File.join( SOURCE, "style") diff --git a/index.php b/index.php index a66c878f..6078f077 100644 --- a/index.php +++ b/index.php @@ -34,7 +34,7 @@ # Application Name $appname = 'BicBucStriim'; # App version -$appversion = '1.4.2a'; +$appversion = '1.5.0'; # Init app and routes $app = new \Slim\Slim(array( diff --git a/installcheck.php b/installcheck.php index 1459c4cc..178f64da 100644 --- a/installcheck.php +++ b/installcheck.php @@ -121,7 +121,7 @@ function check_php() { echo $template->render(array( 'page' => array( 'rot' => '', - 'version' => '1.4.2a' + 'version' => '1.5.0' ), 'is_a' => $is_a, 'srv' => $srv,