Merge branch 'eonasdan v3.1.1'

Majer changes:
- upgraded to the latest submodule version (bootstrap-datetimepicker v3.1.1)
- compatible with the latest momentjs library (version 2.8.1)
- included the simpleform & momemtjy dependency in gem's Gemfile

Author: zpaulovics

Gemfile

@@ -2,3 +2,5 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in datetimepicker-rails.gemspec
 gemspec
+gem 'simple_form', '>= 3.1.0.rc1'
+gem 'momentjs-rails', '>= 2.8.1'

README.md

@@ -18,7 +18,7 @@ This gem packages the bootstrap-datetimepicker for Rails asset pipeline, and cre
 
 ### Compatibility
 
-Master from v3.0.2+ and eonasdan branch: Bootstrap 3+, Rails 4+ and SimpleForm 3.1.RC1+ (using https://github.com/eonasdan/bootstrap-datetimepicker.git as submodule, well maintained repo). Any further development will be made on these branches.
+Master & eonasdan branches, tags v3.0.2+: Bootstrap 3+, Rails 4+ and SimpleForm 3.1.RC1+ (using https://github.com/eonasdan/bootstrap-datetimepicker.git as submodule, well maintained repo). Any further development will be made on these branches.
 
 Tag v3.0.1 and tarruda branch: Bootstrap 3+, Rails 4+ and SimpleForm 3.1.RC1+ (using an upgraded version of https://github.com/tarruda/bootstrap-datetimepicker.git as inline code, not maintained). No further development, only bug fix for fatal issues on this branch.
 
@@ -27,12 +27,9 @@ Tag v1.0.0: Rails 3.2, Bootstrap 2.3.2 & SimpleForm >= 2.0.4 - No further develo
 
 ### Dependency
 
-The current versions (v3.0.2+) has a dependency on the moment.js javascript library (for details refer to: http://momentjs.com/).
-The gem **does not install this library** out of the box, so **you must look after that**. The reason for not included in this gem the
-installation of moment.js is if you use any package that includes this library (for instance fullcalendar) it would be double installed.
-
-It is very easy to install this library by using the https://github.com/derekprior/momentjs-rails gem.
+Versions v3.1.1+ has a dependency on the moment.js version 2.8.1 javascript library (for details refer to: http://momentjs.com/) and the gem includes the dependency reference in its Gemfile (gem 'momentjs-rails', '>= 2.8.1',  :github => 'derekprior/momentjs-rails').
 
+Versions v3.0.2 & v3.0.3 has a dependency on the moment.js version v2.7, but the gem **have not installed this library** out of the box, so **you have to look after that**. Put "gem 'momentjs-rails', '2.7',  :github => 'derekprior/momentjs-rails'" to your project Gemfile to install it.
 
 ### Credits and references
 
@@ -45,7 +42,7 @@ The project home page: https://github.com/zpaulovics/datetimepicker-rails.git
 
 According your needs, add one of the lines below to your application's Gemfile:
 
-    gem 'datetimepicker-rails', '>= 3.0.0', :git => 'git://github.com/zpaulovics/datetimepicker-rails.git',  \
+    gem 'datetimepicker-rails', :git => 'git://github.com/zpaulovics/datetimepicker-rails.git',  \
         :branch => 'master', :submodules => true
 
     gem 'datetimepicker-rails', '>= 3.0.0', :git => 'git://github.com/zpaulovics/datetimepicker-rails.git', :branch => 'tarruda'
@@ -70,17 +67,14 @@ or
 
 Add this line to app/assets/javascripts/application.js
 
-``` javascript
-//= require bootstrap-datetimepicker
-```
-
-You can fine tune the included files to suit your needs.
-
 From version 3.0.2+:
 
 ```javascript
+//= require moment
 //= require bootstrap-datetimepicker
 //= require pickers
+
+// You may include any languages (optional)
 //= require locales/bootstrap-datetimepicker.hu
 ```
 
@@ -89,6 +83,8 @@ Earlier version:
 ```javascript
 //= require bootstrap-datetimepicker/core
 //= require bootstrap-datetimepicker/pickers
+
+// You may include any languages (optional)
 //= require bootstrap-datetimepicker/locales/bootstrap-datetimepicker.hu
 ```
 

bootstrap-datetimepicker

@@ -1,5 +1,5 @@
 module Datetimepicker
   module Rails
-    VERSION = "3.0.3"
+    VERSION = "3.1.1"
   end
 end