wagn 1.13.0 → 1.14.0.pre1

data/test/seed.rb

@@ -3,11 +3,6 @@ require 'timecop'
 
 require_dependency 'card'
 
-# following looks like legacy code to me - efm
-#Dir["#{Rails.root}/app/models/card/*.rb"].sort.each do |cardtype|
-#  require_dependency cardtype
-#end
-
 class SharedData
 
   def self.account_args hash
@@ -26,6 +21,8 @@ class SharedData
 
     Card['Joe Admin'].fetch(:trait=>:roles, :new=>{}).items = [ Card::AdministratorID ]
 
+    Card.create! :name=>'signup alert email+*to', :content=>'signups@wagn.org'
+
     # generic, shared attribute card
     color = Card.create! :name=>"color"
     basic = Card.create! :name=>"Basic Card"
@@ -45,8 +42,11 @@ class SharedData
     Card::Auth.createable_types.each do |type|
       next if ['User', 'Sign up', 'Set', 'Number'].include? type
       Card.create! :type=>type, :name=>"Sample #{type}"
+      Card::Auth.current_id = Card::WagnBotID # need to reset after creating sign up, which changes current_id for extend phase
     end
 
+
+
     # data for role_test.rb
 
     Card.create! :name=>"u1", :type_code=>'user', :subcards=>account_args('+*email'=>'u1@user.com', '+*password'=>'u1_pass')
@@ -127,18 +127,19 @@ class SharedData
 
       Card.create! :name=>"John", :type_code=>'user', :subcards=>account_args('+*email'=>'john@user.com', '+*password'=>'john_pass')
       Card.create! :name=>"Sara", :type_code=>'user', :subcards=>account_args('+*email'=>'sara@user.com', '+*password'=>'sara_pass')
-
-      Card.create! :name => "Sara Watching+*watchers",  :content => "[[Sara]]"
-      Card.create! :name => "All Eyes On Me+*watchers", :content => "[[Sara]]\n[[John]]"
-      Card.create! :name => "John Watching", :content => "{{+her}}"
-      Card.create! :name => "John Watching+*watchers",  :content => "[[John]]"
-      Card.create! :name => "John Watching+her"
+      
+      Card.create! :name => "All Eyes On Me"
       Card.create! :name => "No One Sees Me"
-
+      Card.create! :name => "Sara Following"
+      Card.create! :name => "John Following", :content => "{{+her}}"
+      Card.create! :name => "John Following+her"
       Card.create! :name => "Optic", :type => "Cardtype"
-      Card.create! :name => "Optic+*watchers", :content => "[[Sara]]"
       Card.create! :name => "Sunglasses", :type=>"Optic", :content=>"{{+tint}}"
       Card.create! :name => "Sunglasses+tint"
+      Card.create! :name => "Google glass", :type=>"Optic"
+      
+      Card.create! :name => "Sara+*following",  :content => "[[Sara Following]]\n[[All Eyes On Me]]\n[[Optic]]\n[Google glass]"
+      Card.create! :name => "John+*following",  :content => "[[John Following]]\n[[All Eyes On Me]]"      
     end
 
 

data/wagn.gemspec

@@ -38,6 +38,10 @@ Gem::Specification.new do |s|
     [ 'coffee-script','~> 2.2'    ],
     [ 'uglifier',     '~> 2.5'    ],
     
+    [ 'haml',         '~> 4.0.5'  ],
+    [ 'kaminari',     '~> 0.16.1' ],
+    [ 'diffy',        '~> 3.0.6'  ],
+    [ 'diff-lcs',     '~> 1.2.5'  ],
     # should not depend!
     [ 'airbrake',     '~> 3.1'    ] 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wagn
 version: !ruby/object:Gem::Version
-  version: 1.13.0
+  version: 1.14.0.pre1
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-31 00:00:00.000000000 Z
+date: 2014-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -166,6 +166,62 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.5'
+- !ruby/object:Gem::Dependency
+  name: haml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.0.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.0.5
+- !ruby/object:Gem::Dependency
+  name: kaminari
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.16.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.16.1
+- !ruby/object:Gem::Dependency
+  name: diffy
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.6
+- !ruby/object:Gem::Dependency
+  name: diff-lcs
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.5
 - !ruby/object:Gem::Dependency
   name: airbrake
   requirement: !ruby/object:Gem::Requirement
@@ -227,8 +283,10 @@ files:
 - config/samples/cucumber.yml
 - config/version.txt
 - config/version_cards.txt
+- db/bootstrap/card_actions.yml
+- db/bootstrap/card_acts.yml
+- db/bootstrap/card_changes.yml
 - db/bootstrap/card_references.yml
-- db/bootstrap/card_revisions.yml
 - db/bootstrap/cards.yml
 - db/migrate/20110511221913_require_earlier_migrations.rb
 - db/migrate/20120105203350_require_1_8_migrations.rb
@@ -238,6 +296,8 @@ files:
 - db/migrate/20130106052640_table_cleanup.rb
 - db/migrate/20130109015336_trunk_left.rb
 - db/migrate/20130411210957_update_codenames.rb
+- db/migrate/20140822073704_create_new_revision_tables.rb
+- db/migrate/20141001105348_move_revisions_to_actions.rb
 - db/migrate_cards/20130411191151_renaming_for_menu.rb
 - db/migrate_cards/20130411211600_delete_old_related_tab_cards.rb
 - db/migrate_cards/20130419215612_import_help_text.rb
@@ -251,6 +311,7 @@ files:
 - db/migrate_cards/20140307231621_user_data_to_cards.rb
 - db/migrate_cards/20140317035504_account_requests_to_signups.rb
 - db/migrate_cards/20140512155840_add_script_cards.rb
+- db/migrate_cards/20140629222005_add_email_cards.rb
 - db/migrate_cards/20140725180118_config_card_updates.rb
 - db/migrate_cards/data/1.11_help_text.json
 - db/migrate_cards/data/1.12_stylesheets/classic_cards.scss
@@ -258,9 +319,19 @@ files:
 - db/migrate_cards/data/1.12_stylesheets/right_sidebar.scss
 - db/migrate_cards/data/1.12_stylesheets/traditional.scss
 - db/migrate_cards/data/1.13_config_text.json
+- db/migrate_cards/data/mailer/follower_notification_email.html
+- db/migrate_cards/data/mailer/follower_notification_email.txt
+- db/migrate_cards/data/mailer/mail_config.json
+- db/migrate_cards/data/mailer/password_reset_email.html
+- db/migrate_cards/data/mailer/password_reset_email.txt
+- db/migrate_cards/data/mailer/signup_alert_email.html
+- db/migrate_cards/data/mailer/signup_alert_email.txt
+- db/migrate_cards/data/mailer/verification_email.html
+- db/migrate_cards/data/mailer/verification_email.txt
 - db/schema.rb
 - db/seeds.rb
 - features/autonaming.feature
