Changeset [1c79ef8dc5de4607741b9682edf6d64d62993eef] by Pascal Rettig
July 15th, 2010 @ 10:45 AM
Merge commit 'core/quota' into development
Conflicts:
lib/tasks/restore.rake
http://github.com/cykod/Webiva/commit/1c79ef8dc5de4607741b9682edf6d...
Committed by Pascal Rettig
- A app/views/file/details/_processing_file.html.erb
- A app/views/file/processing_file.rjs
- A config/server.yml.example
- A db/system_migrate/022_add_unique_hostname_index.rb
- A spec/models/domain_file_local_processor_spec.rb
- M app/controllers/application_controller.rb
- M app/controllers/content_export_controller.rb
- M app/controllers/content_import_controller.rb
- M app/controllers/file_controller.rb
- M app/controllers/member_export_controller.rb
- M app/controllers/member_import_controller.rb
- M app/models/domain.rb
- M app/models/domain_file.rb
- M app/models/domain_file_version.rb
- M app/models/server.rb
- M app/views/file/_file_javascript.rhtml
- M app/views/file/extract_revision.rjs
- M app/views/file/replace_file.rjs
- M app/views/member_import/confirm.rhtml
- M app/views/members/builder.html.erb
- M app/workers/content_export_worker.rb
- M app/workers/content_import_worker.rb
- M app/workers/member_export_worker.rb
- M app/workers/member_import_worker.rb
- M config/defaults.yml.example
- M config/environment.rb
- M lib/tasks/backup.rake
- M lib/tasks/create_domain_db.rake
- M lib/tasks/restore.rake
- M script/quick_install.rb
- M spec/controllers/file_controller_spec.rb
- M spec/models/domain_file_spec.rb
- M spec/models/domain_file_version_spec.rb
- M spec/models/end_user_action_segment_type_spec.rb
- M spec/webiva_spec_helper.rb
- M vendor/modules/webform/app/controllers/webform/export_controller.rb
- M vendor/modules/webform/app/models/webform_form.rb
Create new ticket
Create your profile
Help contribute to this project by taking a few moments to create your personal profile. Create your profile ยป