From 5c84abf191d0af434dfd229117401c07615bc792 Mon Sep 17 00:00:00 2001 From: Andreas Stephanides Date: Sun, 9 Feb 2014 23:06:48 +0100 Subject: [PATCH 1/3] app js --- app/assets/javascripts/application.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index c94246e..eebecb5 100755 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -12,7 +12,7 @@ // //= require jquery //= require jquery_ujs -//= require jquery-ui +// require jquery-ui //= require_tree . //= require tinymce-jquery //= require bootstrap From 825dc23de1e209647c573730bcf8b32740ac71a9 Mon Sep 17 00:00:00 2001 From: Andreas Stephanides Date: Sun, 9 Feb 2014 23:07:11 +0100 Subject: [PATCH 2/3] gem update --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 0614309..3a8134f 100755 --- a/Gemfile +++ b/Gemfile @@ -44,7 +44,7 @@ gem 'jquery-rails' gem 'formtastic', '~>2.2.1' gem 'formtastic-bootstrap', '~>2.1.3' #, :git => "git://github.com/mjbellantoni/formtastic-bootstrap.git" # TinyMCE -gem "tinymce-rails" , '>=3.5.8' +gem "tinymce-rails" , '~>3.5.8' # Internationalisierung #gem "globalize3" ,'~>3.0.4' From b910973ee64c28c5c881a6a0957bea7f114ca266 Mon Sep 17 00:00:00 2001 From: Andreas Stephanides Date: Sun, 9 Feb 2014 23:08:53 +0100 Subject: [PATCH 3/3] merge app js --- app/assets/javascripts/application.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 3630db1..419fd4b 100755 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -12,13 +12,10 @@ // //= require jquery //= require jquery_ujs -<<<<<<< HEAD -======= //= require jquery.ui.all // require jquery.ui.draggable // require jquery.ui.sortable // require jquery.sortable ->>>>>>> bb8f427f953c2bcf84331b4eb1f8b5c7108e80e6 // require jquery-ui //= require_tree . //= require tinymce-jquery