Merge branch 'master' into fancy-user-page

app/assets/javascripts/transactions.js

@@ -34,6 +34,12 @@ ready = function() {
       render: function(data, type, full, meta) {
         return (data/100).toFixed(2);
       }
+    },
+    {
+      targets: 4,
+      render: function(data, type, full, meta) {
+        return new Option(data).innerHTML
+      }
     }
     ]
   });

app/controllers/concerns/data_table.rb

@@ -1,4 +1,6 @@
 class DataTable
+  include ActionView::Helpers::JavaScriptHelper
+  include ERB::Util
   def initialize user, params
     @user = user
     @params = sanitize_params(params)

config/application.rb

@@ -14,7 +14,7 @@ module Tab
 
     # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
     # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
-    # config.time_zone = 'Central Time (US & Canada)'
+    config.time_zone = 'Brussels'
 
     # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]