+- features/conflict.feature
 - features/flexmail.feature
 - features/layouts.feature
 - features/navbox.feature
@@ -274,6 +345,7 @@ files:
 - features/step_definitions/email_steps.rb
 - features/step_definitions/wagn_steps.rb
 - features/step_definitions/web_steps.rb
+- features/step_definitions/window_steps.rb
 - features/structure.feature
 - features/support/env.rb
 - features/support/paths.rb
@@ -283,8 +355,11 @@ files:
 - features/update_includers.feature
 - features/watch.feature
 - lib/card.rb
+- lib/card/act.rb
+- lib/card/action.rb
 - lib/card/active_record_ext.rb
 - lib/card/auth.rb
+- lib/card/change.rb
 - lib/card/chunk.rb
 - lib/card/codename.rb
 - lib/card/content.rb
@@ -292,7 +367,6 @@ files:
 - lib/card/diff.rb
 - lib/card/env.rb
 - lib/card/exceptions.rb
-- lib/card/flexmail.rb
 - lib/card/format.rb
 - lib/card/generators/card_migration/USAGE
 - lib/card/generators/card_migration/card_migration_generator.rb
@@ -307,11 +381,6 @@ files:
 - lib/card/generators/set/templates/set_template.erb
 - lib/card/loader.rb
 - lib/card/mailer.rb
-- lib/card/mailer/change_notice.html.erb
-- lib/card/mailer/confirmation_email.html.erb
-- lib/card/mailer/flexmail.html.erb
-- lib/card/mailer/password_reset.html.erb
-- lib/card/mailer/signup_alert.html.erb
 - lib/card/name.rb
 - lib/card/query.rb
 - lib/card/query/card_spec.rb
@@ -319,7 +388,6 @@ files:
 - lib/card/query/spec.rb
 - lib/card/query/value_spec.rb
 - lib/card/reference.rb
-- lib/card/revision.rb
 - lib/card/set.rb
 - lib/card/set_pattern.rb
 - lib/wagn.rb
@@ -368,179 +436,330 @@ files:
 - lib/wagn/generators/wagn/templates/public/robots.txt
 - lib/wagn/generators/wagn/templates/rspec
 - lib/wagn/generators/wagn/templates/script/wagn
+- lib/wagn/generators/wagn/templates/simplecov
+- lib/wagn/generators/wagn/templates/spec/spec_helper.rb
 - lib/wagn/generators/wagn/wagn_generator.rb
 - lib/wagn/location.rb
-- lib/wagn/migration_helper.rb
+- lib/wagn/migration.rb
 - lib/wagn/mods_spec_helper.rb
 - lib/wagn/script_wagn_loader.rb
+- lib/wagn/simplecov_helper.rb
+- lib/wagn/spec_helper.rb
 - lib/wagn/tasks/.gitkeep
 - lib/wagn/tasks/cucumber.rake
 - lib/wagn/tasks/db.rake
 - lib/wagn/tasks/test.rake
 - lib/wagn/tasks/wagn.rake
 - lib/wagn/version.rb
