locomotivecms 4.0.0 → 4.1.0.rc1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (71) hide show
  1. checksums.yaml +4 -4
  2. data/MIT-LICENSE +1 -1
  3. data/README.md +1 -1
  4. data/Rakefile +3 -0
  5. data/app/api/locomotive/api/entities/content_type_entity.rb +1 -1
  6. data/app/api/locomotive/api/entities/site_entity.rb +1 -1
  7. data/app/api/locomotive/api/forms/content_type_form.rb +2 -1
  8. data/app/api/locomotive/api/forms/site_form.rb +1 -0
  9. data/app/api/locomotive/api/helpers/persistence_helper.rb +1 -1
  10. data/app/api/locomotive/api/resources/content_asset_resource.rb +6 -0
  11. data/app/api/locomotive/api/resources/content_type_resource.rb +2 -0
  12. data/app/api/locomotive/api/resources/current_site_resource.rb +1 -1
  13. data/app/api/locomotive/api/resources/site_resource.rb +3 -1
  14. data/app/assets/javascripts/locomotive/editor.js +2541 -1196
  15. data/app/assets/javascripts/locomotive/views/content_entry_imports/new_view.js.coffee +12 -0
  16. data/app/assets/javascripts/locomotive/views/content_entry_imports/show_view.js.coffee +8 -0
  17. data/app/assets/stylesheets/locomotive/application.scss +2 -0
  18. data/app/assets/stylesheets/locomotive/editor.css +105 -12
  19. data/app/assets/stylesheets/locomotive/new/_dashboard.scss +20 -0
  20. data/app/assets/stylesheets/locomotive/old/_content_assets.scss +1 -1
  21. data/app/controllers/locomotive/content_assets_controller.rb +2 -1
  22. data/app/controllers/locomotive/content_entry_imports_controller.rb +50 -0
  23. data/app/controllers/locomotive/custom_fields/select_options_controller.rb +1 -0
  24. data/app/helpers/locomotive/base_helper.rb +1 -1
  25. data/app/helpers/locomotive/content_entries_helper.rb +9 -3
  26. data/app/helpers/locomotive/shared/pages_helper.rb +1 -1
  27. data/app/jobs/locomotive/import_content_entry_job.rb +12 -0
  28. data/app/jobs/locomotive/send_pony_email_job.rb +4 -3
  29. data/app/mailers/locomotive/notifications.rb +37 -11
  30. data/app/models/locomotive/account.rb +1 -0
  31. data/app/models/locomotive/concerns/asset/vignette.rb +7 -5
  32. data/app/models/locomotive/concerns/content_type/group_by.rb +6 -1
  33. data/app/models/locomotive/concerns/content_type/import.rb +124 -0
  34. data/app/models/locomotive/concerns/site/metafields.rb +26 -0
  35. data/app/models/locomotive/content_asset.rb +9 -2
  36. data/app/models/locomotive/content_type.rb +1 -0
  37. data/app/models/locomotive/section.rb +3 -1
  38. data/app/models/locomotive/site.rb +2 -0
  39. data/app/policies/locomotive/content_entry_policy.rb +1 -2
  40. data/app/policies/locomotive/content_type_policy.rb +3 -0
  41. data/app/policies/locomotive/site_policy.rb +5 -3
  42. data/app/services/locomotive/content_asset_service.rb +27 -4
  43. data/app/services/locomotive/content_entry_import_service.rb +107 -0
  44. data/app/services/locomotive/content_entry_service.rb +1 -1
  45. data/app/uploaders/locomotive/picture_uploader.rb +1 -1
  46. data/app/uploaders/locomotive/theme_asset_uploader.rb +1 -1
  47. data/app/views/locomotive/content_assets/_dropzone.html.slim +5 -1
  48. data/app/views/locomotive/content_entries/index.html.slim +8 -0
  49. data/app/views/locomotive/content_entry_imports/new.html.slim +23 -0
  50. data/app/views/locomotive/content_entry_imports/show.html.slim +54 -0
  51. data/app/views/locomotive/current_site/form/_advanced.html.slim +2 -0
  52. data/app/views/locomotive/page_content/edit.html.erb +1 -0
  53. data/app/views/locomotive/shared/account/_navigation.html.slim +1 -1
  54. data/config/locales/editor.en.yml +22 -0
  55. data/config/locales/editor.fr.yml +22 -0
  56. data/config/locales/en.yml +21 -0
  57. data/config/locales/es.yml +2 -0
  58. data/config/locales/flash.en.yml +6 -0
  59. data/config/locales/fr.yml +2 -0
  60. data/config/locales/mongoid.en.yml +5 -1
  61. data/config/locales/mongoid.es.yml +4 -0
  62. data/config/locales/simple_form.en.yml +13 -1
  63. data/config/locales/simple_form.es.yml +2 -0
  64. data/config/routes.rb +3 -2
  65. data/lib/generators/locomotive/install/install_generator.rb +1 -0
  66. data/lib/generators/locomotive/install/templates/carrierwave_aws.rb +5 -0
  67. data/lib/locomotive/configuration.rb +1 -0
  68. data/lib/locomotive/dragonfly.rb +6 -4
  69. data/lib/locomotive/steam/services/liquid_parser_with_cache_service.rb +1 -1
  70. data/lib/locomotive/version.rb +1 -1
  71. metadata +50 -27

There are too many changes on this page to be displayed.

The amount of changes on this page would crash your brower.

You can still verify the content by downloading the gem file manually.