[zanata/zanata-server] 0f977a: Make 'browse files' link vertically centred.

Wed Jul 30 07:24:13 UTC 2014

  Branch: refs/heads/merge-multi-file-upload
  Home:   https://github.com/zanata/zanata-server
  Commit: 0f977a13487cd668bb1af1c0de2e82af921e4e58
      https://github.com/zanata/zanata-server/commit/0f977a13487cd668bb1af1c0de2e82af921e4e58
  Author: David Mason <drdmason at gmail.com>
  Date:   2014-07-30 (Wed, 30 Jul 2014)

  Changed paths:
    M zanata-war/src/main/webapp/resources/zanata/multi-file-upload.xhtml

  Log Message:
  -----------
  Make 'browse files' link vertically centred.

  Commit: bb694a125d56113f992c9f8d421b9c2e2ecb1a4f
      https://github.com/zanata/zanata-server/commit/bb694a125d56113f992c9f8d421b9c2e2ecb1a4f
  Author: David Mason <drdmason at gmail.com>
  Date:   2014-07-30 (Wed, 30 Jul 2014)

  Changed paths:
    M zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/js/main.js

  Log Message:
  -----------
  Prevent advanced settings being retained after closing upload dialog.

    Prevents both file path and custom upload parameters from remaining
    when the multi-file-upload dialog is closed and re-opened.

  Commit: 3231d731793aa727285d6cfb97f89104219e975a
      https://github.com/zanata/zanata-server/commit/3231d731793aa727285d6cfb97f89104219e975a
  Author: David Mason <drdmason at gmail.com>
  Date:   2014-07-30 (Wed, 30 Jul 2014)

  Changed paths:
    M zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/js/jquery.fileupload-ui.js

  Log Message:
  -----------
  Remove cancel button from files while upload is in progress.

  Commit: 5a0828a74a36fbe0d10dd75cc9f450bf4b0d138b
      https://github.com/zanata/zanata-server/commit/5a0828a74a36fbe0d10dd75cc9f450bf4b0d138b
  Author: David Mason <drdmason at gmail.com>
  Date:   2014-07-30 (Wed, 30 Jul 2014)

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab.xhtml
    M zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/js/jquery.fileupload-ui.js
    M zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/js/main.js
    M zanata-war/src/main/webapp/resources/zanata/multi-file-upload.xhtml

  Log Message:
  -----------
  Limit file uploads to 100 files at a time.

    This adds a hard-coded limit of 100 files, with the intention to replace the limit with a
    configurable value.

  Commit: df239c4a5eab567ee628242895b0cb4a249ffe8e
      https://github.com/zanata/zanata-server/commit/df239c4a5eab567ee628242895b0cb4a249ffe8e
  Author: David Mason <drdmason at gmail.com>
  Date:   2014-07-30 (Wed, 30 Jul 2014)

  Changed paths:
    M zanata-war/src/main/webapp/resources/zanata/multi-file-upload.xhtml

  Log Message:
  -----------
  Prevent opening of file select dialog when clicking outside the intended click target.

The dialog was opening when clicking anywhere in a region to the right of and below
the "browse files" text that is the intended click target. This change limits the
target to just the "browse files" text.
Wrapping of the "browse files" text is prevented since the transparent file upload
button must overlay all of the text for the dialog to open properly (plus it looks
better with the whole link on the next line than split across lines).

  Commit: 2613787fb772f3a7e889b8cb5a413cf83c594f4f
      https://github.com/zanata/zanata-server/commit/2613787fb772f3a7e889b8cb5a413cf83c594f4f
  Author: David Mason <drdmason at gmail.com>
  Date:   2014-07-30 (Wed, 30 Jul 2014)

  Changed paths:
    A zanata-war/src/main/java/org/zanata/file/UserFileUploadTracker.java
    M zanata-war/src/main/java/org/zanata/servlet/MultiFileUploadServlet.java
    A zanata-war/src/main/java/org/zanata/servlet/UserUploadCheckServlet.java
    M zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/js/jquery.fileupload-ui.js
    M zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/js/jquery.fileupload.js
    M zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/js/main.js

  Log Message:
  -----------
  SPLIT: check logged in and not already uploading before initiating upload

    Upload button now changes to "Try Again" if user is not logged in or has an upload
    going in another tab/window/computer.

    Still needs to display errors upon failure, and the code is messy,
    but it works so I'm making a commit in case I break it.