-- lib/wagn/wagn_spec_helper.rb
-- mod/core/chunk/include.rb
-- mod/core/chunk/link.rb
-- mod/core/chunk/literal.rb
-- mod/core/chunk/reference.rb
-- mod/core/chunk/uri.rb
-- mod/core/format/data_format.rb
-- mod/core/format/html_format.rb
-- mod/core/format/text_format.rb
-- mod/core/layout/blank.html
-- mod/core/layout/default.html
-- mod/core/layout/noside.html
-- mod/core/layout/pre.html
-- mod/core/layout/simple.html
-- mod/core/set/all/active_card.rb
-- mod/core/set/all/attribute_tracking.rb
-- mod/core/set/all/collection.rb
-- mod/core/set/all/content.rb
-- mod/core/set/all/fetch.rb
-- mod/core/set/all/initialize.rb
-- mod/core/set/all/name.rb
-- mod/core/set/all/pattern.rb
-- mod/core/set/all/permissions.rb
-- mod/core/set/all/phases.rb
-- mod/core/set/all/references.rb
-- mod/core/set/all/rules.rb
-- mod/core/set/all/states.rb
-- mod/core/set/all/templating.rb
-- mod/core/set/all/tracked_attributes.rb
-- mod/core/set/all/trash.rb
-- mod/core/set/all/type.rb
-- mod/core/set/all/utils.rb
-- mod/core/set/right/structure.rb
-- mod/core/set/type/plain_text.rb
-- mod/core/set_pattern/01_all.rb
-- mod/core/set_pattern/02_all_plus.rb
-- mod/core/set_pattern/03_type.rb
-- mod/core/set_pattern/04_star.rb
-- mod/core/set_pattern/05_rstar.rb
-- mod/core/set_pattern/06_right.rb
-- mod/core/set_pattern/07_type_plus_right.rb
-- mod/core/set_pattern/08_self.rb
-- mod/standard/file/103/icon-6566.ico
-- mod/standard/file/103/large-6566.ico
-- mod/standard/file/103/medium-6566.ico
-- mod/standard/file/103/original-6566.ico
-- mod/standard/file/103/small-6566.ico
-- mod/standard/file/79/icon-6556.png
-- mod/standard/file/79/large-6556.png
-- mod/standard/file/79/medium-6556.png
-- mod/standard/file/79/original-6556.png
-- mod/standard/file/79/small-6556.png
-- mod/standard/file/790/icon-6419.png
-- mod/standard/file/790/large-6419.png
-- mod/standard/file/790/medium-6419.png
-- mod/standard/file/790/original-6419.png
-- mod/standard/file/790/small-6419.png
-- mod/standard/format/css_format.rb
-- mod/standard/format/csv_format.rb
-- mod/standard/format/email_html_format.rb
-- mod/standard/format/file_format.rb
-- mod/standard/format/js_format.rb
-- mod/standard/format/json_format.rb
-- mod/standard/format/rss_format.rb
-- mod/standard/format/xml_format.rb
-- mod/standard/lib/card/machine.rb
-- mod/standard/lib/card/machine_input.rb
-- mod/standard/lib/javascript/html5shiv-printshiv.js
-- mod/standard/lib/javascript/jquery-ui.js
-- mod/standard/lib/javascript/jquery.autosize.js
-- mod/standard/lib/javascript/jquery.fileupload.js
-- mod/standard/lib/javascript/jquery.iframe-transport.js
-- mod/standard/lib/javascript/jquery.js
-- mod/standard/lib/javascript/jquery.ui.autocomplete.html.js
-- mod/standard/lib/javascript/jquery_ujs.js
-- mod/standard/lib/javascript/jquerymobile.js
-- mod/standard/lib/javascript/tinymce.js
-- mod/standard/lib/javascript/wagn.js.coffee
-- mod/standard/lib/javascript/wagn_menu.js
-- mod/standard/lib/javascript/wagn_mod.js.coffee
-- mod/standard/lib/stylesheets/functional.scss
-- mod/standard/lib/stylesheets/jquery-ui-smoothness.css
-- mod/standard/lib/stylesheets/standard.scss
-- mod/standard/set/all/account.rb
-- mod/standard/set/all/all_css.rb
-- mod/standard/set/all/all_csv.rb
-- mod/standard/set/all/attach.rb
-- mod/standard/set/all/base.rb
-- mod/standard/set/all/comment.rb
-- mod/standard/set/all/email_html.rb
-- mod/standard/set/all/event_viz.rb
-- mod/standard/set/all/file.rb
-- mod/standard/set/all/flexmail.rb
-- mod/standard/set/all/follow.rb
-- mod/standard/set/all/history.rb
-- mod/standard/set/all/json.rb
-- mod/standard/set/all/rich_html.rb
-- mod/standard/set/all/rss.rb
-- mod/standard/set/all/text.rb
-- mod/standard/set/right/account.rb
-- mod/standard/set/right/add_help.rb
-- mod/standard/set/right/comment.rb
-- mod/standard/set/right/create.rb
-- mod/standard/set/right/default.rb
-- mod/standard/set/right/delete.rb
-- mod/standard/set/right/email.rb
-- mod/standard/set/right/help.rb
-- mod/standard/set/right/machine_output.rb
-- mod/standard/set/right/password.rb
-- mod/standard/set/right/read.rb
-- mod/standard/set/right/salt.rb
-- mod/standard/set/right/script.rb
-- mod/standard/set/right/stats.rb
-- mod/standard/set/right/status.rb
-- mod/standard/set/right/style.rb
-- mod/standard/set/right/token.rb
-- mod/standard/set/right/update.rb
-- mod/standard/set/right/when_created.rb
-- mod/standard/set/right/when_last_edited.rb
-- mod/standard/set/rstar/rules.rb
-- mod/standard/set/self/account_links.rb
-- mod/standard/set/self/alerts.rb
-- mod/standard/set/self/all.rb
-- mod/standard/set/self/foot.rb
-- mod/standard/set/self/head.rb
-- mod/standard/set/self/navbox.rb
-- mod/standard/set/self/now.rb
-- mod/standard/set/self/recent.rb
-- mod/standard/set/self/script_card_menu.rb
-- mod/standard/set/self/script_html5shiv_printshiv.rb
-- mod/standard/set/self/script_jquery.rb
-- mod/standard/set/self/script_jquery_helper.rb
-- mod/standard/set/self/script_slot.rb
-- mod/standard/set/self/script_tinymce.rb
-- mod/standard/set/self/search.rb
-- mod/standard/set/self/signin.rb
-- mod/standard/set/self/stats.rb
-- mod/standard/set/self/style_functional.rb
-- mod/standard/set/self/style_jquery_ui_smoothness.rb
-- mod/standard/set/self/style_standard.rb
-- mod/standard/set/self/version.rb
-- mod/standard/set/type/basic.rb
-- mod/standard/set/type/cardtype.rb
-- mod/standard/set/type/coffee_script.rb
-- mod/standard/set/type/css.rb
-- mod/standard/set/type/date.rb
-- mod/standard/set/type/file.rb
-- mod/standard/set/type/html.rb
-- mod/standard/set/type/image.rb
-- mod/standard/set/type/java_script.rb
-- mod/standard/set/type/layout_type.rb
-- mod/standard/set/type/number.rb
-- mod/standard/set/type/phrase.rb
-- mod/standard/set/type/pointer.rb
-- mod/standard/set/type/scss.rb
-- mod/standard/set/type/search_type.rb
-- mod/standard/set/type/set.rb
-- mod/standard/set/type/setting.rb
-- mod/standard/set/type/signup.rb
-- mod/standard/set/type/skin.rb
-- mod/standard/set/type/toggle.rb
-- mod/standard/set/type/user.rb
+- mod/01_core/chunk/include.rb
+- mod/01_core/chunk/link.rb
+- mod/01_core/chunk/literal.rb
+- mod/01_core/chunk/reference.rb
+- mod/01_core/chunk/uri.rb
+- mod/01_core/format/data_format.rb
+- mod/01_core/format/html_format.rb
+- mod/01_core/format/text_format.rb
+- mod/01_core/layout/blank.html
+- mod/01_core/layout/default.html
+- mod/01_core/layout/noside.html
+- mod/01_core/layout/pre.html
+- mod/01_core/layout/simple.html
+- mod/01_core/set/all/active_card.rb
+- mod/01_core/set/all/collection.rb
+- mod/01_core/set/all/content.rb
+- mod/01_core/set/all/erb.rb
+- mod/01_core/set/all/fetch.rb
+- mod/01_core/set/all/haml.rb
+- mod/01_core/set/all/initialize.rb
+- mod/01_core/set/all/name.rb
+- mod/01_core/set/all/notify.rb
+- mod/01_core/set/all/pattern.rb
+- mod/01_core/set/all/permissions.rb
+- mod/01_core/set/all/phases.rb
+- mod/01_core/set/all/references.rb
+- mod/01_core/set/all/rules.rb
+- mod/01_core/set/all/states.rb
+- mod/01_core/set/all/templating.rb
+- mod/01_core/set/all/tracked_attributes.rb
+- mod/01_core/set/all/trash.rb
+- mod/01_core/set/all/type.rb
+- mod/01_core/set/all/utils.rb
+- mod/01_core/set_pattern/01_all.rb
+- mod/01_core/set_pattern/02_all_plus.rb
+- mod/01_core/set_pattern/03_type.rb
+- mod/01_core/set_pattern/04_star.rb
+- mod/01_core/set_pattern/05_rstar.rb
+- mod/01_core/set_pattern/06_right.rb
+- mod/01_core/set_pattern/07_type_plus_right.rb
+- mod/01_core/set_pattern/08_self.rb
+- mod/01_core/spec/chunk/literal_spec.rb
+- mod/01_core/spec/chunk/uri_spec.rb
+- mod/01_core/spec/format/data_format_spec.rb
+- mod/01_core/spec/format/html_format_spec.rb
+- mod/01_core/spec/format/text_format_spec.rb
+- mod/01_core/spec/set/all/active_card_spec.rb
+- mod/01_core/spec/set/all/attribute_tracking_spec.rb
+- mod/01_core/spec/set/all/collection_spec.rb
+- mod/01_core/spec/set/all/content_spec.rb
+- mod/01_core/spec/set/all/fetch_spec.rb
+- mod/01_core/spec/set/all/initialize_spec.rb
+- mod/01_core/spec/set/all/name_spec.rb
+- mod/01_core/spec/set/all/notify_spec.rb
+- mod/01_core/spec/set/all/pattern_spec.rb
+- mod/01_core/spec/set/all/permissions_spec.rb
+- mod/01_core/spec/set/all/phases_spec.rb
+- mod/01_core/spec/set/all/references_spec.rb
+- mod/01_core/spec/set/all/rules2_spec.rb
+- mod/01_core/spec/set/all/rules_spec.rb
+- mod/01_core/spec/set/all/states_spec.rb
+- mod/01_core/spec/set/all/templating_spec.rb
+- mod/01_core/spec/set/all/tracked_attributes_spec.rb
+- mod/01_core/spec/set/all/trash_spec.rb
+- mod/01_core/spec/set/all/type_spec.rb
+- mod/01_core/spec/set/all/utils_spec.rb
+- mod/02_basic_types/set/type/plain_text.rb
+- mod/02_basic_types/set/type/pointer.rb
+- mod/02_basic_types/spec/set/plain_text_spec.rb
+- mod/02_basic_types/spec/set/pointer_spec.rb
+- mod/03_machines/lib/card/machine.rb
+- mod/03_machines/lib/card/machine_input.rb
+- mod/03_machines/lib/javascript/html5shiv-printshiv.js
+- mod/03_machines/lib/javascript/jquery-ui.js
+- mod/03_machines/lib/javascript/jquery.autosize.js
+- mod/03_machines/lib/javascript/jquery.fileupload.js
+- mod/03_machines/lib/javascript/jquery.iframe-transport.js
+- mod/03_machines/lib/javascript/jquery.js
+- mod/03_machines/lib/javascript/jquery.ui.autocomplete.html.js
+- mod/03_machines/lib/javascript/jquery_ujs.js
+- mod/03_machines/lib/javascript/jquerymobile.js
+- mod/03_machines/lib/javascript/tinymce.js
+- mod/03_machines/lib/javascript/wagn.js.coffee
+- mod/03_machines/lib/javascript/wagn_menu.js
+- mod/03_machines/lib/javascript/wagn_mod.js.coffee
+- mod/03_machines/lib/stylesheets/functional.scss
+- mod/03_machines/lib/stylesheets/jquery-ui-smoothness.css
+- mod/03_machines/lib/stylesheets/standard.scss
+- mod/03_machines/set/right/machine_output.rb
+- mod/03_machines/set/self/script_card_menu.rb
+- mod/03_machines/set/self/script_html5shiv_printshiv.rb
+- mod/03_machines/set/self/script_jquery.rb
+- mod/03_machines/set/self/script_jquery_helper.rb
+- mod/03_machines/set/self/script_slot.rb
+- mod/03_machines/set/self/script_tinymce.rb
+- mod/03_machines/set/self/style_functional.rb
+- mod/03_machines/set/self/style_jquery_ui_smoothness.rb
+- mod/03_machines/set/self/style_standard.rb
+- mod/03_machines/set/type/coffee_script.rb
+- mod/03_machines/set/type/css.rb
+- mod/03_machines/set/type/java_script.rb
+- mod/03_machines/set/type/scss.rb
+- mod/03_machines/set/type/skin.rb
+- mod/03_machines/spec/lib/machine_input_spec.rb
+- mod/03_machines/spec/lib/machine_spec.rb
+- mod/03_machines/spec/set/right/machine_output_spec.rb
+- mod/03_machines/spec/set/self/style_functional_spec.rb
+- mod/03_machines/spec/set/self/style_jquery_ui_smoothness_spec.rb
+- mod/03_machines/spec/set/self/style_standard_spec.rb
+- mod/03_machines/spec/set/type/coffeescript_spec.rb
+- mod/03_machines/spec/set/type/css_spec.rb
+- mod/03_machines/spec/set/type/javascript_spec.rb
+- mod/03_machines/spec/set/type/scss_spec.rb
+- mod/03_machines/spec/set/type/skin_spec.rb
+- mod/04_settings/lib/card/setting.rb
+- mod/04_settings/set/right/add_help.rb
+- mod/04_settings/set/right/comment.rb
+- mod/04_settings/set/right/create.rb
+- mod/04_settings/set/right/default.rb
+- mod/04_settings/set/right/delete.rb
+- mod/04_settings/set/right/help.rb
+- mod/04_settings/set/right/read.rb
+- mod/04_settings/set/right/script.rb
+- mod/04_settings/set/right/structure.rb
+- mod/04_settings/set/right/style.rb
+- mod/04_settings/set/right/update.rb
+- mod/04_settings/set/self/accountable.rb
+- mod/04_settings/set/self/add_help.rb
+- mod/04_settings/set/self/autoname.rb
+- mod/04_settings/set/self/captcha.rb
+- mod/04_settings/set/self/comment.rb
+- mod/04_settings/set/self/create.rb
+- mod/04_settings/set/self/default.rb
+- mod/04_settings/set/self/delete.rb
+- mod/04_settings/set/self/help.rb
+- mod/04_settings/set/self/input.rb
+- mod/04_settings/set/self/layout.rb
+- mod/04_settings/set/self/on_create.rb
+- mod/04_settings/set/self/on_delete.rb
+- mod/04_settings/set/self/on_update.rb
+- mod/04_settings/set/self/options.rb
+- mod/04_settings/set/self/options_label.rb
+- mod/04_settings/set/self/read.rb
+- mod/04_settings/set/self/script.rb
+- mod/04_settings/set/self/structure.rb
+- mod/04_settings/set/self/style.rb
+- mod/04_settings/set/self/table_of_contents.rb
+- mod/04_settings/set/self/thanks.rb
+- mod/04_settings/set/self/update.rb
+- mod/04_settings/set/type/setting.rb
+- mod/04_settings/spec/set/right/add_help_spec.rb
+- mod/04_settings/spec/set/right/comment_spec.rb
+- mod/04_settings/spec/set/right/create_spec.rb
+- mod/04_settings/spec/set/right/default_spec.rb
+- mod/04_settings/spec/set/right/delete_spec.rb
+- mod/04_settings/spec/set/right/help_spec.rb
+- mod/04_settings/spec/set/right/read_spec.rb
+- mod/04_settings/spec/set/right/script_spec.rb
+- mod/04_settings/spec/set/right/structure_spec.rb
+- mod/04_settings/spec/set/right/style_spec.rb
+- mod/04_settings/spec/set/right/update_spec.rb
+- mod/04_settings/spec/set/type/setting_spec.rb
+- mod/05_standard/file/103/icon-6566.ico
+- mod/05_standard/file/103/large-6566.ico
+- mod/05_standard/file/103/medium-6566.ico
+- mod/05_standard/file/103/original-6566.ico
+- mod/05_standard/file/103/small-6566.ico
+- mod/05_standard/file/79/icon-6556.png
+- mod/05_standard/file/79/large-6556.png
+- mod/05_standard/file/79/medium-6556.png
+- mod/05_standard/file/79/original-6556.png
+- mod/05_standard/file/79/small-6556.png
+- mod/05_standard/file/790/icon-6419.png
+- mod/05_standard/file/790/large-6419.png
+- mod/05_standard/file/790/medium-6419.png
+- mod/05_standard/file/790/original-6419.png
+- mod/05_standard/file/790/small-6419.png
+- mod/05_standard/format/css_format.rb
+- mod/05_standard/format/csv_format.rb
+- mod/05_standard/format/file_format.rb
+- mod/05_standard/format/js_format.rb
+- mod/05_standard/format/json_format.rb
+- mod/05_standard/format/rss_format.rb
+- mod/05_standard/format/xml_format.rb
+- mod/05_standard/set/all/account.rb
+- mod/05_standard/set/all/all_css.rb
+- mod/05_standard/set/all/all_csv.rb
+- mod/05_standard/set/all/all_js.rb
+- mod/05_standard/set/all/attach.rb
+- mod/05_standard/set/all/base.rb
+- mod/05_standard/set/all/comment.rb
+- mod/05_standard/set/all/event_viz.rb
+- mod/05_standard/set/all/file.rb
+- mod/05_standard/set/all/follow.rb
+- mod/05_standard/set/all/history.rb
+- mod/05_standard/set/all/json.rb
+- mod/05_standard/set/all/observer.rb
+- mod/05_standard/set/all/rich_html.rb
+- mod/05_standard/set/all/rss.rb
+- mod/05_standard/set/all/text.rb
+- mod/05_standard/set/right/account.rb
+- mod/05_standard/set/right/email.rb
+- mod/05_standard/set/right/password.rb
+- mod/05_standard/set/right/salt.rb
+- mod/05_standard/set/right/stats.rb
+- mod/05_standard/set/right/status.rb
+- mod/05_standard/set/right/token.rb
+- mod/05_standard/set/right/when_created.rb
+- mod/05_standard/set/right/when_last_edited.rb
+- mod/05_standard/set/rstar/rules.rb
+- mod/05_standard/set/self/account_links.rb
+- mod/05_standard/set/self/alerts.rb
+- mod/05_standard/set/self/all.rb
+- mod/05_standard/set/self/foot.rb
+- mod/05_standard/set/self/head.rb
+- mod/05_standard/set/self/navbox.rb
+- mod/05_standard/set/self/now.rb
+- mod/05_standard/set/self/recent.rb
+- mod/05_standard/set/self/search.rb
+- mod/05_standard/set/self/signin.rb
+- mod/05_standard/set/self/stats.rb
+- mod/05_standard/set/self/version.rb
+- mod/05_standard/set/type/basic.rb
+- mod/05_standard/set/type/cardtype.rb
+- mod/05_standard/set/type/date.rb
+- mod/05_standard/set/type/file.rb
+- mod/05_standard/set/type/html.rb
+- mod/05_standard/set/type/image.rb
+- mod/05_standard/set/type/layout_type.rb
+- mod/05_standard/set/type/number.rb
+- mod/05_standard/set/type/phrase.rb
+- mod/05_standard/set/type/search_type.rb
+- mod/05_standard/set/type/set.rb
+- mod/05_standard/set/type/signup.rb
+- mod/05_standard/set/type/toggle.rb
+- mod/05_standard/set/type/user.rb
+- mod/05_standard/spec/chunk/include_spec.rb
+- mod/05_standard/spec/chunk/link_spec.rb
+- mod/05_standard/spec/format/css_format_spec.rb
+- mod/05_standard/spec/format/csv_format_spec.rb
+- mod/05_standard/spec/format/email_html_format_spec.rb
+- mod/05_standard/spec/format/file_format_spec.rb
+- mod/05_standard/spec/format/js_format_spec.rb
+- mod/05_standard/spec/format/json_format_spec.rb
+- mod/05_standard/spec/format/rss_format_spec.rb
+- mod/05_standard/spec/format/xml_format_spec.rb
+- mod/05_standard/spec/set/all/account_spec.rb
+- mod/05_standard/spec/set/all/all_css_spec.rb
+- mod/05_standard/spec/set/all/all_csv_spec.rb
+- mod/05_standard/spec/set/all/attach_spec.rb
+- mod/05_standard/spec/set/all/base_spec.rb
+- mod/05_standard/spec/set/all/comment_spec.rb
+- mod/05_standard/spec/set/all/email_html_spec.rb
+- mod/05_standard/spec/set/all/event_viz_spec.rb
+- mod/05_standard/spec/set/all/file_spec.rb
+- mod/05_standard/spec/set/all/follow_spec.rb
+- mod/05_standard/spec/set/all/history_spec.rb
+- mod/05_standard/spec/set/all/json_spec.rb
+- mod/05_standard/spec/set/all/observer_spec.rb
+- mod/05_standard/spec/set/all/rich_html_spec.rb
+- mod/05_standard/spec/set/all/rss_spec.rb
+- mod/05_standard/spec/set/all/text_spec.rb
+- mod/05_standard/spec/set/right/account_spec.rb
+- mod/05_standard/spec/set/right/email_spec.rb
+- mod/05_standard/spec/set/right/password_spec.rb
+- mod/05_standard/spec/set/right/salt_spec.rb
+- mod/05_standard/spec/set/right/stats_spec.rb
+- mod/05_standard/spec/set/right/status_spec.rb
+- mod/05_standard/spec/set/right/token_spec.rb
+- mod/05_standard/spec/set/right/when_created_spec.rb
+- mod/05_standard/spec/set/right/when_last_edited_spec.rb
+- mod/05_standard/spec/set/rstar/rules_spec.rb
+- mod/05_standard/spec/set/self/account_links_spec.rb
+- mod/05_standard/spec/set/self/alerts_spec.rb
+- mod/05_standard/spec/set/self/all_spec.rb
+- mod/05_standard/spec/set/self/foot_spec.rb
+- mod/05_standard/spec/set/self/head_spec.rb
+- mod/05_standard/spec/set/self/navbox_spec.rb
+- mod/05_standard/spec/set/self/now_spec.rb
+- mod/05_standard/spec/set/self/recent_spec.rb
+- mod/05_standard/spec/set/self/search_spec.rb
+- mod/05_standard/spec/set/self/signin_spec.rb
+- mod/05_standard/spec/set/self/stats_spec.rb
+- mod/05_standard/spec/set/self/version_spec.rb
+- mod/05_standard/spec/set/type/basic_spec.rb
+- mod/05_standard/spec/set/type/cardtype_spec.rb
+- mod/05_standard/spec/set/type/date_spec.rb
+- mod/05_standard/spec/set/type/email_template_spec.rb
+- mod/05_standard/spec/set/type/file_spec.rb
+- mod/05_standard/spec/set/type/html_spec.rb
+- mod/05_standard/spec/set/type/image_spec.rb
+- mod/05_standard/spec/set/type/layout_type_spec.rb
+- mod/05_standard/spec/set/type/number_spec.rb
+- mod/05_standard/spec/set/type/phrase_spec.rb
+- mod/05_standard/spec/set/type/search_type_spec.rb
+- mod/05_standard/spec/set/type/set_spec.rb
+- mod/05_standard/spec/set/type/signup_spec.rb
+- mod/05_standard/spec/set/type/toggle_spec.rb
+- mod/05_standard/spec/set/type/user_spec.rb
+- mod/06_email/format/email_html_format.rb
+- mod/06_email/format/email_text_format.rb
+- mod/06_email/set/all/email_html.rb
+- mod/06_email/set/all/email_text.rb
+- mod/06_email/set/right/bcc.rb
+- mod/06_email/set/right/cc.rb
+- mod/06_email/set/right/from.rb
+- mod/06_email/set/right/html_message.rb
+- mod/06_email/set/right/to.rb
+- mod/06_email/set/type/email_template.rb
 - public/assets/body-bg-660b752b44b87594071f3d0851ac5360.png
 - public/assets/body-bg-d031f29b6ba7399a6862382c3552f44c.bmp
 - public/assets/body-bg.bmp
