RubyGems - lalala - Versions diffs - 4.0.0.dev.416 → 4.1.0.dev.299 - Mend

lalala 4.0.0.dev.416 → 4.1.0.dev.299

Files changed (111) hide show

checksums.yaml +4 -4
data/.travis.yml +1 -1
data/Gemfile +1 -3
data/Haraway.md +14 -0
data/app/assets/javascripts/lalala/base.js +8 -0
data/app/assets/javascripts/lalala/initializers/chosen.module.js +3 -0
data/app/assets/javascripts/lalala/initializers/haraway.module.js +8 -0
data/app/assets/javascripts/lalala/lib/overlay.js +335 -0
data/app/assets/javascripts/lalala/modules/collapsible_pages_tree.module.js +26 -33
data/app/assets/javascripts/lalala/modules/editor.module.js +37 -23
data/app/assets/javascripts/lalala/modules/file-uploader-metadata.module.js +248 -0
data/app/assets/javascripts/lalala/modules/file-uploader.module.js +376 -0
data/app/assets/javascripts/lalala/modules/init.module.js +1 -5
data/app/assets/javascripts/lalala/modules/media_selector.module.js +250 -0
data/app/assets/javascripts/lalala/modules/overlay.module.js +33 -0
data/app/assets/stylesheets/lalala/_base.css.scss +5 -2
data/app/assets/stylesheets/lalala/components/_buttons.css.scss +11 -3
data/app/assets/stylesheets/lalala/components/_forms.css.scss +14 -64
data/app/assets/stylesheets/lalala/lib/_overlay.css.scss +66 -0
data/app/assets/stylesheets/lalala/modules/_dashboard.css.scss +10 -51
data/app/assets/stylesheets/lalala/modules/_editor-cheatsheet.css.scss +1 -17
data/app/assets/stylesheets/lalala/modules/_file-uploader-metadata.css.scss +118 -0
data/app/assets/stylesheets/lalala/modules/_file-uploader.css.scss +289 -0
data/app/assets/stylesheets/lalala/modules/_media-selector.css.scss +113 -0
data/app/assets/stylesheets/lalala/modules/_title-bar.css.scss +0 -17
data/app/controllers/lalala/public/errors_controller.rb +7 -0
data/app/models/lalala/page.rb +0 -1
data/app/views/lalala/markdown/cheatsheet.html.erb +0 -2
data/config/routes.rb +12 -1
data/lalala-assets.gemspec +3 -3
data/lalala-development.gemspec +1 -1
data/lalala-test.gemspec +1 -1
data/lalala.gemspec +4 -5
data/lib/formtastic/form_builder_ext.rb +10 -0
data/lib/formtastic/inputs/haraway_input.rb +151 -0
data/lib/generators/lalala/assets/templates/bower.json.erb +1 -1
data/lib/generators/lalala/install/install_generator.rb +0 -23
data/lib/lalala/admin/pages.rb +1 -26
data/lib/lalala/engine.rb +0 -7
data/lib/lalala/ext_action_dispatch.rb +0 -1
data/lib/lalala/ext_active_record/i18n_translations_writer.rb +0 -1
data/lib/lalala/ext_active_record.rb +0 -1
data/lib/lalala/ext_i18n/input_helper.rb +0 -1
data/lib/lalala/ext_i18n/negotiation_adapter.rb +0 -4
data/lib/lalala/ext_i18n/test_negotiation_adapter.rb +0 -4
data/lib/lalala/ext_rack/i18n_negotiator.rb +7 -9
data/lib/lalala/markdown/handlers/asset.rb +24 -0
data/lib/lalala/markdown/handlers/youtube.rb +9 -13
data/lib/lalala/markdown/html_renderer.rb +2 -2
data/lib/lalala/markdown.rb +2 -3
data/lib/lalala/utils/install_template.rb +3 -9
data/lib/lalala/version.rb +2 -2
data/lib/lalala.rb +6 -7
data/script/ci +33 -30
data/test/dummy/app/admin/articles.rb +26 -12
data/test/dummy/app/admin/dashboard.rb +5 -8
data/test/dummy/app/admin/tags.rb +1 -3
data/test/dummy/app/assets/stylesheets/_normalize.css +423 -0
data/test/dummy/app/assets/stylesheets/application.css.scss +2 -0
data/test/dummy/app/assets/stylesheets/base/_base.css.scss +4 -0
data/test/dummy/app/controllers/pages_controller.rb +4 -0
data/test/dummy/app/models/article.rb +10 -4
data/test/dummy/app/pages/application_page.rb +7 -2
data/test/dummy/app/pages/basic_page.rb +5 -6
data/test/dummy/app/pages/home_page.rb +10 -10
data/test/dummy/app/pages/media_page.rb +23 -0
data/test/dummy/app/views/admin/_stats.html.erb +7 -14
data/test/dummy/app/views/layouts/application.html.erb +6 -2
data/test/dummy/app/views/pages/media.html.erb +3 -0
data/test/dummy/config/initializers/haraway.rb +29 -0
data/test/dummy/config/routes.rb +1 -0
data/test/dummy/db/migrate/20130528092721_create_articles.rb +1 -0
data/test/dummy/db/migrate/20130729125648_create_home_page.rb +4 -0
data/test/dummy/db/migrate/20131122144302_enable_haraway.rb +16 -0
data/test/dummy/db/migrate/20140228141749_create_media_page.rb +8 -0
data/test/dummy/db/schema.rb +2 -4
data/test/integration/aricles_test.rb +0 -1
metadata +59 -81
data/app/assets/javascripts/jquery-ui/sortable.js +0 -0
data/app/assets/javascripts/lalala/lib/jquery-ui.js +0 -16617
data/app/assets/javascripts/lalala/modules/grid.module.js +0 -284
data/app/assets/javascripts/lalala/modules/input_group.module.js +0 -36
data/app/assets/stylesheets/lalala/modules/_grid.css.scss +0 -197
data/app/assets/stylesheets/lalala/modules/_index-as-sortable.css.scss +0 -89
data/app/models/lalala/abstract_asset.rb +0 -24
data/app/models/lalala/file_asset.rb +0 -3
data/app/models/lalala/image_asset.rb +0 -3
data/config/initializers/carrierwave.rb +0 -34
data/lib/formtastic/inputs/grid_input.rb +0 -159
data/lib/formtastic/inputs/single_file_input.rb +0 -44
data/lib/generators/lalala/install/templates/application.html.erb +0 -64
data/lib/generators/lalala/install/templates/helpers/application_helper.rb +0 -16
data/lib/generators/lalala/install/templates/helpers/html_helper.rb +0 -60
data/lib/generators/lalala/install/templates/helpers/open_graph_helper.rb.erb +0 -92
data/lib/generators/lalala/install/templates/helpers/pages_helper.rb +0 -15
data/lib/generators/lalala/install/templates/locales/en.yml +0 -6
data/lib/generators/lalala/install/templates/uploaders/file_uploader.rb +0 -2
data/lib/generators/lalala/install/templates/uploaders/image_uploader.rb +0 -11
data/lib/lalala/ext_action_dispatch/multi_file_upload.rb +0 -55
data/lib/lalala/ext_active_record/assets.rb +0 -25
data/lib/lalala/markdown/handlers/soundcloud.rb +0 -36
data/lib/lalala/markdown/handlers/vimeo.rb +0 -40
data/lib/lalala/uploaders/file.rb +0 -50
data/lib/lalala/uploaders/image.rb +0 -13
data/lib/lalala/uploaders.rb +0 -6
data/test/dummy/app/assets/stylesheets/application.css +0 -13
data/test/dummy/app/models/file_asset.rb +0 -2
data/test/dummy/app/models/image_asset.rb +0 -2
data/test/dummy/app/uploaders/file_uploader.rb +0 -2
data/test/dummy/app/uploaders/image_uploader.rb +0 -11
data/test/dummy/db/migrate/20140926152646_add_pre_and_postpend_test_columns_to_articles.rb +0 -6