Squashed commits:

SQUASH clean up code for GET on MultiFileUploadServlet

SQUASH clean up code for POST on MultiFileUploadServlet

Display appropriate error when transaction times out for uploaded file persistence.

Show appropriate error when concurrent uploads reach the database.

log id properly for a user who is already uploading

change error text for timed-out file upload

SQUASH update error message in MultiFileUploadServlet

  Commit: 43822c0525936fcfb77e516627d0c057797ce73d
      https://github.com/zanata/zanata-server/commit/43822c0525936fcfb77e516627d0c057797ce73d
  Author: David Mason <drdmason at gmail.com>
  Date:   2014-07-30 (Wed, 30 Jul 2014)

  Changed paths:
    M zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/js/jquery.fileupload-ui.js

  Log Message:
  -----------
  Clean up fileupload ui code

  Commit: edf2f3d926b52340b63862a5f7ad3669fda9416a
      https://github.com/zanata/zanata-server/commit/edf2f3d926b52340b63862a5f7ad3669fda9416a
  Author: David Mason <drdmason at gmail.com>
  Date:   2014-07-30 (Wed, 30 Jul 2014)

  Changed paths:
    M zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/js/jquery.fileupload-ui.js

  Log Message:
  -----------
  clear errors when retrying upload of multiple files

  Commit: 92d587a812b740caf4ebff5182555ab15e63e889
      https://github.com/zanata/zanata-server/commit/92d587a812b740caf4ebff5182555ab15e63e889
  Author: David Mason <drdmason at gmail.com>
  Date:   2014-07-30 (Wed, 30 Jul 2014)

  Changed paths:
    M zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/js/main.js

  Log Message:
  -----------
  ensure file count indicator resets when multi file upload form resets

  Commit: 5004bd4302106063812f4905760d9212ac2075e0
      https://github.com/zanata/zanata-server/commit/5004bd4302106063812f4905760d9212ac2075e0
  Author: David Mason <drdmason at gmail.com>
  Date:   2014-07-30 (Wed, 30 Jul 2014)

  Changed paths:
    M zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/js/jquery.fileupload-ui.js
    M zanata-war/src/main/webapp/resources/zanata/multi-file-upload.xhtml

  Log Message:
  -----------
  User throbber instead of progress bar for uploading files.

Individual file items in multi-file upload dialog show a throbber
when they are uploading. The overall progress for all the files
still uses a progress bar.

  Commit: 27e7359daebeafe33d986f563922a8dac150eb45
      https://github.com/zanata/zanata-server/commit/27e7359daebeafe33d986f563922a8dac150eb45
  Author: David Mason <drdmason at gmail.com>
  Date:   2014-07-30 (Wed, 30 Jul 2014)

  Changed paths:
    M zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/js/jquery.fileupload.js

  Log Message:
  -----------
  clean up leftover comment

  Commit: b7e6606cc5c1d14cae574936561057cdf98f9cce
      https://github.com/zanata/zanata-server/commit/b7e6606cc5c1d14cae574936561057cdf98f9cce
  Author: David Mason <drdmason at gmail.com>
  Date:   2014-07-30 (Wed, 30 Jul 2014)

  Changed paths:
    M zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/js/jquery.fileupload.js

  Log Message:
  -----------
  Prevent file upload progress bar incrementing before files are uploaded.