@@ -1083,133 +1302,21 @@ files:
 - spec/javascripts/support/jasmine_config.rb
 - spec/javascripts/support/jasmine_runner.rb
 - spec/javascripts/wagn_spec.coffee
+- spec/lib/card/action_spec.rb
 - spec/lib/card/auth_spec.rb
 - spec/lib/card/chunk_spec.rb
 - spec/lib/card/codename_spec.rb
 - spec/lib/card/content_spec.rb
 - spec/lib/card/diff_spec.rb
-- spec/lib/card/flexmail_spec.rb
 - spec/lib/card/format_spec.rb
 - spec/lib/card/loader_spec.rb
 - spec/lib/card/name_spec.rb
 - spec/lib/card/query_spec.rb
 - spec/lib/card/reference_spec.rb
-- spec/lib/card/revision_spec.rb
 - spec/lib/card/set_pattern_spec.rb
 - spec/lib/card/set_spec.rb
 - spec/lib/wagn/cache_spec.rb
 - spec/mailers/mailer_spec.rb
-- spec/mod/core/chunk/literal_spec.rb
-- spec/mod/core/chunk/uri_spec.rb
-- spec/mod/core/format/data_format_spec.rb
-- spec/mod/core/format/html_format_spec.rb
-- spec/mod/core/format/text_format_spec.rb
-- spec/mod/core/set/all/active_card_spec.rb
-- spec/mod/core/set/all/attribute_tracking_spec.rb
-- spec/mod/core/set/all/collection_spec.rb
-- spec/mod/core/set/all/content_spec.rb
-- spec/mod/core/set/all/fetch_spec.rb
-- spec/mod/core/set/all/initialize_spec.rb
-- spec/mod/core/set/all/name_spec.rb
-- spec/mod/core/set/all/pattern_spec.rb
-- spec/mod/core/set/all/permissions_spec.rb
-- spec/mod/core/set/all/phases_spec.rb
-- spec/mod/core/set/all/references_spec.rb
-- spec/mod/core/set/all/rules2_spec.rb
-- spec/mod/core/set/all/rules_spec.rb
-- spec/mod/core/set/all/states_spec.rb
-- spec/mod/core/set/all/templating_spec.rb
-- spec/mod/core/set/all/tracked_attributes_spec.rb
-- spec/mod/core/set/all/trash_spec.rb
-- spec/mod/core/set/all/type_spec.rb
-- spec/mod/core/set/all/utils_spec.rb
-- spec/mod/standard/chunk/include_spec.rb
-- spec/mod/standard/chunk/link_spec.rb
-- spec/mod/standard/format/css_format_spec.rb
-- spec/mod/standard/format/csv_format_spec.rb
-- spec/mod/standard/format/email_html_format_spec.rb
-- spec/mod/standard/format/file_format_spec.rb
-- spec/mod/standard/format/js_format_spec.rb
-- spec/mod/standard/format/json_format_spec.rb
-- spec/mod/standard/format/rss_format_spec.rb
-- spec/mod/standard/format/xml_format_spec.rb
-- spec/mod/standard/lib/machine_input_spec.rb
-- spec/mod/standard/lib/machine_spec.rb
-- spec/mod/standard/set/all/account_spec.rb
-- spec/mod/standard/set/all/all_css_spec.rb
-- spec/mod/standard/set/all/all_csv_spec.rb
-- spec/mod/standard/set/all/attach_spec.rb
-- spec/mod/standard/set/all/base_spec.rb
-- spec/mod/standard/set/all/comment_spec.rb
-- spec/mod/standard/set/all/email_html_spec.rb
-- spec/mod/standard/set/all/event_viz_spec.rb
-- spec/mod/standard/set/all/file_spec.rb
-- spec/mod/standard/set/all/flexmail_spec.rb
-- spec/mod/standard/set/all/follow_spec.rb
-- spec/mod/standard/set/all/history_spec.rb
-- spec/mod/standard/set/all/json_spec.rb
-- spec/mod/standard/set/all/rich_html_spec.rb
-- spec/mod/standard/set/all/rss_spec.rb
-- spec/mod/standard/set/all/text_spec.rb
-- spec/mod/standard/set/right/account_spec.rb
-- spec/mod/standard/set/right/add_help_spec.rb
-- spec/mod/standard/set/right/comment_spec.rb
-- spec/mod/standard/set/right/create_spec.rb
-- spec/mod/standard/set/right/default_spec.rb
-- spec/mod/standard/set/right/delete_spec.rb
-- spec/mod/standard/set/right/email_spec.rb
-- spec/mod/standard/set/right/help_spec.rb
-- spec/mod/standard/set/right/machine_output_spec.rb
-- spec/mod/standard/set/right/password_spec.rb
-- spec/mod/standard/set/right/read_spec.rb
-- spec/mod/standard/set/right/salt_spec.rb
-- spec/mod/standard/set/right/script_spec.rb
-- spec/mod/standard/set/right/stats_spec.rb
-- spec/mod/standard/set/right/status_spec.rb
-- spec/mod/standard/set/right/structure_spec.rb
-- spec/mod/standard/set/right/style_spec.rb
-- spec/mod/standard/set/right/token_spec.rb
-- spec/mod/standard/set/right/update_spec.rb
-- spec/mod/standard/set/right/when_created_spec.rb
-- spec/mod/standard/set/right/when_last_edited_spec.rb
-- spec/mod/standard/set/rstar/rules_spec.rb
-- spec/mod/standard/set/self/account_links_spec.rb
-- spec/mod/standard/set/self/alerts_spec.rb
-- spec/mod/standard/set/self/all_spec.rb
-- spec/mod/standard/set/self/foot_spec.rb
-- spec/mod/standard/set/self/head_spec.rb
-- spec/mod/standard/set/self/navbox_spec.rb
-- spec/mod/standard/set/self/now_spec.rb
-- spec/mod/standard/set/self/recent_spec.rb
-- spec/mod/standard/set/self/search_spec.rb
-- spec/mod/standard/set/self/signin_spec.rb
-- spec/mod/standard/set/self/stats_spec.rb
-- spec/mod/standard/set/self/style_functional_spec.rb
-- spec/mod/standard/set/self/style_jquery_ui_smoothness_spec.rb
-- spec/mod/standard/set/self/style_standard_spec.rb
-- spec/mod/standard/set/self/version_spec.rb
-- spec/mod/standard/set/type/basic_spec.rb
-- spec/mod/standard/set/type/cardtype_spec.rb
-- spec/mod/standard/set/type/coffeescript_spec.rb
-- spec/mod/standard/set/type/css_spec.rb
-- spec/mod/standard/set/type/date_spec.rb
-- spec/mod/standard/set/type/file_spec.rb
-- spec/mod/standard/set/type/html_spec.rb
-- spec/mod/standard/set/type/image_spec.rb
-- spec/mod/standard/set/type/javascript_spec.rb
-- spec/mod/standard/set/type/layout_type_spec.rb
-- spec/mod/standard/set/type/number_spec.rb
-- spec/mod/standard/set/type/phrase_spec.rb
-- spec/mod/standard/set/type/plain_text_spec.rb
-- spec/mod/standard/set/type/pointer_spec.rb
-- spec/mod/standard/set/type/scss_spec.rb
-- spec/mod/standard/set/type/search_type_spec.rb
-- spec/mod/standard/set/type/set_spec.rb
-- spec/mod/standard/set/type/setting_spec.rb
-- spec/mod/standard/set/type/signup_spec.rb
-- spec/mod/standard/set/type/skin_spec.rb
-- spec/mod/standard/set/type/toggle_spec.rb
-- spec/mod/standard/set/type/user_spec.rb
 - spec/models/card/cardtype_spec.rb
 - spec/models/card/create_spec.rb
 - spec/models/card/trash_spec.rb
