merge-conflicts
[arvados.git] / src / views-components / collection-panel-files / collection-panel-files.ts
2018-08-20 Pawel Kowalczykmerge-conflicts
2018-08-20 Michal KlobukowskiMerge branch '14013-upload-collection-files-using-webdav'
2018-08-20 Michal KlobukowskiAdd function for getting tree nodes instead of ids
2018-08-17 Michal KlobukowskiMerge branch 'master'
2018-08-17 Michal KlobukowskiCreate collection files upload dialog
2018-08-17 Pawel Kowalczykmerge master
2018-08-17 Daniel Kosrefs #master Merge branch 'origin/master' into 13986...
2018-08-14 Michal KlobukowskiMerge lates changes
2018-08-14 Michal KlobukowskiMerge branch 'master'
2018-08-13 Daniel Kosrefs #13989 Merge branch 'origin/13989-webdav-service'
2018-08-13 Daniel Kosrefs #14007 Merge branch 'origin/14007-ts-paths'
2018-08-13 Daniel Kosrefs #master Merge branch 'origin/master' into 14007...
2018-08-10 Daniel KosAdd typescript paths to top level folders
2018-08-07 Janicki ArturMerge branch 'master' into 13854-tags-card
2018-08-04 Daniel Kosrefs #master Merge branch 'origin/master' into 13856...
2018-08-03 Pawel KowalczykMerge branch 'master' into 13905-restoring-correct...
2018-08-03 Michal KlobukowskiMerge branch '13855-data-collection-files-card'
2018-08-03 Michal KlobukowskiMerge branch 'master'
2018-08-02 Michal KlobukowskiMerge branch 'master'
2018-08-02 Michal KlobukowskiAdd upload data button
2018-08-01 Michal KlobukowskiExtract tree data structure
2018-08-01 Michal KlobukowskiApply simple memoization in state mapping function
2018-07-31 Michal KlobukowskiUpdate collection-panel-container to handle new state...
2018-07-31 Michal KlobukowskiMerge branch 'master'
2018-07-30 Michal KlobukowskiInit collection-files context menus
2018-07-30 Michal KlobukowskiImplement reducer and state mapping functions
2018-07-30 Michal KlobukowskiInit collection-panel-files hoc