locomotivecms 3.0.0.rc2 → 3.0.0.rc3

data/vendor/assets/stylesheets/locomotive/wysihtml5_editor.css

@@ -130,4 +130,30 @@
 
 .wysiwyg-clear-left {
   clear: left;
-}
+}
+
+.wysihtml5-editor table {
+  width: 100%;
+  border-collapse: collapse;
+  border: 1px solid #eee;
+}
+
+.wysihtml5-editor table th, .wysihtml5-editor table td {
+  padding: 8px;
+}
+
+.wysihtml5-editor table th {
+  border: 1px solid #dfdfdf;
+}
+
+.wysihtml5-editor table td {
+  border: 1px solid #eee;
+}
+
+.wysihtml5-editor table td.wysiwyg-tmp-selected-cell, .wysihtml5-editor table th.wysiwyg-tmp-selected-cell {
+  background-color: #fafafa;
+}
+
+.wysihtml5-editor a {
+  color: #4fb9ce;
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: locomotivecms
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc2
+  version: 3.0.0.rc3
 platform: ruby
 authors:
 - Didier Lafforgue
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-26 00:00:00.000000000 Z
+date: 2015-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.4
+        version: 4.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.4
+        version: 4.2.5
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -184,14 +184,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc2
+        version: 1.0.0.rc3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc2
+        version: 1.0.0.rc3
 - !ruby/object:Gem::Dependency
   name: slim
   requirement: !ruby/object:Gem::Requirement
@@ -304,20 +304,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 5.0.3
-- !ruby/object:Gem::Dependency
-  name: backbone-on-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.2.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.2.0.0
 - !ruby/object:Gem::Dependency
   name: codemirror-rails
   requirement: !ruby/object:Gem::Requirement
@@ -380,14 +366,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.3
+        version: 3.3.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.3
+        version: 3.3.5.1
 - !ruby/object:Gem::Dependency
   name: autoprefixer-rails
   requirement: !ruby/object:Gem::Requirement
@@ -664,6 +650,7 @@ files:
 - app/api/locomotive/api/resources/translation_resource.rb
 - app/api/locomotive/api/resources/version_resource.rb
 - app/assets/images/locomotive/datepicker/ui-widget-content-top.png
+- app/assets/images/locomotive/deadend.png
 - app/assets/images/locomotive/favicon.png
 - app/assets/images/locomotive/icons/flags/bf.png
 - app/assets/images/locomotive/icons/flags/bg.png
@@ -714,13 +701,18 @@ files:
 - app/assets/javascripts/locomotive/views/dashboard/show_view.js.coffee
 - app/assets/javascripts/locomotive/views/developers_documentation/show_view.js.coffee
 - app/assets/javascripts/locomotive/views/editable_elements/edit_view.js.coffee
+- app/assets/javascripts/locomotive/views/editable_elements/iframe_view.js.coffee
 - app/assets/javascripts/locomotive/views/editable_elements/index_view.js.coffee
+- app/assets/javascripts/locomotive/views/editable_elements/page_view.js.coffee
+- app/assets/javascripts/locomotive/views/editable_elements/text_highlighter_view.js.coffee
 - app/assets/javascripts/locomotive/views/inputs/array_view.js.coffee
 - app/assets/javascripts/locomotive/views/inputs/document_picker_view.js.coffee
 - app/assets/javascripts/locomotive/views/inputs/file_view.js.coffee
 - app/assets/javascripts/locomotive/views/inputs/markdown_view.js.coffee
+- app/assets/javascripts/locomotive/views/inputs/rte/edit_table_view.js.coffee
 - app/assets/javascripts/locomotive/views/inputs/rte/file_view.js.coffee
 - app/assets/javascripts/locomotive/views/inputs/rte/link_view.js.coffee
+- app/assets/javascripts/locomotive/views/inputs/rte/table_view.js.coffee
 - app/assets/javascripts/locomotive/views/inputs/rte_view.js.coffee.erb
 - app/assets/javascripts/locomotive/views/inputs/text_view.js.coffee
 - app/assets/javascripts/locomotive/views/memberships/edit_view.js.coffee
@@ -795,17 +787,21 @@ files:
 - app/assets/stylesheets/locomotive/components/sidebar/_my_account.scss
 - app/assets/stylesheets/locomotive/components/sidebar/_pages_tree.scss
 - app/assets/stylesheets/locomotive/error.scss
-- app/assets/stylesheets/locomotive/globals/_all.scss
-- app/assets/stylesheets/locomotive/globals/_bootstrap.scss
-- app/assets/stylesheets/locomotive/globals/_colors.scss
 - app/assets/stylesheets/locomotive/globals/_mixins.scss
-- app/assets/stylesheets/locomotive/globals/_nprogress.scss
 - app/assets/stylesheets/locomotive/globals/_variables.scss
 - app/assets/stylesheets/locomotive/layouts/_live_editing.scss
 - app/assets/stylesheets/locomotive/layouts/_main.scss
 - app/assets/stylesheets/locomotive/layouts/_not_logged_in.scss
 - app/assets/stylesheets/locomotive/layouts/_responsive.scss
-- app/assets/stylesheets/locomotive/not_logged_in.scss
+- app/assets/stylesheets/locomotive/live_editing_error.scss
+- app/assets/stylesheets/locomotive/live_editing_iframe.scss
+- app/assets/stylesheets/locomotive/unauthorized.scss
+- app/assets/stylesheets/locomotive/unauthorized/_forms.scss
+- app/assets/stylesheets/locomotive/unauthorized/_keyframes.scss
+- app/assets/stylesheets/locomotive/unauthorized/_notify.scss
+- app/assets/stylesheets/locomotive/unauthorized/_public.scss
+- app/assets/stylesheets/locomotive/unauthorized/_type.scss
+- app/assets/stylesheets/locomotive/unauthorized/_variables.scss
 - app/controllers/locomotive/accounts_controller.rb
 - app/controllers/locomotive/base_controller.rb
 - app/controllers/locomotive/concerns/account_controller.rb
@@ -1043,6 +1039,7 @@ files:
 - app/views/locomotive/shared/rte/_image_popover.html.slim
 - app/views/locomotive/shared/rte/_link_popover.html.slim
 - app/views/locomotive/shared/rte/_markdown_toolbar.html.slim
+- app/views/locomotive/shared/rte/_table_popover.html.slim
 - app/views/locomotive/shared/rte/_toolbar.html.slim
 - app/views/locomotive/shared/sidebar/_content_types.html.slim
 - app/views/locomotive/shared/sidebar/_link.html.slim
@@ -1064,20 +1061,31 @@ files:
 - config/initializers/time_format.rb
 - config/locales/carrierwave.en.yml
 - config/locales/carrierwave.fr.yml
+- config/locales/carrierwave.lt.yml
+- config/locales/carrierwave.nl.yml
+- config/locales/carrierwave.ru.yml
 - config/locales/default.en.yml
 - config/locales/default.fr.yml
+- config/locales/default.nl.yml
 - config/locales/devise.en.yml
 - config/locales/devise.fr.yml
+- config/locales/devise.nl.yml
 - config/locales/en.yml
 - config/locales/flash.en.yml
 - config/locales/flash.fr.yml
+- config/locales/flash.nl.yml
 - config/locales/fr.yml
 - config/locales/inputs.en.yml
 - config/locales/inputs.fr.yml
+- config/locales/inputs.lt.yml
+- config/locales/inputs.nl.yml
 - config/locales/mongoid.en.yml
 - config/locales/mongoid.fr.yml
+- config/locales/mongoid.nl.yml
+- config/locales/nl.yml
 - config/locales/simple_form.en.yml
 - config/locales/simple_form.fr.yml
+- config/locales/simple_form.nl.yml
 - config/old-locales/admin_ui.bg.yml
 - config/old-locales/admin_ui.cs.yml
 - config/old-locales/admin_ui.de.yml
@@ -1294,8 +1302,10 @@ files:
 - lib/locomotive/simple_form.rb
 - lib/locomotive/simple_token_authentication.rb
 - lib/locomotive/steam/middlewares/cache.rb
+- lib/locomotive/steam/middlewares/catch_error.rb
 - lib/locomotive/steam/middlewares/missing_translations.rb
 - lib/locomotive/steam/middlewares/page_editing.rb
+- lib/locomotive/steam/middlewares/wysihtml_css.rb
 - lib/locomotive/steam/services/api_entry_submission_service.rb
 - lib/locomotive/steam/services/liquid_parser_with_cache_service.rb
 - lib/locomotive/steam_adaptor.rb
@@ -1385,6 +1395,7 @@ files:
 - spec/models/locomotive/translation_spec.rb
 - spec/requests/admin_ssl_spec.rb
 - spec/requests/locomotive/steam/cache_spec.rb
+- spec/requests/locomotive/steam/wysihtml_css_spec.rb
 - spec/requests/site_spec.rb
 - spec/support/capybara.rb
 - spec/support/carrierwave.rb
@@ -1401,6 +1412,19 @@ files:
 - spec/support/shared_contexts/api_header_setup.rb
 - spec/support/shared_contexts/api_site_setup.rb
 - spec/support/shared_examples/site_scope_examples.rb
+- vendor/assets/components/locomotive/backbone/backbone.js
+- vendor/assets/components/locomotive/underscore/underscore.js
+- vendor/assets/components/locomotive_sources/backbone/LICENSE
+- vendor/assets/components/locomotive_sources/backbone/backbone-min.js
+- vendor/assets/components/locomotive_sources/backbone/backbone-min.map
+- vendor/assets/components/locomotive_sources/backbone/backbone.js
+- vendor/assets/components/locomotive_sources/backbone/bower.json
+- vendor/assets/components/locomotive_sources/underscore/LICENSE
+- vendor/assets/components/locomotive_sources/underscore/README.md
+- vendor/assets/components/locomotive_sources/underscore/bower.json
+- vendor/assets/components/locomotive_sources/underscore/underscore-min.js
+- vendor/assets/components/locomotive_sources/underscore/underscore-min.map
+- vendor/assets/components/locomotive_sources/underscore/underscore.js
 - vendor/assets/images/locomotive/bootstrap-colorpicker/alpha-horizontal.png
 - vendor/assets/images/locomotive/bootstrap-colorpicker/alpha.png
 - vendor/assets/images/locomotive/bootstrap-colorpicker/hue-horizontal.png
@@ -1473,7 +1497,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
 summary: A platform to create, publish and edit sites
@@ -1609,6 +1633,7 @@ test_files:
 - spec/models/locomotive/translation_spec.rb
 - spec/requests/admin_ssl_spec.rb
 - spec/requests/locomotive/steam/cache_spec.rb
+- spec/requests/locomotive/steam/wysihtml_css_spec.rb
 - spec/requests/site_spec.rb
 - spec/support/capybara.rb
 - spec/support/carrierwave.rb

data/app/assets/stylesheets/locomotive/globals/_all.scss

@@ -1,3 +0,0 @@
-@import "./colors";
-@import "./variables";
-@import "./mixins";