@@ -1219,8 +1326,10 @@ files:
 - spec/spec_helper.rb
 - test/1.10.0-data-dump.sql
 - test/fixtures/.gitkeep
+- test/fixtures/card_actions.yml
+- test/fixtures/card_acts.yml
+- test/fixtures/card_changes.yml
 - test/fixtures/card_references.yml
-- test/fixtures/card_revisions.yml
 - test/fixtures/cards.yml
 - test/fixtures/mao2.jpg
 - test/fixtures/rails.gif
@@ -1246,9 +1355,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.3
@@ -1257,6 +1366,7 @@ specification_version: 4
 summary: structured wiki web platform
 test_files:
 - features/autonaming.feature
+- features/conflict.feature
 - features/flexmail.feature
 - features/layouts.feature
 - features/navbox.feature
@@ -1270,6 +1380,7 @@ test_files:
 - features/step_definitions/email_steps.rb
 - features/step_definitions/wagn_steps.rb
 - features/step_definitions/web_steps.rb
+- features/step_definitions/window_steps.rb
 - features/structure.feature
 - features/support/env.rb
 - features/support/paths.rb
@@ -1287,133 +1398,21 @@ test_files:
 - spec/javascripts/support/jasmine_config.rb
 - spec/javascripts/support/jasmine_runner.rb
 - spec/javascripts/wagn_spec.coffee
