Changeset [f77e4597a7234fea73ffb55a9b0ee4cdd962dde6] by Pascal Rettig
June 28th, 2010 @ 10:42 AM
Merge commit 'core/quota' into development
Conflicts:
app/workers/member_export_worker.rb
http://github.com/cykod/Webiva/commit/f77e4597a7234fea73ffb55a9b0ee...
Committed by Pascal Rettig
- A app/controllers/transmit_file_controller.rb
- A app/models/domain_database.rb
- A app/models/server.rb
- A app/views/file/_available_file_storage.html.erb
- A app/views/file/update_storage.rjs
- A app/views/file/upload_failed.rjs
- A app/views/manage/users/_display_client_users_table.html.erb
- A db/migrate/20100614205633_add_server_id_to_domain_file.rb
- A db/system_migrate/020_domain_quota.rb
- A db/system_migrate/021_create_servers_table.rb
- A lib/tasks/setup_standalone_server.rake
- A lib/tasks/update_domain_databases.rake
- A spec/controllers/manage/clients_controller_spec.rb
- A spec/controllers/manage/domains_controller_spec.rb
- A spec/controllers/manage/issues_controller_spec.rb
- A spec/controllers/manage/system_controller_spec.rb
- A spec/controllers/manage/translate_controller_spec.rb
- A spec/controllers/manage/users_controller_spec.rb
- A spec/models/client_spec.rb
- A spec/models/client_user_spec.rb
- A spec/models/domain_database_spec.rb
- A spec/models/domain_spec.rb
- A spec/models/server_spec.rb
- M app/controllers/application_controller.rb
- M app/controllers/file_controller.rb
- M app/controllers/manage/clients_controller.rb
- M app/controllers/manage/domains_controller.rb
- M app/controllers/manage/issues_controller.rb
- M app/controllers/manage/system_controller.rb
- M app/controllers/manage/translate_controller.rb
- M app/controllers/manage/users_controller.rb
- M app/controllers/member_export_controller.rb
- M app/controllers/public_controller.rb
- M app/models/client.rb
- M app/models/client_user.rb
- M app/models/configuration.rb
- M app/models/content/core_field.rb
- M app/models/domain.rb
- M app/models/domain_file.rb
- M app/models/domain_file_version.rb
- M app/models/domain_model.rb
- M app/models/end_user.rb
- M app/models/inline_file_upload.rb
- M app/models/mail_template_mailer.rb
- M app/models/role.rb
- M app/models/system_model.rb
- M app/views/file/_file_javascript.rhtml
- M app/views/file/_file_manager_update.rjs
- M app/views/file/copy_file.rjs
- M app/views/file/index.rhtml
- M app/views/file/load_folder.rjs
- M app/views/manage/clients/_client_table.rhtml
- M app/views/manage/clients/_form.rhtml
- M app/views/manage/domains/edit.rhtml
- M app/views/manage/domains/list.rhtml
- M app/views/manage/domains/setup.rhtml
- M app/views/manage/system/index.rhtml
- M app/views/manage/users/_form.rhtml
- M app/views/manage/users/edit.rhtml
- M app/views/manage/users/list.rhtml
- M app/workers/content_export_worker.rb
- M app/workers/content_import_worker.rb
- M app/workers/domain_model_worker.rb
- M app/workers/file_worker.rb
- M app/workers/member_export_worker.rb
- M app/workers/member_import_worker.rb
- M app/workers/migration_handler_worker.rb
- M config/environment.rb
- M lib/tasks/create_domain_db.rake
- M lib/tasks/migrate_domain_components.rake
- M lib/tasks/migrate_domain_dbs.rake
- M lib/tasks/restore.rake
- M script/starling.rb
- M spec/content_spec_helper.rb
- M spec/controllers/content_controller_spec.rb
- M spec/controllers/editor/publication_renderer_spec.rb
- M spec/controllers/file_controller_spec.rb
- M spec/webiva_spec_helper.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 ยป