This is just a workaround that delays the increment until the next
progress event, which seems sufficient without a complete overhaul
of the progress system (which seems to have something really wrong with it).

  Commit: e39be2a7148219c70ee298e4ef4eedddfcf18674
      https://github.com/zanata/zanata-server/commit/e39be2a7148219c70ee298e4ef4eedddfcf18674
  Author: David Mason <drdmason at gmail.com>
  Date:   2014-07-30 (Wed, 30 Jul 2014)

  Changed paths:
    M zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/js/jquery.fileupload-ui.js
    M zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/js/main.js

  Log Message:
  -----------
  Add confirmation to all operations that cancel an upload.

Makes sure the event 'hide.zanata.modal' is triggered in all cases that
close the modal, then add the check to that event.
Also incidentally fixed some cases in which the modal could be closed
without refreshing the document list by attaching an event on
'hide.zanata.modal' to refresh the statistics.

  Commit: cddd1bd3665b36063e3e4fe13175af22d41e6359
      https://github.com/zanata/zanata-server/commit/cddd1bd3665b36063e3e4fe13175af22d41e6359
  Author: David Mason <drdmason at gmail.com>
  Date:   2014-07-30 (Wed, 30 Jul 2014)

  Changed paths:
    M zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/js/jquery.fileupload-ui.js
    M zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/js/main.js

  Log Message:
  -----------
  Warn user when closing page during multiple file upload

This adds a modal dialog when a user is currently uploading source
files and they attempt to close or navigate away from the page.

  Commit: 4980b1ed86f949da72c79d1edc5c978873c06672
      https://github.com/zanata/zanata-server/commit/4980b1ed86f949da72c79d1edc5c978873c06672
  Author: David Mason <drdmason at gmail.com>
  Date:   2014-07-30 (Wed, 30 Jul 2014)

  Changed paths:
    M zanata-war/src/main/webapp/resources/zanata/multi-file-upload.xhtml

  Log Message:
  -----------
  Ensure uploading file items display with consistent height.

During multi-file upload, file items were changing size slightly
when they finished uploading, due to the loader widget changing the
height. This is a workaround until the loader widget is updated to
work better in inline mode - it just adds a hidden loader to the
uploaded template to force it to the same height.

  Commit: caf560632fb7b4e445518bfdb8091c832a27fa77
      https://github.com/zanata/zanata-server/commit/caf560632fb7b4e445518bfdb8091c832a27fa77
  Author: David Mason <drdmason at gmail.com>
  Date:   2014-07-30 (Wed, 30 Jul 2014)

  Changed paths:
    M zanata-war/src/main/webapp/resources/zanata/multi-file-upload.xhtml

  Log Message:
  -----------
  Ensure loader reserves space in multi-file upload dialog.

This will prevent layout changes for long filenames during upload,
but only when the .is-reserve-space css class is implemented in the
assets.

  Commit: 78d45e844976d09405bc16ac62ac7d3a37695353
      https://github.com/zanata/zanata-server/commit/78d45e844976d09405bc16ac62ac7d3a37695353
  Author: David Mason <drdmason at gmail.com>
  Date:   2014-07-30 (Wed, 30 Jul 2014)

  Changed paths:
    M zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/js/jquery.fileupload-ui.js
    M zanata-war/src/main/webapp/resources/zanata/multi-file-upload.xhtml

  Log Message:
  -----------
  Use change in filename emphasis to indicate which files have uploaded.