data/test/dummy/app/views/admin/_stats.html.erb CHANGED Viewed

@@ -6,27 +6,20 @@
   @user_total     = Lalala::AdminUser::all.count
   # fill array
-  @values << ["page",@page_total, nil]
-  @values << ["post",@post_total, "/lalala/articles/new"]
-  @values << ["file",@assets_total, nil]
-  @values << ["user",@user_total, "/lalala/admin_users/new"]
+  @values << ["pages",@page_total]
+  @values << ["posts",@post_total]
+  @values << ["files",@assets_total]
+  @values << ["user(s)",@user_total]
 %>
 <div class="mod-dashboard">
   <div class="stats count_<%= @values.length %>">
     <ul>
-      <% @values.each do |title,val,link| %>
+      <% @values.each do |title,val| %>
       <li>
-        <div class="default">
-          <p class="val"><%= val %></p>
-          <p class="title"><%= title.pluralize %></p>
-        </div>
-        <% unless link.nil? %>
-        <div class="hover">
-          <a href="<%= link %>" class="button">New <%= title %></a>
-        </div>
-        <% end %>
+        <p class="val"><%= val %></p>
+        <p class="title"><%= title %></p>
       </li>
       <% end %>
     </ul>

data/test/dummy/app/views/layouts/application.html.erb CHANGED Viewed

