[ARVADOS-WORKBENCH2] updated: 1.1.4-697-gb12a180

[Git user]

Summary of changes:
 src/components/form-dialog/form-dialog.tsx         | 68 ++++++++++------------
 .../collection-service/collection-service.ts       |  7 +++
 .../collection-panel-files-actions.ts              | 33 ++++++++++-
 src/store/dialog/dialog-reducer.ts                 |  8 ++-
 .../collection-files-item-action-set.ts            |  7 +--
 .../rename-file-dialog/rename-file-dialog.tsx      | 52 ++++++++++-------
 6 files changed, 108 insertions(+), 67 deletions(-)

       via  b12a180cf035192be3e22dfa5a2200d4969ce51a (commit)
       via  9f472b932176e09be950115feab148da3be5c321 (commit)
       via  d461d4da5432434916f21b0308c20148210a32f2 (commit)
       via  656ad1c0e84b1d9297373e13c385248dff05192e (commit)
       via  6ff11e5f5dba8e02a176bbe9455ba916e8990028 (commit)
       via  42f46bf682cf6590b1d87424d616c5c9b9c9154d (commit)
       via  5a98bccbd21405c97baa35c288898fac16c2d567 (commit)
       via  b4f091ebd9f78c76cc7a182802d656f55c722f6d (commit)
       via  c1787278642d2ef02234ea27f94aaae9cdd52d40 (commit)
      from  ad819c323f1623d357398e3b1344e0a8f1d38366 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit b12a180cf035192be3e22dfa5a2200d4969ce51a
Merge: ad819c3 9f472b9
Author: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
Date:   Tue Aug 21 12:59:45 2018 +0200

    merge conflicts
    
    Feature #13988
    
    Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>

diff --cc src/store/collection-panel/collection-panel-files/collection-panel-files-actions.ts
index 3ad753f,39d5659..a1057b4
--- a/src/store/collection-panel/collection-panel-files/collection-panel-files-actions.ts
+++ b/src/store/collection-panel/collection-panel-files/collection-panel-files-actions.ts
@@@ -11,9 -11,10 +11,10 @@@ import { snackbarActions } from "../../
  import { dialogActions } from '../../dialog/dialog-actions';
  import { getNodeValue } from "~/models/tree";
  import { filterCollectionFilesBySelection } from './collection-panel-files-state';
- import { startSubmit, initialize, stopSubmit } from 'redux-form';
 -import { startSubmit, initialize, SubmissionError, stopSubmit, reset } from 'redux-form';
 -import { loadProjectTreePickerProjects } from '../../../views-components/project-tree-picker/project-tree-picker';
++import { startSubmit, initialize, stopSubmit, reset } from 'redux-form';
  import { getCommonResourceServiceError, CommonResourceServiceError } from "~/common/api/common-resource-service";
 +import { resetPickerProjectTree } from '../../project-tree-picker/project-tree-picker-actions';
+ import { getDialog } from "~/store/dialog/dialog-reducer";
  
  export const collectionPanelFilesAction = unionize({
      SET_COLLECTION_FILES: ofType<CollectionFilesTree>(),

-----------------------------------------------------------------------


hooks/post-receive
--