RedMine Mirror Source

Redmine is a flexible project management web application

Brought to you by: githg

Commit [r10977] Maximize Restore History

Merged ajax_upload branch (#3957).

Authored by: jplang 2012-12-10

Browse code at this revision

Parent: [r10976]

Child: [r10978]

copied	/sandbox/ajax_upload/app/views/attachments/destroy.js.erb -> /trunk/app/views/attachments/destroy.js.erb
copied	/sandbox/ajax_upload/app/views/attachments/upload.js.erb -> /trunk/app/views/attachments/upload.js.erb
copied	/sandbox/ajax_upload/public/images/hourglass.png -> /trunk/public/images/hourglass.png
copied	/sandbox/ajax_upload/public/javascripts/attachments.js -> /trunk/public/javascripts/attachments.js
copied	/sandbox/ajax_upload/test/integration/attachments_test.rb -> /trunk/test/integration/attachments_test.rb
changed	/trunk/app/controllers/application_controller.rb
changed	/trunk/app/controllers/attachments_controller.rb
changed	/trunk/app/controllers/messages_controller.rb
changed	/trunk/app/controllers/previews_controller.rb
changed	/trunk/app/controllers/wiki_controller.rb
changed	/trunk/app/helpers/application_helper.rb
changed	/trunk/app/models/attachment.rb
changed	/trunk/app/views/attachments/_form.html.erb
changed	/trunk/app/views/common/_preview.html.erb
changed	/trunk/app/views/previews/issue.html.erb
changed	/trunk/config/configuration.yml.example
changed	/trunk/lib/redmine/configuration.rb
changed	/trunk/public/javascripts/application.js
changed	/trunk/public/stylesheets/application.css
changed	/trunk/test/functional/attachments_controller_test.rb
changed	/trunk/test/functional/issues_controller_test.rb
changed	/trunk/test/functional/issues_controller_transaction_test.rb

/sandbox/ajax_upload/app/views/attachments/destroy.js.erb to /trunk/app/views/attachments/destroy.js.erb

File was copied.

/sandbox/ajax_upload/app/views/attachments/upload.js.erb to /trunk/app/views/attachments/upload.js.erb

File was copied.

/sandbox/ajax_upload/public/images/hourglass.png to /trunk/public/images/hourglass.png

File was copied.

/sandbox/ajax_upload/public/javascripts/attachments.js to /trunk/public/javascripts/attachments.js

File was copied.

/sandbox/ajax_upload/test/integration/attachments_test.rb to /trunk/test/integration/attachments_test.rb

File was copied.

/trunk/app/controllers/application_controller.rb Diff Switch to side-by-side view

/trunk/app/controllers/attachments_controller.rb Diff Switch to side-by-side view

/trunk/app/controllers/messages_controller.rb Diff Switch to side-by-side view

/trunk/app/controllers/previews_controller.rb Diff Switch to side-by-side view

/trunk/app/controllers/wiki_controller.rb Diff Switch to side-by-side view

/trunk/app/helpers/application_helper.rb Diff Switch to side-by-side view

/trunk/app/models/attachment.rb Diff Switch to side-by-side view

/trunk/app/views/attachments/_form.html.erb Diff Switch to side-by-side view

/trunk/app/views/common/_preview.html.erb Diff Switch to side-by-side view

/trunk/app/views/previews/issue.html.erb Diff Switch to side-by-side view

/trunk/config/configuration.yml.example Diff Switch to side-by-side view

/trunk/lib/redmine/configuration.rb Diff Switch to side-by-side view

/trunk/public/javascripts/application.js Diff Switch to side-by-side view

/trunk/public/stylesheets/application.css Diff Switch to side-by-side view

/trunk/test/functional/attachments_controller_test.rb Diff Switch to side-by-side view

/trunk/test/functional/issues_controller_test.rb Diff Switch to side-by-side view

/trunk/test/functional/issues_controller_transaction_test.rb Diff Switch to side-by-side view