@@ -1,14 +1,18 @@
 <!DOCTYPE html>
 <html>
 <head>
+  <meta charset="utf-8">
   <title>Dummy</title>
-  <%= stylesheet_link_tag    "application", :media => "all" %>
-  <%= javascript_include_tag "application" %>
+  <%= stylesheet_link_tag "application" %>
   <%= csrf_meta_tags %>
 </head>
 <body>
 <%= yield %>
 </body>
 </html>

data/test/dummy/app/views/pages/media.html.erb ADDED Viewed

@@ -0,0 +1,3 @@
+<h1><%= @page.title %></h1>
+<%= @page.body_html %>

data/test/dummy/config/initializers/haraway.rb ADDED Viewed

@@ -0,0 +1,29 @@
+Haraway.configure do |c|
+  c.use_ssl    = false
+  c.endpoint   = "assets.sh"
+  c.access_key = "533019cfa622e91c"
+  c.secret_key = "74bc88e1a0ab978b88d0c2a4b919f13ebe4a681a8f3a89e812182d09282d26a4"
+  #
+  #  Profiles
+  #
+  c.profile("images") do |p|
+    p.accept "image/*"
+    p.version("thumb") do |v|
+      v.resize_to_fill(158, 110)
+    end
+    p.version("cover") do |v|
+      v.resize_to_fill(220, 153)
+    end
+    p.version("aspect_16-9") do |v|
+      v.resize_to_fill(700, 393)
+    end
+  end
+  c.profile("downloads")
+end

data/test/dummy/config/routes.rb CHANGED Viewed

@@ -1,3 +1,4 @@
 Dummy::Application.routes.draw do
+  pages :media, to: 'pages#media'
   pages :application, to: 'pages#show'
 end

data/test/dummy/db/migrate/20130528092721_create_articles.rb CHANGED Viewed

@@ -3,6 +3,7 @@ class CreateArticles < ActiveRecord::Migration
     create_table :articles do |t|
       t.string :title
       t.text :body
+      t.text :haraway_metadata
       t.timestamps
     end

data/test/dummy/db/migrate/20130729125648_create_home_page.rb CHANGED Viewed

@@ -1,5 +1,9 @@
 class CreateHomePage < ActiveRecord::Migration
   def up
+    unless column_exists?(:pages, :haraway_metadata)
+      add_column(:pages, :haraway_metadata, :text)
+    end
     HomePage.create!
   end

data/test/dummy/db/migrate/20131122144302_enable_haraway.rb ADDED Viewed

@@ -0,0 +1,16 @@
+class EnableHaraway < ActiveRecord::Migration
+  def up
+    unless column_exists?(:articles, :haraway_metadata)
+      add_column(:articles, :haraway_metadata, :text)
+    end
+    unless column_exists?(:pages, :haraway_metadata)
+      add_column(:pages, :haraway_metadata, :text)
+    end
+  end
+  def down
+    remove_column :articles, :haraway_metadata
+    remove_column :pages, :haraway_metadata
+  end
+end

data/test/dummy/db/migrate/20140228141749_create_media_page.rb ADDED Viewed

@@ -0,0 +1,8 @@
+class CreateMediaPage < ActiveRecord::Migration
+  def up
+    HomePage.first!.save
+  end
+  def down
+  end
+end

data/test/dummy/db/schema.rb CHANGED Viewed

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
-ActiveRecord::Schema.define(:version => 20140926152646) do
+ActiveRecord::Schema.define(:version => 20140228141749) do
   create_table "active_admin_comments", :force => true do |t|
     t.string   "resource_id",   :null => false