This replaces the green circle icon that was indicating upload completion
previously.

  Commit: b11d4fda15f3e3f8e82746bd753ea1444463e2db
      https://github.com/zanata/zanata-server/commit/b11d4fda15f3e3f8e82746bd753ea1444463e2db
  Author: David Mason <drdmason at gmail.com>
  Date:   2014-07-30 (Wed, 30 Jul 2014)

  Changed paths:
    M zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/js/main.js

  Log Message:
  -----------
  Ensure multi-file-upload dialog always responds to finished uploads

  Commit: f629abc459bcf194575727e06e224a5929e631c8
      https://github.com/zanata/zanata-server/commit/f629abc459bcf194575727e06e224a5929e631c8
  Author: David Mason <drdmason at gmail.com>
  Date:   2014-07-30 (Wed, 30 Jul 2014)

  Changed paths:
    M zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/js/jquery.fileupload-ui.js

  Log Message:
  -----------
  update error message for users with multiple concurrent uploads

  Commit: db43a80276cf8a17188a1572179ed6cd5648611d
      https://github.com/zanata/zanata-server/commit/db43a80276cf8a17188a1572179ed6cd5648611d
  Author: David Mason <drdmason at gmail.com>
  Date:   2014-07-30 (Wed, 30 Jul 2014)

  Changed paths:
    M zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/js/jquery.fileupload-ui.js
    M zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/js/main.js
    M zanata-war/src/main/webapp/resources/zanata/multi-file-upload.xhtml

  Log Message:
  -----------
  hide advanced settings when multi-file-upload starts

  Commit: 7b38ddc62c9537cbe81cef4b1466ab35986ccc06
      https://github.com/zanata/zanata-server/commit/7b38ddc62c9537cbe81cef4b1466ab35986ccc06
  Author: David Mason <drdmason at gmail.com>
  Date:   2014-07-30 (Wed, 30 Jul 2014)

  Changed paths:
    M zanata-war/src/main/webapp/resources/zanata/multi-file-upload.xhtml

  Log Message:
  -----------
  Add help for custom document parameters field in multi-file upload

  Commit: e8e054739036b4b75690f1764842cff80a7da998
      https://github.com/zanata/zanata-server/commit/e8e054739036b4b75690f1764842cff80a7da998
  Author: David Mason <drdmason at gmail.com>
  Date:   2014-07-30 (Wed, 30 Jul 2014)

  Changed paths:
    M zanata-war/src/main/webapp/resources/zanata/multi-file-upload.xhtml

  Log Message:
  -----------
  make custom file parameters collapsed by default for multi-file upload

  Commit: dd25056f29a1f8bf4de39d3eda5c124ce9392d60
      https://github.com/zanata/zanata-server/commit/dd25056f29a1f8bf4de39d3eda5c124ce9392d60
  Author: David Mason <drdmason at gmail.com>
  Date:   2014-07-30 (Wed, 30 Jul 2014)

  Changed paths:
    M zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/js/jquery.fileupload-ui.js
    M zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/js/main.js
    M zanata-war/src/main/webapp/resources/zanata/multi-file-upload.xhtml

  Log Message:
  -----------
  Needs Cleanup: WIP different upload stages being recorded, not used for count display yet

  Commit: a65b0d2418b1fb2438ce3f7913bfc4ad1e43f818
      https://github.com/zanata/zanata-server/commit/a65b0d2418b1fb2438ce3f7913bfc4ad1e43f818
  Author: David Mason <drdmason at gmail.com>
  Date:   2014-07-30 (Wed, 30 Jul 2014)

  Changed paths:
    M zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/js/jquery.fileupload-ui.js
    M zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/js/jquery.fileupload.js
    M zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/js/main.js

  Log Message:
  -----------
  SQUASH some cleanup

  Commit: 7370f5335025d8f5c5f19f4823a7d20bbe61a8aa
      https://github.com/zanata/zanata-server/commit/7370f5335025d8f5c5f19f4823a7d20bbe61a8aa
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-07-30 (Wed, 30 Jul 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/projectversion/CreateVersionPage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionDocumentsTab.java
    M functional-test/src/test/java/org/zanata/feature/document/DocTypeUploadTest.java
    M functional-test/src/test/java/org/zanata/feature/document/HTMLDocumentTypeTest.java
    M functional-test/src/test/java/org/zanata/feature/document/SubtitleDocumentTypeTest.java
    M functional-test/src/test/java/org/zanata/feature/document/UploadTest.java
    M functional-test/src/test/java/org/zanata/feature/editor/TranslateHTMLTest.java
    M functional-test/src/test/java/org/zanata/feature/editor/TranslateIdmlTest.java
    M functional-test/src/test/java/org/zanata/feature/editor/TranslateOdsTest.java
    M functional-test/src/test/java/org/zanata/feature/editor/TranslateOpenOfficeTest.java
    M functional-test/src/test/java/org/zanata/feature/editor/TranslateTextTest.java
    M zanata-war/src/main/webapp/resources/zanata/multi-file-upload.xhtml

  Log Message:
  -----------
  Fix testing of uploading files

Also remove a number of unnecessary steps in the upload tests.

  Commit: 8b2bd4615be9fd6782313e764ee0c1a6df52da09
      https://github.com/zanata/zanata-server/commit/8b2bd4615be9fd6782313e764ee0c1a6df52da09
  Author: David Mason <drdmason at gmail.com>
  Date:   2014-07-30 (Wed, 30 Jul 2014)

  Changed paths:
    M zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/js/jquery.fileupload-ui.js
    M zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/js/main.js

  Log Message:
  -----------
  Use format strings for UI text

All strings for display are wrapped in i18n function.
At the moment this only replaces placeholders since I have not provided
a way to make translated strings available. The simplest approach I can
think of to make translated strings available would be to output them as
text in hidden DOM elements of the component, since that would allow
translations to be handled through the existing page translation workflow.

  Commit: 708a3a910d5beb56c3a35f396819eb46f93073b2
      https://github.com/zanata/zanata-server/commit/708a3a910d5beb56c3a35f396819eb46f93073b2
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-07-30 (Wed, 30 Jul 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/projectversion/VersionDocumentsPage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionDocumentsTab.java
    A functional-test/src/test/java/org/zanata/feature/document/MultiFileUploadTest.java
    M functional-test/src/test/java/org/zanata/feature/document/UploadTest.java

  Log Message:
  -----------
  Multiple file upload test

  Commit: 0e66e8fba241ab2d8b4a8b67ebeeecef3d82f325
      https://github.com/zanata/zanata-server/commit/0e66e8fba241ab2d8b4a8b67ebeeecef3d82f325
  Author: David Mason <drdmason at gmail.com>
  Date:   2014-07-30 (Wed, 30 Jul 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionDocumentsTab.java
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/action/VersionHome.java
    M zanata-war/src/main/java/org/zanata/file/DocumentUploadUtil.java
    M zanata-war/src/main/java/org/zanata/file/SourceDocumentUpload.java
    M zanata-war/src/main/java/org/zanata/file/TranslationDocumentUpload.java
    A zanata-war/src/main/java/org/zanata/file/UserFileUploadTracker.java
    A zanata-war/src/main/java/org/zanata/servlet/MultiFileUploadServlet.java
    A zanata-war/src/main/java/org/zanata/servlet/UserUploadCheckServlet.java
    M zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab.xhtml
    A zanata-war/src/main/webapp/resources/JavaScript-Templates/2_5_3/.gitignore
    A zanata-war/src/main/webapp/resources/JavaScript-Templates/2_5_3/Gruntfile.js
    A zanata-war/src/main/webapp/resources/JavaScript-Templates/2_5_3/README.md
    A zanata-war/src/main/webapp/resources/JavaScript-Templates/2_5_3/bower.json
    A zanata-war/src/main/webapp/resources/JavaScript-Templates/2_5_3/css/demo.css
    A zanata-war/src/main/webapp/resources/JavaScript-Templates/2_5_3/index.html
    A zanata-war/src/main/webapp/resources/JavaScript-Templates/2_5_3/js/compile.js
    A zanata-war/src/main/webapp/resources/JavaScript-Templates/2_5_3/js/demo.js
    A zanata-war/src/main/webapp/resources/JavaScript-Templates/2_5_3/js/runtime.js
    A zanata-war/src/main/webapp/resources/JavaScript-Templates/2_5_3/js/tmpl.js
    A zanata-war/src/main/webapp/resources/JavaScript-Templates/2_5_3/js/tmpl.min.js
    A zanata-war/src/main/webapp/resources/JavaScript-Templates/2_5_3/package.json
    A zanata-war/src/main/webapp/resources/JavaScript-Templates/2_5_3/test/index.html
    A zanata-war/src/main/webapp/resources/JavaScript-Templates/2_5_3/test/test.js
    A zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/.gitignore
    A zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/.jshintrc
    A zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/CONTRIBUTING.md
    A zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/Gruntfile.js
    A zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/README.md
    A zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/angularjs.html
    A zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/basic-plus.html
    A zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/basic.html
    A zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/blueimp-file-upload.jquery.json
    A zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/bower.json
    A zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/cors/postmessage.html
    A zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/cors/result.html
    A zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/css/demo-ie8.css
    A zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/css/demo.css
    A zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/css/jquery.fileupload-noscript.css
    A zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/css/jquery.fileupload-ui-noscript.css
    A zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/css/jquery.fileupload-ui.css
    A zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/css/jquery.fileupload.css
    A zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/css/style.css
    A zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/img/loading.gif
    A zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/img/progressbar.gif
    A zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/index.html
    A zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/jquery-ui.html
    A zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/js/app.js
    A zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/js/cors/jquery.postmessage-transport.js
    A zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/js/cors/jquery.xdr-transport.js
    A zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/js/jquery.fileupload-angular.js
    A zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/js/jquery.fileupload-audio.js
    A zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/js/jquery.fileupload-image.js
    A zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/js/jquery.fileupload-jquery-ui.js
    A zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/js/jquery.fileupload-process.js
    A zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/js/jquery.fileupload-ui.js
    A zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/js/jquery.fileupload-validate.js
    A zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/js/jquery.fileupload-video.js
    A zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/js/jquery.fileupload.js
    A zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/js/jquery.iframe-transport.js
    A zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/js/main.js
    A zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/js/vendor/jquery.ui.widget.js
    A zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/package.json
    A zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/test/index.html
    A zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/test/test.js
    A zanata-war/src/main/webapp/resources/zanata/multi-file-upload.xhtml
    M zanata-war/src/test/java/org/zanata/file/DocumentUploadUtilTest.java

  Log Message:
  -----------
  Merge branch 'multi-file-upload' into merge-multi-file-upload

Conflicts:
	zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab.xhtml
      had conflict where multi-file-upload element was added, same location
      had "messages" changed to "msgs". Kept chunk from multi-file-upload
      but changed "messages" in that chunk to "msgs".

  Commit: 861de99121a5515eb7521722c76c7083e696f2cc
      https://github.com/zanata/zanata-server/commit/861de99121a5515eb7521722c76c7083e696f2cc
  Author: David Mason <drdmason at gmail.com>
  Date:   2014-07-30 (Wed, 30 Jul 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/projectversion/CreateVersionPage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/VersionDocumentsPage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionDocumentsTab.java
    M functional-test/src/test/java/org/zanata/feature/document/DocTypeUploadTest.java
    M functional-test/src/test/java/org/zanata/feature/document/HTMLDocumentTypeTest.java
    A functional-test/src/test/java/org/zanata/feature/document/MultiFileUploadTest.java
    M functional-test/src/test/java/org/zanata/feature/document/SubtitleDocumentTypeTest.java
    M functional-test/src/test/java/org/zanata/feature/document/UploadTest.java
    M zanata-war/src/main/webapp/resources/zanata/multi-file-upload.xhtml

  Log Message:
  -----------
  Merge branch 'multi-file-upload-tests' into merge-multi-file-upload

Conflicts:
	functional-test/src/test/java/org/zanata/feature/editor/TranslateHTMLTest.java
	functional-test/src/test/java/org/zanata/feature/editor/TranslateIdmlTest.java
	functional-test/src/test/java/org/zanata/feature/editor/TranslateOdsTest.java
	functional-test/src/test/java/org/zanata/feature/editor/TranslateOpenOfficeTest.java
	functional-test/src/test/java/org/zanata/feature/editor/TranslateTextTest.java

    Resolved all using --ours option (keeping version from master).
    Intend to manually apply necessary changes in these files in a subsequent commit,
    rather than risk overwriting the newer code.

Compare: https://github.com/zanata/zanata-server/compare/0f977a13487c^...861de99121a5