pageflow 12.0.4 → 12.1.0

data/lib/pageflow/zencoder_video_output_definition.rb

@@ -34,7 +34,7 @@ module Pageflow
     private
 
     def mp4_highdef_definitions
-      return [] unless video_file.entry.feature_state('highdef_video_encoding')
+      return [] unless video_file.encode_highdef?
       [transferable(mp4_4k_definition), transferable(mp4_fullhd_definition)]
     end
 
@@ -128,7 +128,7 @@ module Pageflow
     end
 
     def dash_highdef_definitions
-      return [] unless video_file.entry.feature_state('highdef_video_encoding')
+      return [] unless video_file.encode_highdef?
 
       [
         non_transferable(dash_fullhd_definition),
@@ -149,7 +149,7 @@ module Pageflow
     end
 
     def hls_highdef_definitions
-      return [] unless video_file.entry.feature_state('highdef_video_encoding')
+      return [] unless video_file.encode_highdef?
 
       [
         non_transferable(hls_fullhd_definition),
@@ -243,29 +243,29 @@ module Pageflow
       [
         {
           source: 'dash-low',
-          path: video_file.dash_low.url
+          path: video_file.dash_low.url_relative_to(video_file.dash_playlist)
         },
         {
           source: 'dash-medium',
-          path: video_file.dash_medium.url
+          path: video_file.dash_medium.url_relative_to(video_file.dash_playlist)
         },
         {
           source: 'dash-high',
-          path: video_file.dash_high.url
+          path: video_file.dash_high.url_relative_to(video_file.dash_playlist)
         }
       ] + dash_highdef_stream_definitions
     end
 
     def dash_highdef_stream_definitions
-      return [] unless video_file.entry.feature_state('highdef_video_encoding')
+      return [] unless video_file.encode_highdef?
       [
         {
           source: 'dash-fullhd',
-          path: video_file.dash_fullhd.url
+          path: video_file.dash_fullhd.url_relative_to(video_file.dash_playlist)
         },
         {
           source: 'dash-4k',
-          path: video_file.dash_4k.url
+          path: video_file.dash_4k.url_relative_to(video_file.dash_playlist)
         }
       ]
     end
@@ -350,33 +350,33 @@ module Pageflow
       [
         {
           source: 'hls-medium',
-          path: video_file.hls_medium.url(host: :hls_origin, default_protocol: 'http'),
+          path: video_file.hls_medium.url_relative_to(video_file.hls_playlist),
           bandwidth: 1769
         },
         {
           source: 'hls-low',
-          path: video_file.hls_low.url(host: :hls_origin, default_protocol: 'http'),
+          path: video_file.hls_low.url_relative_to(video_file.hls_playlist),
           bandwidth: 619
         },
         {
           source: 'hls-high',
-          path: video_file.hls_high.url(host: :hls_origin, default_protocol: 'http'),
+          path: video_file.hls_high.url_relative_to(video_file.hls_playlist),
           bandwidth: 3538
         }
       ] + hls_highdef_stream_definitions
     end
 
     def hls_highdef_stream_definitions
-      return [] unless video_file.entry.feature_state('highdef_video_encoding')
+      return [] unless video_file.encode_highdef?
       [
         {
           source: 'hls-fullhd',
-          path: video_file.hls_fullhd.url(host: :hls_origin, default_protocol: 'http'),
+          path: video_file.hls_fullhd.url_relative_to(video_file.hls_playlist),
           bandwidth: 8575
         },
         {
           source: 'hls-4k',
-          path: video_file.hls_4k.url(host: :hls_origin, default_protocol: 'http'),
+          path: video_file.hls_4k.url_relative_to(video_file.hls_playlist),
           bandwidth: 32000
         }
       ]
@@ -404,7 +404,7 @@ module Pageflow
       # these cases the input file is just a tiny bit larger than the
       # next lower resolution, so we do not really care if the SMIL
       # file which does not include the higher quality does not win.
-      if video_file.entry.feature_state('highdef_video_encoding')
+      if video_file.encode_highdef?
         [
           non_transferable(smil_definition.merge(streams: smil_default_stream_definitions,
                                                  skip: {

data/lib/tasks/pageflow_tasks.rake

@@ -11,4 +11,18 @@ namespace :pageflow do
       system('bin/npm run build')
     end
   end
+
+  namespace :prune_auto_snapshots_jobs do
+    desc 'Enqueue jobs to destroy old auto snapshot revisions'
+    task :enqueue => :environment do
+      options = {
+        created_before: ENV['CREATED_BEFORE'] ? Time.parse(ENV['CREATED_BEFORE']) : 1.month.ago,
+        keep_count: ENV.fetch('KEEP_COUNT', 20)
+      }
+
+      Pageflow::AutoSnapshotPruning.dirty_entry_ids(options).each do |entry_id|
+        Resque.enqueue(Pageflow::PruneAutoSnapshotsJob, entry_id, options)
+      end
+    end
+  end
 end

data/spec/factories/entries.rb

@@ -56,6 +56,10 @@ module Pageflow
           create(:revision, :published, entry: entry, password_protected: true)
         end
       end
+
+      trait :with_highdef_video_encoding do
+        feature_states('highdef_video_encoding' => true)
+      end
     end
   end
 end

data/spec/factories/revisions.rb

@@ -18,6 +18,16 @@ module Pageflow
         published_until { 1.day.ago }
       end
 
+      trait :user_snapshot do
+        frozen
+        snapshot_type 'user'
+      end
+
+      trait :auto_snapshot do
+        frozen
+        snapshot_type 'auto'
+      end
+
       trait :with_home_button do
         home_button_enabled true
         home_url 'http://example.com'

data/spec/factories/users.rb

@@ -48,6 +48,12 @@ module Pageflow
 
       trait :admin do
         admin true
+        after(:create) do |user, evaluator|
+          create(:membership,
+                 user: user,
+                 role: :member,
+                 entity: evaluator.on || create(:account))
+        end
       end
 
       trait :suspended do

data/spec/factories/video_files.rb

@@ -47,6 +47,10 @@ module Pageflow
 
       trait :encoded do
       end
+
+      trait :with_highdef_encoding do
+        association :entry, :with_highdef_video_encoding
+      end
     end
   end
 end

data/vendor/assets/javascripts/audio5.min.js

@@ -484,6 +484,9 @@
       this.audio.autoplay = false;
       this.audio.preload = 'auto';
       this.audio.autobuffer = true;
+
+      this.audio.setAttribute('crossorigin', 'anonymous');
+
       this.bindEvents();
     },
     destroyAudio: function(){

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pageflow
 version: !ruby/object:Gem::Version
-  version: 12.0.4
+  version: 12.1.0
 platform: ruby
 authors:
 - Codevise Solutions Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-09 00:00:00.000000000 Z
+date: 2017-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -38,6 +38,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.0.0.pre4
+- !ruby/object:Gem::Dependency
+  name: activeadmin-searchable_select
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: devise-async
   requirement: !ruby/object:Gem::Requirement
@@ -625,19 +639,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.4'
 - !ruby/object:Gem::Dependency
-  name: capybara-webkit
+  name: poltergeist
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 1.15.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 1.15.0
 - !ruby/object:Gem::Dependency
   name: domino
   requirement: !ruby/object:Gem::Requirement
@@ -931,6 +945,8 @@ files:
 - app/assets/images/pageflow/themes/default/player_controls/slim/scroller_mask.png
 - app/assets/images/pageflow/themes/default/player_controls_loading_spinner.png
 - app/assets/images/pageflow/themes/default/player_controls_sprite.png
+- app/assets/images/pageflow/themes/default/preview.png
+- app/assets/images/pageflow/themes/default/preview_thumbnail.png
 - app/assets/images/pageflow/themes/default/text_sprite.png
 - app/assets/images/pageflow/video_controls.png
 - app/assets/images/pageflow/video_pictogram.png
@@ -939,11 +955,14 @@ files:
 - app/assets/javascripts/pageflow/admin.js
 - app/assets/javascripts/pageflow/admin/accounts.js
 - app/assets/javascripts/pageflow/admin/entries.js
+- app/assets/javascripts/pageflow/admin/users.js
 - app/assets/javascripts/pageflow/asset_urls.js.erb
 - app/assets/javascripts/pageflow/audio.js
 - app/assets/javascripts/pageflow/audio/multi_player.js
 - app/assets/javascripts/pageflow/audio/player_pool.js
+- app/assets/javascripts/pageflow/audio_context.js
 - app/assets/javascripts/pageflow/audio_player.js
+- app/assets/javascripts/pageflow/audio_player/get_media_element_method.js
 - app/assets/javascripts/pageflow/audio_player/media_events.js
 - app/assets/javascripts/pageflow/audio_player/null.js
 - app/assets/javascripts/pageflow/audio_player/pause_in_background.js
@@ -978,6 +997,8 @@ files:
 - app/assets/javascripts/pageflow/editor/api/file_types.js
 - app/assets/javascripts/pageflow/editor/api/page_type.js
 - app/assets/javascripts/pageflow/editor/api/page_types.js
+- app/assets/javascripts/pageflow/editor/api/widget_type.js
+- app/assets/javascripts/pageflow/editor/api/widget_types.js
 - app/assets/javascripts/pageflow/editor/base.js
 - app/assets/javascripts/pageflow/editor/collections/chapter_pages_collection.js
 - app/assets/javascripts/pageflow/editor/collections/chapters_collection.js
@@ -995,6 +1016,7 @@ files:
 - app/assets/javascripts/pageflow/editor/collections/storyline_chapters_collection.js
 - app/assets/javascripts/pageflow/editor/collections/storylines_collection.js
 - app/assets/javascripts/pageflow/editor/collections/subset_collection.js
+- app/assets/javascripts/pageflow/editor/collections/themes_collection.js
 - app/assets/javascripts/pageflow/editor/collections/widgets_collection.js
 - app/assets/javascripts/pageflow/editor/controllers/sidebar_controller.js
 - app/assets/javascripts/pageflow/editor/edit_widget.jst.ejs
@@ -1044,7 +1066,6 @@ files:
 - app/assets/javascripts/pageflow/editor/models/mixins/retryable.js
 - app/assets/javascripts/pageflow/editor/models/mixins/stage_provider.js
 - app/assets/javascripts/pageflow/editor/models/mixins/transient_references.js
-- app/assets/javascripts/pageflow/editor/models/mixins/widget_subject.js
 - app/assets/javascripts/pageflow/editor/models/other_entry.js
 - app/assets/javascripts/pageflow/editor/models/page.js
 - app/assets/javascripts/pageflow/editor/models/page_configuration_file_selection_handler.js
@@ -1058,10 +1079,12 @@ files:
 - app/assets/javascripts/pageflow/editor/models/storyline_scaffold.js
 - app/assets/javascripts/pageflow/editor/models/storyline_transitive_child_pages.js
 - app/assets/javascripts/pageflow/editor/models/text_track_file.js
+- app/assets/javascripts/pageflow/editor/models/theme.js
 - app/assets/javascripts/pageflow/editor/models/theming.js
 - app/assets/javascripts/pageflow/editor/models/uploaded_file.js
 - app/assets/javascripts/pageflow/editor/models/video_file.js
 - app/assets/javascripts/pageflow/editor/models/widget.js
+- app/assets/javascripts/pageflow/editor/models/widget_configuration.js
 - app/assets/javascripts/pageflow/editor/routers/sidebar_router.js
 - app/assets/javascripts/pageflow/editor/sync.js
 - app/assets/javascripts/pageflow/editor/templates/back_button_decorator.jst.ejs
@@ -1069,6 +1092,7 @@ files:
 - app/assets/javascripts/pageflow/editor/templates/background_positioning_preview.jst.ejs
 - app/assets/javascripts/pageflow/editor/templates/background_positioning_sliders.jst.ejs
 - app/assets/javascripts/pageflow/editor/templates/blank_entry.jst.ejs
+- app/assets/javascripts/pageflow/editor/templates/change_theme_dialog.jst.ejs
 - app/assets/javascripts/pageflow/editor/templates/chapter_item.jst.ejs
 - app/assets/javascripts/pageflow/editor/templates/confirm_encoding.jst.ejs
 - app/assets/javascripts/pageflow/editor/templates/confirm_upload.jst.ejs
@@ -1119,18 +1143,22 @@ files:
 - app/assets/javascripts/pageflow/editor/templates/page_selection.jst.ejs
 - app/assets/javascripts/pageflow/editor/templates/publish_entry.jst.ejs
 - app/assets/javascripts/pageflow/editor/templates/select_button.jst.ejs
+- app/assets/javascripts/pageflow/editor/templates/static_thumbnail.jst.ejs
 - app/assets/javascripts/pageflow/editor/templates/storyline_outline.jst.ejs
 - app/assets/javascripts/pageflow/editor/templates/storyline_picker.jst.ejs
 - app/assets/javascripts/pageflow/editor/templates/table_cell.jst.ejs
 - app/assets/javascripts/pageflow/editor/templates/text_tracks.jst.ejs
+- app/assets/javascripts/pageflow/editor/templates/theme_item.jst.ejs
 - app/assets/javascripts/pageflow/editor/templates/uploadable_files.jst.ejs
+- app/assets/javascripts/pageflow/editor/templates/widget_item.jst.ejs
 - app/assets/javascripts/pageflow/editor/utils/form_data_utils.js
-- app/assets/javascripts/pageflow/editor/utils/reload_stylesheet.js
+- app/assets/javascripts/pageflow/editor/utils/stylesheet.js
 - app/assets/javascripts/pageflow/editor/views/back_button_decorator_view.js
 - app/assets/javascripts/pageflow/editor/views/background_positioning_preview_view.js
 - app/assets/javascripts/pageflow/editor/views/background_positioning_sliders_view.js
 - app/assets/javascripts/pageflow/editor/views/background_positioning_view.js
 - app/assets/javascripts/pageflow/editor/views/blank_entry_view.js
+- app/assets/javascripts/pageflow/editor/views/change_theme_dialog_view.js
 - app/assets/javascripts/pageflow/editor/views/chapter_item_view.js
 - app/assets/javascripts/pageflow/editor/views/configuration_editors/audio.js
 - app/assets/javascripts/pageflow/editor/views/configuration_editors/background_image.js
@@ -1176,6 +1204,7 @@ files:
 - app/assets/javascripts/pageflow/editor/views/inputs/file_input_view.js
 - app/assets/javascripts/pageflow/editor/views/inputs/page_link_input_view.js
 - app/assets/javascripts/pageflow/editor/views/inputs/reference_input_view.js
+- app/assets/javascripts/pageflow/editor/views/inputs/theme_input_view.js
 - app/assets/javascripts/pageflow/editor/views/list_item_view.js
 - app/assets/javascripts/pageflow/editor/views/list_view.js
 - app/assets/javascripts/pageflow/editor/views/loading_view.js
@@ -1201,13 +1230,16 @@ files:
 - app/assets/javascripts/pageflow/editor/views/publish_entry_view.js
 - app/assets/javascripts/pageflow/editor/views/scrolling_view.js
 - app/assets/javascripts/pageflow/editor/views/select_button_view.js
+- app/assets/javascripts/pageflow/editor/views/static_thumbnail_view.js
 - app/assets/javascripts/pageflow/editor/views/storyline_outline_view.js
 - app/assets/javascripts/pageflow/editor/views/storyline_picker_view.js
 - app/assets/javascripts/pageflow/editor/views/text_file_meta_data_item_value_view.js
 - app/assets/javascripts/pageflow/editor/views/text_tracks_file_meta_data_item_value_view.js
 - app/assets/javascripts/pageflow/editor/views/text_tracks_view.js
+- app/assets/javascripts/pageflow/editor/views/theme_item_view.js
 - app/assets/javascripts/pageflow/editor/views/uploadable_files_view.js
 - app/assets/javascripts/pageflow/editor/views/uploader_view.js
+- app/assets/javascripts/pageflow/editor/views/widget_item_view.js
 - app/assets/javascripts/pageflow/entry_data.js
 - app/assets/javascripts/pageflow/events.js
 - app/assets/javascripts/pageflow/features.js
@@ -1230,6 +1262,9 @@ files:
 - app/assets/javascripts/pageflow/media_player/load_waiting.js
 - app/assets/javascripts/pageflow/media_player/volume_binding.js
 - app/assets/javascripts/pageflow/media_player/volume_fading.js
+- app/assets/javascripts/pageflow/media_player/volume_fading/interval.js
+- app/assets/javascripts/pageflow/media_player/volume_fading/noop.js
+- app/assets/javascripts/pageflow/media_player/volume_fading/web_audio.js
 - app/assets/javascripts/pageflow/multimedia_alert.js
 - app/assets/javascripts/pageflow/native_scrolling.js
 - app/assets/javascripts/pageflow/object.js
@@ -1289,6 +1324,7 @@ files:
 - app/assets/javascripts/pageflow/ui/views/inputs/url_display_view.js
 - app/assets/javascripts/pageflow/ui/views/inputs/url_input_view.js
 - app/assets/javascripts/pageflow/ui/views/mixins/input_view.js
+- app/assets/javascripts/pageflow/ui/views/mixins/input_with_placeholder_text.js
 - app/assets/javascripts/pageflow/ui/views/mixins/subview_container.js
 - app/assets/javascripts/pageflow/ui/views/mixins/tooltip_container.js
 - app/assets/javascripts/pageflow/ui/views/sortable_collection_view.js
@@ -1303,11 +1339,13 @@ files:
 - app/assets/javascripts/pageflow/ui/views/table_view.js
 - app/assets/javascripts/pageflow/ui/views/tabs_view.js
 - app/assets/javascripts/pageflow/ui/views/tooltip_view.js
+- app/assets/javascripts/pageflow/vendor.js
 - app/assets/javascripts/pageflow/video_player.js
 - app/assets/javascripts/pageflow/video_player/buffer_underrun_waiting.js
 - app/assets/javascripts/pageflow/video_player/cue_settings_methods.js
 - app/assets/javascripts/pageflow/video_player/dash.js
 - app/assets/javascripts/pageflow/video_player/filter_sources.js
+- app/assets/javascripts/pageflow/video_player/get_media_element_method.js
 - app/assets/javascripts/pageflow/video_player/lazy.js
 - app/assets/javascripts/pageflow/video_player/media_events.js
 - app/assets/javascripts/pageflow/video_player/prebuffering.js
@@ -1366,6 +1404,7 @@ files:
 - app/assets/stylesheets/pageflow/editor/background_positioning.scss
 - app/assets/stylesheets/pageflow/editor/base.scss
 - app/assets/stylesheets/pageflow/editor/blank_entry.scss
+- app/assets/stylesheets/pageflow/editor/change_theme.scss
 - app/assets/stylesheets/pageflow/editor/colors.scss
 - app/assets/stylesheets/pageflow/editor/confirm_encoding.scss
 - app/assets/stylesheets/pageflow/editor/confirm_upload.scss
@@ -1399,6 +1438,7 @@ files:
 - app/assets/stylesheets/pageflow/editor/publish_entry.scss
 - app/assets/stylesheets/pageflow/editor/quotas.scss
 - app/assets/stylesheets/pageflow/editor/select_button.scss
+- app/assets/stylesheets/pageflow/editor/static_thumbnails.scss
 - app/assets/stylesheets/pageflow/editor/storyline_picker.scss
 - app/assets/stylesheets/pageflow/editor/text_tracks.scss
 - app/assets/stylesheets/pageflow/editor/unsupported_browser_hint.scss
@@ -1457,7 +1497,6 @@ files:
 - app/assets/stylesheets/pageflow/skip_links.scss
 - app/assets/stylesheets/pageflow/slideshow.scss
 - app/assets/stylesheets/pageflow/subshare.scss
-- app/assets/stylesheets/pageflow/text_variants.scss
 - app/assets/stylesheets/pageflow/themes/default.scss
 - app/assets/stylesheets/pageflow/themes/default/README.md
 - app/assets/stylesheets/pageflow/themes/default/anchors.scss
@@ -1477,6 +1516,7 @@ files:
 - app/assets/stylesheets/pageflow/themes/default/indicators/widget_margins.scss
 - app/assets/stylesheets/pageflow/themes/default/loading_spinner.scss
 - app/assets/stylesheets/pageflow/themes/default/logo.scss
+- app/assets/stylesheets/pageflow/themes/default/logo/alignment.scss
 - app/assets/stylesheets/pageflow/themes/default/logo/variant/background_image.scss
 - app/assets/stylesheets/pageflow/themes/default/logo/variant/watermark.scss
 - app/assets/stylesheets/pageflow/themes/default/mixins/cue_margins.scss
@@ -1504,6 +1544,7 @@ files:
 - app/assets/stylesheets/pageflow/themes/default/overview/typography.scss
 - app/assets/stylesheets/pageflow/themes/default/page.scss
 - app/assets/stylesheets/pageflow/themes/default/page/anchors.scss
+- app/assets/stylesheets/pageflow/themes/default/page/line_lengths.scss
 - app/assets/stylesheets/pageflow/themes/default/player_controls.scss
 - app/assets/stylesheets/pageflow/themes/default/player_controls/classic.scss
 - app/assets/stylesheets/pageflow/themes/default/player_controls/classic/close_button.scss
@@ -1602,6 +1643,7 @@ files:
 - app/jobs/pageflow/poll_meta_data_from_zencoder_job.rb
 - app/jobs/pageflow/poll_zencoder_job.rb
 - app/jobs/pageflow/process_file_job.rb
+- app/jobs/pageflow/prune_auto_snapshots_job.rb
 - app/jobs/pageflow/request_meta_data_from_zencoder_job.rb
 - app/jobs/pageflow/submit_file_to_zencoder_job.rb
 - app/jobs/pageflow/upload_file_to_s3_job.rb
@@ -1610,12 +1652,19 @@ files:
 - app/models/concerns/pageflow/feature_target.rb
 - app/models/concerns/pageflow/hosted_file.rb
 - app/models/concerns/pageflow/output_source.rb
+- app/models/concerns/pageflow/serialization_blacklist.rb
+- app/models/concerns/pageflow/serialized_configuration.rb
 - app/models/concerns/pageflow/suspendable.rb
+- app/models/concerns/pageflow/theme_referencer.rb
 - app/models/concerns/pageflow/uploaded_file.rb
 - app/models/pageflow/account.rb
 - app/models/pageflow/account_member_query.rb
+- app/models/pageflow/account_role_query.rb
+- app/models/pageflow/application_query.rb
+- app/models/pageflow/application_record.rb
 - app/models/pageflow/audio_file.rb
 - app/models/pageflow/audio_file_url_templates.rb
+- app/models/pageflow/auto_snapshot_pruning.rb
 - app/models/pageflow/chapter.rb
 - app/models/pageflow/chapter_scaffold.rb
 - app/models/pageflow/cname_theming_request_scope.rb
@@ -1626,6 +1675,7 @@ files:
 - app/models/pageflow/entry_duplicate.rb
 - app/models/pageflow/entry_publication.rb
 - app/models/pageflow/entry_role_query.rb
+- app/models/pageflow/entry_title_or_account_name_query.rb
 - app/models/pageflow/file_reuse.rb
 - app/models/pageflow/file_usage.rb
 - app/models/pageflow/folder.rb
@@ -1634,11 +1684,13 @@ files:
 - app/models/pageflow/image_file_url_templates.rb
 - app/models/pageflow/invitation_form.rb
 - app/models/pageflow/invited_user.rb
+- app/models/pageflow/managed_user_query.rb
 - app/models/pageflow/membership.rb
 - app/models/pageflow/null_user.rb
 - app/models/pageflow/overview_button.rb
 - app/models/pageflow/page.rb
 - app/models/pageflow/positioned_file.rb
+- app/models/pageflow/potential_memberships.rb
 - app/models/pageflow/published_entry.rb
 - app/models/pageflow/revision.rb
 - app/models/pageflow/roles.rb
@@ -1650,6 +1702,7 @@ files:
 - app/models/pageflow/thumbnail_file_resolver.rb
 - app/models/pageflow/url_template.rb
 - app/models/pageflow/used_file.rb
+- app/models/pageflow/user_name_query.rb
 - app/models/pageflow/video_file.rb
 - app/models/pageflow/video_file_url_templates.rb
 - app/models/pageflow/widget.rb
@@ -1669,22 +1722,20 @@ files:
 - app/state_machines/pageflow/image_file_state_machine.rb
 - app/views/admin/accounts/_account_details.html.arb
 - app/views/admin/accounts/_form.html.erb
+- app/views/admin/accounts/_theming_defaults_inline_help.html.erb
 - app/views/admin/accounts/_theming_details.html.arb
-- app/views/admin/accounts/_widgets_inline_help.html.erb
 - app/views/admin/entries/_attributes_table.html.arb
 - app/views/admin/entries/_links.html.arb
 - app/views/admin/features/_form.html.erb
-- app/views/admin/memberships/_entity_account_input.html.erb
-- app/views/admin/memberships/_entity_entry_input.html.erb
 - app/views/admin/memberships/_form.html.erb
 - app/views/admin/memberships/_role_hint.html.arb
 - app/views/admin/revisions/_form.html.erb
 - app/views/admin/users/_form.html.erb
-- app/views/admin/users/_quota_exhausted.html.erb
 - app/views/admin/users/delete_me.html.erb
 - app/views/admin/users/invitation.html.erb
 - app/views/admin/users/me.html.erb
-- app/views/components/pageflow/admin/add_membership_button_if_needed.rb
+- app/views/admin/users/quota_state.html.erb
+- app/views/components/pageflow/admin/add_membership_button.rb
 - app/views/components/pageflow/admin/custom_scopes_renderer.rb
 - app/views/components/pageflow/admin/embed_code_field.rb
 - app/views/components/pageflow/admin/embedded_index_table.rb
@@ -1707,6 +1758,8 @@ files:
 - app/views/layouts/pageflow/application.html.erb
 - app/views/pageflow/admin/users/_cannot_delete.html.erb
 - app/views/pageflow/admin/users/_may_delete.html.erb
+- app/views/pageflow/admin/users/_quota_exhausted.html.erb
+- app/views/pageflow/admin/users/_quota_state.html.erb
 - app/views/pageflow/admin/widgets/_fields.html.erb
 - app/views/pageflow/audio_files/_audio_file.html.erb
 - app/views/pageflow/audio_files/_script_tag.html.erb
@@ -1786,6 +1839,7 @@ files:
 - app/views/pageflow/social_share/_entry_meta_tags.html.erb
 - app/views/pageflow/social_share/_image_tags.html.erb
 - app/views/pageflow/social_share/_page_meta_tags.html.erb
+- app/views/pageflow/themes/_theme.json.jbuilder
 - app/views/pageflow/user_mailer/invitation.html.erb
 - app/views/pageflow/user_mailer/invitation.text.erb
 - app/views/pageflow/video_files/_script_tag.html.erb
@@ -1853,8 +1907,11 @@ files:
 - db/migrate/20161007144500_add_text_track_files.rb
 - db/migrate/20161216175734_move_configuration_from_file_to_file_usage.rb
 - db/migrate/20161230144429_add_processed_attachment_to_text_track_files.rb
+- db/migrate/20170201074328_add_configuration_to_widgets.rb
 - db/migrate/20170222124848_update_video_file_output_presences.rb
+- db/migrate/20170315130000_add_theme_name_to_revisions.rb
 - db/migrate/20170421112300_turn_background_video_pages_into_background_image_pages.rb
+- db/migrate/20170912165050_reset_copied_snapshot_type.rb
 - db/migrate/20170913105048_fix_hls_output_presences_for_legacy_video_files.rb
 - lib/generators/pageflow/active_admin_initializer/active_admin_initializer_generator.rb
 - lib/generators/pageflow/assets/assets_generator.rb
@@ -1892,12 +1949,15 @@ files:
 - lib/generators/pageflow/routes/routes_generator.rb
 - lib/generators/pageflow/seeds/seeds_generator.rb
 - lib/generators/pageflow/seeds/templates/seeds.rb
+- lib/generators/pageflow/theme/templates/preview.png
+- lib/generators/pageflow/theme/templates/preview_thumbnail.png
 - lib/generators/pageflow/theme/templates/themes/%name%.scss.tt
 - lib/generators/pageflow/theme/templates/themes/%name%/variables.scss.tt
 - lib/generators/pageflow/theme/theme_generator.rb
 - lib/generators/pageflow/user/user_generator.rb
 - lib/pageflow.rb
 - lib/pageflow/ability_mixin.rb
+- lib/pageflow/active_admin_can_can_fix.rb
 - lib/pageflow/active_admin_patches/views/attributes_table.rb
 - lib/pageflow/active_admin_patches/views/pages/base.rb
 - lib/pageflow/active_admin_patches/views/table_for.rb
@@ -1910,6 +1970,7 @@ files:
 - lib/pageflow/built_in_widget_type.rb
 - lib/pageflow/built_in_widget_types_plugin.rb
 - lib/pageflow/configuration.rb
+- lib/pageflow/configuration/permissions.rb
 - lib/pageflow/engine.rb
 - lib/pageflow/feature.rb
 - lib/pageflow/features.rb
@@ -1919,6 +1980,7 @@ files:
 - lib/pageflow/help_entries.rb
 - lib/pageflow/help_entry.rb
 - lib/pageflow/hooks.rb
+- lib/pageflow/images/palette.png
 - lib/pageflow/page_type.rb
 - lib/pageflow/page_type_feature.rb
 - lib/pageflow/page_types.rb
@@ -1989,7 +2051,8 @@ files:
 - vendor/assets/javascripts/videojs-dash.js
 - vendor/assets/javascripts/videojs.js
 homepage: http://www.pageflow.io
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -2007,7 +2070,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.0
 signing_key: 
 specification_version: 4
 summary: Multimedia story telling for the web.

data/app/assets/javascripts/pageflow/editor/models/mixins/widget_subject.js

@@ -1,37 +0,0 @@
-pageflow.widgetSubject = {
-  initialize: function() {
-    this.widgets = pageflow.WidgetsCollection.createForSubject(this);
-
-    if (this.autoSaveWidgets) {
-      this.listenTo(this.widgets, 'change:type_name', function() {
-        this.saveWidgets();
-      });
-    }
-  },
-
-  widgetsUrlRoot: function() {
-    return '/editor/subjects/' + this.collectionName + '/' + this.id;
-  },
-
-  fetchWidgets: function() {
-    this.widgets.fetch();
-  },
-
-  saveWidgets: function(options) {
-    var model = this;
-
-    return Backbone.sync('patch', model, _.extend(options || {}, {
-      url: this.widgetsUrlRoot() + '/widgets/batch',
-
-      attrs: {
-        widgets: model.widgets.map(function(widget) {
-          return widget.toJSON();
-        })
-      },
-
-      success: function(response) {
-        model.trigger('sync:widgets', model, response, {});
-      }
-    }));
-  }
-};

data/app/assets/javascripts/pageflow/editor/utils/reload_stylesheet.js

@@ -1,9 +0,0 @@
-pageflow.reloadStylesheet = function(name) {
-  var link = $('head link[data-name=' + name + ']');
-
-  if (!link.data('originalHref')) {
-    link.data('originalHref', link.attr('href'));
-  }
-
-  link.attr('href', link.data('originalHref') + '&reload=' + new Date().getTime());
-};