@@ -60,12 +60,10 @@ ActiveRecord::Schema.define(:version => 20140926152646) do
   add_index "article_translations", ["locale"], :name => "index_article_translations_on_locale"
   create_table "articles", :force => true do |t|
+    t.text     "haraway_metadata"
     t.datetime "created_at",       :null => false
     t.datetime "updated_at",       :null => false
     t.string   "category"
-    t.text     "haraway_metadata"
-    t.string   "url"
-    t.string   "price"
   end
   create_table "articles_tags", :id => false, :force => true do |t|

data/test/integration/aricles_test.rb CHANGED Viewed

@@ -20,7 +20,6 @@ class ArticlesTest < ActionDispatch::IntegrationTest
     assert_equal('/lalala/articles/new', current_path)
     first('input[name="article[translations_writer][en][title]"]').set('My Article')
-    attach_file('Image', File.expand_path('../../fixtures/files/image.png', __FILE__))
     click_on('Create Article')
     page.save_page
     assert_equal 200, page.status_code

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lalala
 version: !ruby/object:Gem::Version
-  version: 4.0.0.dev.416
+  version: 4.1.0.dev.299
 platform: ruby
 authors:
 - Simon Menke
@@ -13,7 +13,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-02-17 00:00:00.000000000 Z
+date: 2014-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeadmin
@@ -21,28 +21,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.3
+        version: 0.6.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.3
-- !ruby/object:Gem::Dependency
-  name: carrierwave
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.8.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.6.2
 - !ruby/object:Gem::Dependency
   name: closure_tree
   requirement: !ruby/object:Gem::Requirement
@@ -155,20 +141,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.1.3
-- !ruby/object:Gem::Dependency
-  name: mini_magick
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.6.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.6.0
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -189,14 +161,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: 2.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -254,19 +226,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.5.1
 - !ruby/object:Gem::Dependency
-  name: rails_12factor
+  name: sentry-raven
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.6.0
+- !ruby/object:Gem::Dependency
+  name: haraway
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.0.dev
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.0.dev
 description: 'Lalala: Probably the best CMS in the world'
 email:
 - hello@mrhenry.be
@@ -274,9 +260,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
 - Gemfile
+- Haraway.md
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -1307,23 +1294,26 @@ files:
 - app/assets/javascripts/browser/navigator.module.js
 - app/assets/javascripts/browser/screen.module.js
 - app/assets/javascripts/browser/window.module.js
-- app/assets/javascripts/jquery-ui/sortable.js
 - app/assets/javascripts/lalala/base.js
+- app/assets/javascripts/lalala/initializers/chosen.module.js
+- app/assets/javascripts/lalala/initializers/haraway.module.js
 - app/assets/javascripts/lalala/lib/jquery-chosen.js
 - app/assets/javascripts/lalala/lib/jquery-markitup.js
-- app/assets/javascripts/lalala/lib/jquery-ui.js
 - app/assets/javascripts/lalala/lib/moment.js
+- app/assets/javascripts/lalala/lib/overlay.js
 - app/assets/javascripts/lalala/lib/pikaday.js
 - app/assets/javascripts/lalala/modules/calendar.module.js
 - app/assets/javascripts/lalala/modules/collapsible_pages_tree.module.js
 - app/assets/javascripts/lalala/modules/dashboard.module.js
 - app/assets/javascripts/lalala/modules/editor.module.js
-- app/assets/javascripts/lalala/modules/grid.module.js
+- app/assets/javascripts/lalala/modules/file-uploader-metadata.module.js
+- app/assets/javascripts/lalala/modules/file-uploader.module.js
 - app/assets/javascripts/lalala/modules/helpers.module.js
 - app/assets/javascripts/lalala/modules/init.module.js
-- app/assets/javascripts/lalala/modules/input_group.module.js
 - app/assets/javascripts/lalala/modules/locale_chooser.module.js
 - app/assets/javascripts/lalala/modules/login.module.js
+- app/assets/javascripts/lalala/modules/media_selector.module.js
+- app/assets/javascripts/lalala/modules/overlay.module.js
 - app/assets/javascripts/lalala/modules/sorted_pages_tree.module.js
 - app/assets/javascripts/lalala/modules/storage.module.js
 - app/assets/stylesheets/lalala/_base.css.scss