+- spec/lib/card/action_spec.rb
 - spec/lib/card/auth_spec.rb
 - spec/lib/card/chunk_spec.rb
 - spec/lib/card/codename_spec.rb
 - spec/lib/card/content_spec.rb
 - spec/lib/card/diff_spec.rb
-- spec/lib/card/flexmail_spec.rb
 - spec/lib/card/format_spec.rb
 - spec/lib/card/loader_spec.rb
 - spec/lib/card/name_spec.rb
 - spec/lib/card/query_spec.rb
 - spec/lib/card/reference_spec.rb
-- spec/lib/card/revision_spec.rb
 - spec/lib/card/set_pattern_spec.rb
 - spec/lib/card/set_spec.rb
 - spec/lib/wagn/cache_spec.rb
 - spec/mailers/mailer_spec.rb
-- spec/mod/core/chunk/literal_spec.rb
-- spec/mod/core/chunk/uri_spec.rb
-- spec/mod/core/format/data_format_spec.rb
-- spec/mod/core/format/html_format_spec.rb
-- spec/mod/core/format/text_format_spec.rb
-- spec/mod/core/set/all/active_card_spec.rb
-- spec/mod/core/set/all/attribute_tracking_spec.rb
-- spec/mod/core/set/all/collection_spec.rb
-- spec/mod/core/set/all/content_spec.rb
-- spec/mod/core/set/all/fetch_spec.rb
-- spec/mod/core/set/all/initialize_spec.rb
-- spec/mod/core/set/all/name_spec.rb
-- spec/mod/core/set/all/pattern_spec.rb
-- spec/mod/core/set/all/permissions_spec.rb
-- spec/mod/core/set/all/phases_spec.rb
-- spec/mod/core/set/all/references_spec.rb
-- spec/mod/core/set/all/rules2_spec.rb
-- spec/mod/core/set/all/rules_spec.rb
-- spec/mod/core/set/all/states_spec.rb
-- spec/mod/core/set/all/templating_spec.rb
-- spec/mod/core/set/all/tracked_attributes_spec.rb
-- spec/mod/core/set/all/trash_spec.rb
-- spec/mod/core/set/all/type_spec.rb
-- spec/mod/core/set/all/utils_spec.rb
-- spec/mod/standard/chunk/include_spec.rb
-- spec/mod/standard/chunk/link_spec.rb
-- spec/mod/standard/format/css_format_spec.rb
-- spec/mod/standard/format/csv_format_spec.rb
-- spec/mod/standard/format/email_html_format_spec.rb
-- spec/mod/standard/format/file_format_spec.rb
-- spec/mod/standard/format/js_format_spec.rb
-- spec/mod/standard/format/json_format_spec.rb
-- spec/mod/standard/format/rss_format_spec.rb
-- spec/mod/standard/format/xml_format_spec.rb
-- spec/mod/standard/lib/machine_input_spec.rb
-- spec/mod/standard/lib/machine_spec.rb
-- spec/mod/standard/set/all/account_spec.rb
-- spec/mod/standard/set/all/all_css_spec.rb
-- spec/mod/standard/set/all/all_csv_spec.rb
-- spec/mod/standard/set/all/attach_spec.rb
-- spec/mod/standard/set/all/base_spec.rb
-- spec/mod/standard/set/all/comment_spec.rb
-- spec/mod/standard/set/all/email_html_spec.rb
-- spec/mod/standard/set/all/event_viz_spec.rb
-- spec/mod/standard/set/all/file_spec.rb
-- spec/mod/standard/set/all/flexmail_spec.rb
-- spec/mod/standard/set/all/follow_spec.rb
-- spec/mod/standard/set/all/history_spec.rb
-- spec/mod/standard/set/all/json_spec.rb
-- spec/mod/standard/set/all/rich_html_spec.rb
-- spec/mod/standard/set/all/rss_spec.rb
-- spec/mod/standard/set/all/text_spec.rb
-- spec/mod/standard/set/right/account_spec.rb
-- spec/mod/standard/set/right/add_help_spec.rb
-- spec/mod/standard/set/right/comment_spec.rb
-- spec/mod/standard/set/right/create_spec.rb
-- spec/mod/standard/set/right/default_spec.rb
-- spec/mod/standard/set/right/delete_spec.rb
-- spec/mod/standard/set/right/email_spec.rb
-- spec/mod/standard/set/right/help_spec.rb
-- spec/mod/standard/set/right/machine_output_spec.rb
-- spec/mod/standard/set/right/password_spec.rb
-- spec/mod/standard/set/right/read_spec.rb
-- spec/mod/standard/set/right/salt_spec.rb
-- spec/mod/standard/set/right/script_spec.rb
-- spec/mod/standard/set/right/stats_spec.rb
-- spec/mod/standard/set/right/status_spec.rb
-- spec/mod/standard/set/right/structure_spec.rb
-- spec/mod/standard/set/right/style_spec.rb
-- spec/mod/standard/set/right/token_spec.rb
-- spec/mod/standard/set/right/update_spec.rb
-- spec/mod/standard/set/right/when_created_spec.rb
-- spec/mod/standard/set/right/when_last_edited_spec.rb
-- spec/mod/standard/set/rstar/rules_spec.rb
-- spec/mod/standard/set/self/account_links_spec.rb
-- spec/mod/standard/set/self/alerts_spec.rb
-- spec/mod/standard/set/self/all_spec.rb
-- spec/mod/standard/set/self/foot_spec.rb
-- spec/mod/standard/set/self/head_spec.rb
-- spec/mod/standard/set/self/navbox_spec.rb
-- spec/mod/standard/set/self/now_spec.rb
-- spec/mod/standard/set/self/recent_spec.rb
-- spec/mod/standard/set/self/search_spec.rb
-- spec/mod/standard/set/self/signin_spec.rb
-- spec/mod/standard/set/self/stats_spec.rb
-- spec/mod/standard/set/self/style_functional_spec.rb
-- spec/mod/standard/set/self/style_jquery_ui_smoothness_spec.rb
-- spec/mod/standard/set/self/style_standard_spec.rb
-- spec/mod/standard/set/self/version_spec.rb
-- spec/mod/standard/set/type/basic_spec.rb
-- spec/mod/standard/set/type/cardtype_spec.rb
-- spec/mod/standard/set/type/coffeescript_spec.rb
-- spec/mod/standard/set/type/css_spec.rb
-- spec/mod/standard/set/type/date_spec.rb
-- spec/mod/standard/set/type/file_spec.rb
-- spec/mod/standard/set/type/html_spec.rb
-- spec/mod/standard/set/type/image_spec.rb
-- spec/mod/standard/set/type/javascript_spec.rb
-- spec/mod/standard/set/type/layout_type_spec.rb
-- spec/mod/standard/set/type/number_spec.rb
-- spec/mod/standard/set/type/phrase_spec.rb
-- spec/mod/standard/set/type/plain_text_spec.rb
-- spec/mod/standard/set/type/pointer_spec.rb
-- spec/mod/standard/set/type/scss_spec.rb
-- spec/mod/standard/set/type/search_type_spec.rb
-- spec/mod/standard/set/type/set_spec.rb
-- spec/mod/standard/set/type/setting_spec.rb
-- spec/mod/standard/set/type/signup_spec.rb
-- spec/mod/standard/set/type/skin_spec.rb
-- spec/mod/standard/set/type/toggle_spec.rb
-- spec/mod/standard/set/type/user_spec.rb
 - spec/models/card/cardtype_spec.rb
 - spec/models/card/create_spec.rb
 - spec/models/card/trash_spec.rb
@@ -1423,8 +1422,10 @@ test_files:
 - spec/spec_helper.rb
 - test/1.10.0-data-dump.sql
 - test/fixtures/.gitkeep
+- test/fixtures/card_actions.yml
+- test/fixtures/card_acts.yml
+- test/fixtures/card_changes.yml
 - test/fixtures/card_references.yml
-- test/fixtures/card_revisions.yml
 - test/fixtures/cards.yml
 - test/fixtures/mao2.jpg
 - test/fixtures/rails.gif