Brought up-to-date with master.

.travis.yml

@@ -3,14 +3,9 @@ bundler_args: "--full-index --without development"
 cache: bundler
 rvm:
 - 2.2.7
-env:
-- TEST_SUITE=libs
-- TEST_SUITE=models
-- TEST_SUITE=controllers
-#- TEST_SUITE=frontend
 before_install: test/ci/before_install
 before_script: test/ci/before_script
-script: xvfb-run bundle exec rake test:$TEST_SUITE DRIVER=webkit
+script: xvfb-run bundle exec rake test:models test:libs test:controllers DRIVER=webkit
 services:
 - redis-server
 notifications:

Gemfile

@@ -132,6 +132,9 @@ gem 'humanize'
 gem 'i18n-complements', '>= 0.0.14'
 gem 'i18n-js', '>= 3.0.0.rc12'
 
+# Dates management
+gem 'time_diff'
+
 # XML Parsing/Writing, HTML extraction
 gem 'nokogiri', '~> 1.7.1'
 
@@ -189,7 +192,7 @@ gem 'luhn'
 gem 'bootstrap-slider-rails'
 
 group :development do
-  gem 'bullet', '~> 5.5.0'
+  gem 'bullet', '< 5.6.0'
 
   gem 'quiet_assets'
   # gem 'rack-mini-profiler'

Gemfile.lock

@@ -519,6 +519,9 @@ GEM
     thor (0.19.4)
     thread_safe (0.3.6)
     tilt (2.0.8)
+    time_diff (0.3.0)
+      activesupport
+      i18n
     timecop (0.9.1)
     timeliness (0.3.8)
     tins (1.15.0)
@@ -586,7 +589,7 @@ DEPENDENCIES
   bootstrap-slider-rails
   bootstrap3-datetimepicker-rails
   browser
-  bullet (~> 5.5.0)
+  bullet (< 5.6.0)
   capybara
   capybara-webkit
   charlock_holmes
@@ -674,6 +677,7 @@ DEPENDENCIES
   teaspoon-jasmine
   therubyracer
   thin
+  time_diff
   timecop
   treetop
   turbolinks (~> 2.0)

VERSION

@@ -1 +1 @@
-2.49.1
+2.50.0

app/assets/javascripts/backend/bank_statements.js.coffee

@@ -392,7 +392,7 @@
       bankLines = lines.filter(":not(.lettered)[data-type=bank_statement_item]")
       bankIds = bankLines.get().map (line) =>
         @_idForLine line
-      url = window.location.pathname.split('/').slice(0, -3).join('/') + '/bank_reconciliation/letters'
+      url = '/backend/bank-reconciliation/letters'
       $.ajax url,
         type: 'POST'
         dataType: 'JSON'
@@ -413,7 +413,7 @@
           return false
 
     _unletterItems: (letter) ->
-      # url = window.location.pathname.split('/').slice(0, -3).join('/') + '/bank_reconciliation/letters/' + letter
+      # url = '/backend/bank-reconciliation/letters/' + letter
       url = $(event.target).closest('#clear').attr('href')
       $.ajax url,
         type: 'DELETE'
@@ -431,7 +431,7 @@
           return false
 
     _deleteLine: (line) ->
-      url = window.location.pathname.split('/').slice(0, -3).join('/') + '/bank-statement-items/' + line.data('id')
+      url = '/backend/bank-statement-items/' + line.data('id')
       $.ajax url,
         type: 'DELETE'
         dataType: 'JSON'