@@ -1341,6 +1331,7 @@ files:
 - app/assets/stylesheets/lalala/editor-preview.css.scss
 - app/assets/stylesheets/lalala/lib/_chosen.css.scss
 - app/assets/stylesheets/lalala/lib/_jquery-ui.css.scss
+- app/assets/stylesheets/lalala/lib/_overlay.css.scss
 - app/assets/stylesheets/lalala/lib/_pikaday.css
 - app/assets/stylesheets/lalala/modules/_action-items.css.scss
 - app/assets/stylesheets/lalala/modules/_dashboard.css.scss
@@ -1348,16 +1339,17 @@ files:
 - app/assets/stylesheets/lalala/modules/_editor-cheatsheet.css.scss
 - app/assets/stylesheets/lalala/modules/_editor-preview.css.scss
 - app/assets/stylesheets/lalala/modules/_editor.css.scss
+- app/assets/stylesheets/lalala/modules/_file-uploader-metadata.css.scss
+- app/assets/stylesheets/lalala/modules/_file-uploader.css.scss
 - app/assets/stylesheets/lalala/modules/_filter-form.css.scss
 - app/assets/stylesheets/lalala/modules/_flashes.css.scss
 - app/assets/stylesheets/lalala/modules/_footer.css.scss
-- app/assets/stylesheets/lalala/modules/_grid.css.scss
 - app/assets/stylesheets/lalala/modules/_header.css.scss
-- app/assets/stylesheets/lalala/modules/_index-as-sortable.css.scss
 - app/assets/stylesheets/lalala/modules/_index-as-table.css.scss
 - app/assets/stylesheets/lalala/modules/_index-as-tree-table.css.scss
 - app/assets/stylesheets/lalala/modules/_index-footer.css.scss
 - app/assets/stylesheets/lalala/modules/_login.css.scss
+- app/assets/stylesheets/lalala/modules/_media-selector.css.scss
 - app/assets/stylesheets/lalala/modules/_panel.css.scss
 - app/assets/stylesheets/lalala/modules/_scopes.css.scss
 - app/assets/stylesheets/lalala/modules/_sidebar-section.css.scss
@@ -1367,10 +1359,7 @@ files:
 - app/controllers/lalala/markdown_controller.rb
 - app/controllers/lalala/public/errors_controller.rb
 - app/controllers/lalala/public/pages_controller.rb
-- app/models/lalala/abstract_asset.rb
 - app/models/lalala/admin_user.rb
-- app/models/lalala/file_asset.rb
-- app/models/lalala/image_asset.rb
 - app/models/lalala/page.rb
 - app/views/active_admin/devise/sessions/new.html.erb
 - app/views/lalala/markdown/cheatsheet.html.erb
@@ -1381,7 +1370,6 @@ files:
 - app/views/lalala/public/pages/show.html.erb
 - app/views/layouts/lalala/markdown.html.erb
 - config/initializers/active_admin.rb
-- config/initializers/carrierwave.rb
 - config/initializers/database.rb
 - config/initializers/devise.rb
 - config/locales/en.yml
@@ -1398,8 +1386,8 @@ files:
 - lalala-development.gemspec
 - lalala-test.gemspec
 - lalala.gemspec
-- lib/formtastic/inputs/grid_input.rb
-- lib/formtastic/inputs/single_file_input.rb
+- lib/formtastic/form_builder_ext.rb
+- lib/formtastic/inputs/haraway_input.rb
 - lib/generators/lalala/assets/assets_generator.rb
 - lib/generators/lalala/assets/templates/.bowerrc
 - lib/generators/lalala/assets/templates/.jshintrc
@@ -1419,16 +1407,10 @@ files:
 - lib/generators/lalala/install/templates/active_admin.rb.erb
 - lib/generators/lalala/install/templates/admin_pages.rb
 - lib/generators/lalala/install/templates/admin_users.rb
-- lib/generators/lalala/install/templates/application.html.erb
 - lib/generators/lalala/install/templates/application_mailer.html.erb
 - lib/generators/lalala/install/templates/dashboard.rb
 - lib/generators/lalala/install/templates/devise.rb.erb
 - lib/generators/lalala/install/templates/errors_controller.rb
