Merge branch 'dev' for release 2.8.3

CHANGELOG.md

@@ -1,8 +1,16 @@
 # Changelog Fab Manager
 
+## v2.8.3 2019 January 29
+
+- Added user's manual (fr)
+- Fix a bug: unable to run rails console
+- Fix a bug: some reservation slots are not shown on the user calendars (#127)
+
 ## v2.8.2 2019 January 22
 
 - Removed ability to disable invoicing for an user
+- Improved user autocompletion when using multiple words
+- Refactored API controllers
 - Fixed a missing translation in plan form
 - Fix a bug: error handling on password recovery
 - Fix a bug: error handling on machine attachment upload
@@ -12,7 +20,6 @@
 - Fix a bug: unable to create/edit a plan of 12 months or 52 weeks
 - Fix a bug: Unable to search in user autocomplete fields
 - Fix a bug: Invalid translation in new partner modal
-- Improved user autocompletion when using multiple words
 - Refactored frontend invoices translations
 - Updated RailRoady 1.4.0 to 1.5.3
 - [TODO DEPLOY] `bundle install`

Gemfile

@@ -49,6 +49,7 @@ group :development do
   # Preview mail in the browser
   gem 'mailcatcher'
   gem 'puma'
+  gem 'rb-readline'
   gem 'rvm-capistrano', require: false
 end
 

Gemfile.lock

@@ -356,6 +356,7 @@ GEM
     rb-fsevent (0.9.4)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
+    rb-readline (0.5.5)
     rdoc (4.3.0)
     recurrence (1.3.0)
       activesupport
@@ -562,6 +563,7 @@ DEPENDENCIES
   rails (= 4.2.11)
   rails-observers
   rails_12factor
+  rb-readline
   recurrence
   responders (~> 2.0)
   rolify
@@ -587,4 +589,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   1.16.1
+   1.17.2

app/services/availabilities/availabilities_service.rb

@@ -59,7 +59,7 @@ class Availabilities::AvailabilitiesService
       end
     end
     slots.each do |s|
-      s.title = t('availabilities.not_available') if s.is_complete? && !s.is_reserved
+      s.title = I18n.t('availabilities.not_available') if s.is_complete? && !s.is_reserved
     end
     slots
   end

app/services/availabilities/status_service.rb

@@ -17,13 +17,13 @@ class Availabilities::StatusService
 
         slot.id = s.id
         slot.is_reserved = true
-        slot.title = "#{slot.machine.name} - #{show_name ? r.user.profile.full_name : t('availabilities.not_available')}"
+        slot.title = "#{slot.machine.name} - #{show_name ? r.user.profile.full_name : I18n.t('availabilities.not_available')}"
         slot.can_modify = true if @current_user_role == 'admin'
         slot.reservations.push r
 
         next unless r.user == user
 
-        slot.title = "#{slot.machine.name} - #{t('availabilities.i_ve_reserved')}"
+        slot.title = "#{slot.machine.name} - #{I18n.t('availabilities.i_ve_reserved')}"
         slot.can_modify = true
         slot.is_reserved_by_current_user = true
       end
@@ -45,7 +45,7 @@ class Availabilities::StatusService
         next unless r.user == user
 
         slot.id = s.id
-        slot.title = t('availabilities.i_ve_reserved')
+        slot.title = I18n.t('availabilities.i_ve_reserved')
         slot.can_modify = true
         slot.is_reserved = true
       end

package.json

@@ -1,6 +1,6 @@
 {
   "name": "fab-manager",
-  "version": "2.8.2",
+  "version": "2.8.3",
   "description": "FabManager is the FabLab management solution. It is web-based, open-source and totally free.",
   "keywords": [
     "fablab",