-- lib/generators/lalala/install/templates/helpers/application_helper.rb
-- lib/generators/lalala/install/templates/helpers/html_helper.rb
-- lib/generators/lalala/install/templates/helpers/open_graph_helper.rb.erb
-- lib/generators/lalala/install/templates/helpers/pages_helper.rb
-- lib/generators/lalala/install/templates/locales/en.yml
 - lib/generators/lalala/install/templates/models/admin_user.rb
 - lib/generators/lalala/install/templates/models/application_page.rb
 - lib/generators/lalala/install/templates/models/file_asset.rb
@@ -1436,8 +1418,6 @@ files:
 - lib/generators/lalala/install/templates/pages_controller.rb
 - lib/generators/lalala/install/templates/routes.rb.erb
 - lib/generators/lalala/install/templates/staging.rb.erb
-- lib/generators/lalala/install/templates/uploaders/file_uploader.rb
-- lib/generators/lalala/install/templates/uploaders/image_uploader.rb
 - lib/generators/lalala/page/page_generator.rb
 - lib/generators/lalala/page/templates/page.rb
 - lib/generators/lalala/resource/USAGE
@@ -1451,10 +1431,8 @@ files:
 - lib/lalala/development.rb
 - lib/lalala/engine.rb
 - lib/lalala/ext_action_dispatch.rb
-- lib/lalala/ext_action_dispatch/multi_file_upload.rb
 - lib/lalala/ext_action_dispatch/page_name.rb
 - lib/lalala/ext_active_record.rb
-- lib/lalala/ext_active_record/assets.rb
 - lib/lalala/ext_active_record/i18n_translations_writer.rb
 - lib/lalala/ext_active_record/schema.rb
 - lib/lalala/ext_active_record/schema/join_table.rb
@@ -1473,9 +1451,8 @@ files:
 - lib/lalala/ext_with_advisory_lock/flock.rb
 - lib/lalala/markdown.rb
 - lib/lalala/markdown/active_model.rb
+- lib/lalala/markdown/handlers/asset.rb
 - lib/lalala/markdown/handlers/base.rb
-- lib/lalala/markdown/handlers/soundcloud.rb
-- lib/lalala/markdown/handlers/vimeo.rb
 - lib/lalala/markdown/handlers/youtube.rb
 - lib/lalala/markdown/html_renderer.rb
 - lib/lalala/markdown/input_helper.rb
@@ -1490,9 +1467,6 @@ files:
 - lib/lalala/pages/route_mapper.rb
 - lib/lalala/test.rb
 - lib/lalala/test/login_helper.rb
-- lib/lalala/uploaders.rb
-- lib/lalala/uploaders/file.rb
-- lib/lalala/uploaders/image.rb
 - lib/lalala/utils/install_template.rb
 - lib/lalala/vendor.rb
 - lib/lalala/version.rb
@@ -1511,8 +1485,10 @@ files:
 - test/dummy/app/admin/tags.rb
 - test/dummy/app/assets/javascripts/active_admin.js
 - test/dummy/app/assets/javascripts/application.js
+- test/dummy/app/assets/stylesheets/_normalize.css
 - test/dummy/app/assets/stylesheets/active_admin.css.scss
-- test/dummy/app/assets/stylesheets/application.css
+- test/dummy/app/assets/stylesheets/application.css.scss
+- test/dummy/app/assets/stylesheets/base/_base.css.scss
 - test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/controllers/errors_controller.rb
 - test/dummy/app/controllers/pages_controller.rb
@@ -1521,16 +1497,14 @@ files:
 - test/dummy/app/models/.gitkeep
 - test/dummy/app/models/admin_user.rb
 - test/dummy/app/models/article.rb
-- test/dummy/app/models/file_asset.rb
-- test/dummy/app/models/image_asset.rb
 - test/dummy/app/models/tag.rb
 - test/dummy/app/pages/application_page.rb
 - test/dummy/app/pages/basic_page.rb
 - test/dummy/app/pages/home_page.rb
-- test/dummy/app/uploaders/file_uploader.rb
-- test/dummy/app/uploaders/image_uploader.rb
+- test/dummy/app/pages/media_page.rb
 - test/dummy/app/views/admin/_stats.html.erb
 - test/dummy/app/views/layouts/application.html.erb
+- test/dummy/app/views/pages/media.html.erb
 - test/dummy/config.ru
 - test/dummy/config/application.rb
 - test/dummy/config/boot.rb
@@ -1542,6 +1516,7 @@ files:
 - test/dummy/config/initializers/active_admin.rb
 - test/dummy/config/initializers/backtrace_silencers.rb
 - test/dummy/config/initializers/devise.rb
+- test/dummy/config/initializers/haraway.rb
 - test/dummy/config/initializers/inflections.rb
 - test/dummy/config/initializers/mime_types.rb
 - test/dummy/config/initializers/secret_token.rb
@@ -1555,9 +1530,10 @@ files:
 - test/dummy/db/migrate/20130729125648_create_home_page.rb
 - test/dummy/db/migrate/20131113134503_add_category_to_articles.rb
 - test/dummy/db/migrate/20131121092946_make_articles_translatable.rb
+- test/dummy/db/migrate/20131122144302_enable_haraway.rb
 - test/dummy/db/migrate/20131122165715_create_tags.rb
 - test/dummy/db/migrate/20131122170308_add_articles_tags_binding.rb
-- test/dummy/db/migrate/20140926152646_add_pre_and_postpend_test_columns_to_articles.rb
+- test/dummy/db/migrate/20140228141749_create_media_page.rb
 - test/dummy/db/schema.rb
 - test/dummy/lib/assets/.gitkeep
 - test/dummy/log/.gitkeep
@@ -1588,17 +1564,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project:
-rubygems_version: 2.4.8
+rubygems_version: 2.2.2
 signing_key:
 specification_version: 4
 summary: 'Lalala: Probably the best CMS in the world.'
@@ -1612,8 +1588,10 @@ test_files:
 - test/dummy/app/admin/tags.rb
 - test/dummy/app/assets/javascripts/active_admin.js
 - test/dummy/app/assets/javascripts/application.js
+- test/dummy/app/assets/stylesheets/_normalize.css
 - test/dummy/app/assets/stylesheets/active_admin.css.scss
-- test/dummy/app/assets/stylesheets/application.css
+- test/dummy/app/assets/stylesheets/application.css.scss
+- test/dummy/app/assets/stylesheets/base/_base.css.scss
 - test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/controllers/errors_controller.rb
 - test/dummy/app/controllers/pages_controller.rb
@@ -1622,16 +1600,14 @@ test_files:
 - test/dummy/app/models/.gitkeep
 - test/dummy/app/models/admin_user.rb
 - test/dummy/app/models/article.rb
-- test/dummy/app/models/file_asset.rb
-- test/dummy/app/models/image_asset.rb
 - test/dummy/app/models/tag.rb
 - test/dummy/app/pages/application_page.rb
 - test/dummy/app/pages/basic_page.rb
 - test/dummy/app/pages/home_page.rb
-- test/dummy/app/uploaders/file_uploader.rb
-- test/dummy/app/uploaders/image_uploader.rb
+- test/dummy/app/pages/media_page.rb
 - test/dummy/app/views/admin/_stats.html.erb
 - test/dummy/app/views/layouts/application.html.erb
+- test/dummy/app/views/pages/media.html.erb
 - test/dummy/config.ru
 - test/dummy/config/application.rb
 - test/dummy/config/boot.rb
@@ -1643,6 +1619,7 @@ test_files:
 - test/dummy/config/initializers/active_admin.rb
 - test/dummy/config/initializers/backtrace_silencers.rb
 - test/dummy/config/initializers/devise.rb
+- test/dummy/config/initializers/haraway.rb
 - test/dummy/config/initializers/inflections.rb
 - test/dummy/config/initializers/mime_types.rb
 - test/dummy/config/initializers/secret_token.rb
@@ -1656,9 +1633,10 @@ test_files:
 - test/dummy/db/migrate/20130729125648_create_home_page.rb
 - test/dummy/db/migrate/20131113134503_add_category_to_articles.rb
 - test/dummy/db/migrate/20131121092946_make_articles_translatable.rb
+- test/dummy/db/migrate/20131122144302_enable_haraway.rb
 - test/dummy/db/migrate/20131122165715_create_tags.rb
 - test/dummy/db/migrate/20131122170308_add_articles_tags_binding.rb
-- test/dummy/db/migrate/20140926152646_add_pre_and_postpend_test_columns_to_articles.rb
+- test/dummy/db/migrate/20140228141749_create_media_page.rb
 - test/dummy/db/schema.rb
 - test/dummy/lib/assets/.gitkeep
 - test/dummy/log/.gitkeep

data/app/assets/javascripts/jquery-ui/sortable.js DELETED Viewed

File without changes