merge conflicts
[arvados-workbench2.git] / src / views / workbench / workbench.tsx
2018-07-23 Pawel Kowalczykmerge conflicts
2018-07-23 Janicki ArturMerge branch 'master' into 13797-refatoring-part2
2018-07-22 Daniel Kosrefs # Merge branch 'origin/remove-default-exports'
2018-07-22 Daniel KosGet rid of context-menu-hoc
2018-07-22 Daniel KosRemove default exports
2018-07-20 Pawel Kowalczykredux-form-validation
2018-07-19 Janicki ArturMerge branch '13797-refactoring'
2018-07-19 Janicki ArturMerge branch 'master' into 13797-refactoring
2018-07-18 Janicki Arturfix bugs - display details panel when user is logout
2018-07-17 Janicki ArturMerge branch 'master' into 13764-icons-colors-unificati...
2018-07-17 Michal KlobukowskiMerge branch 'master' into 13817-runtime-app-configuration
2018-07-17 Michal KlobukowskiMerge branch '13805-extract-context-menu-view-component-f'
2018-07-17 Michal KlobukowskiMerge branch 'master'
2018-07-17 Pawel KowalczykMerge branch '13796-Refactoring'
2018-07-13 Michal KlobukowskiImplement better pattern for hanling actions in context...
2018-07-13 Michal KlobukowskiImplement base distinction between context menu kind
2018-07-13 Michal KlobukowskiExtract context-menu view component
2018-07-13 Pawel Kowalczykmerge-conflicts
2018-07-13 Michal KlobukowskiMerge branch '13798-refactor'
2018-07-13 Pawel Kowalczykrefactor
2018-07-13 Michal KlobukowskiMerge branch 'master'
2018-07-13 Michal KlobukowskiUpdate Resource kind reference, update missing componen...
2018-07-12 Michal KlobukowskiUnify use of Collection and Project resource types
2018-07-12 Pawel Kowalczyksmall refactor
2018-07-12 Michal KlobukowskiMerge branch 'master' into 13705-item-common-details
2018-07-12 Michal KlobukowskiMerge branch '13750-project-item-remains-active'
2018-07-12 Michal KlobukowskiRedirect on side panel item activation, activate projec...
2018-07-10 Michal KlobukowskiMerge branch '13694-Data-operations-Project-creation'
2018-07-10 Michal KlobukowskiResolve merge conflicts
2018-07-10 Michal KlobukowskiMerge branch '13777-double-click-handler-in-project...
2018-07-10 Michal KlobukowskiLoad details while navigating using tree or breadcrumbs
2018-07-10 Michal KlobukowskiAdd double click handler
2018-07-10 Michal KlobukowskiMerge branch '13765-information-inside-details-panel'
2018-07-10 Janicki ArturMerge branch 'master' into 13765-information-inside...
2018-07-10 Janicki Arturload item to panelDetails and display data
2018-07-10 Michal KlobukowskiMerge branch 'master' into 13694-Data-operations-Projec...
2018-07-10 Pawel Kowalczykmerge conficts
2018-07-10 Pawel Kowalczykvalidation-for-dialog
2018-07-10 Michal Klobukowskimerge changes
2018-07-10 Michal KlobukowskiCreate store and connect detail panel
2018-07-10 Janicki Arturcreate re-usable components: attribute, empty-state...
2018-07-09 Michal KlobukowskiConnect project dialog to the store
2018-07-09 Pawel KowalczykMerge remote-tracking branch 'origin' into 13694-Data...
2018-07-09 Pawel Kowalczykaction-on-new-project-click
2018-07-09 Pawel KowalczykMerge branch '13694-Data-operations-Project-creation...
2018-07-09 Pawel Kowalczykcontext-menu-in-side-panel-and-project-panel
2018-07-09 Michal KlobukowskiAdd onContextMenu props to breadcrumbs
2018-07-09 Michal KlobukowskiMove context menu to workbench component
2018-07-06 Pawel Kowalczykmerge-commit
2018-07-06 Michal KlobukowskiMerge branch 'master' into 13703-data-explorer-and...
2018-07-06 Michal KlobukowskiMerge branch '13704-navigation-details-panel'
2018-07-06 Michal KlobukowskiMerge branch 'master' into 13704-navigation-details...
2018-07-06 Pawel KowalczykMerge remote-tracking branch 'origin' into 13694-Data...
2018-07-06 Pawel KowalczykProject-creation-on-button
2018-07-06 Artur Janicki#13704: add custom theme and clean code
2018-07-05 Artur Janicki#13704: change code after CR
2018-07-03 Artur Janicki#13704: init navigation details panel
2018-07-01 Michal KlobukowskiMerge branch '13678-connect-data-explorer-to-the-store'
2018-06-30 Michal KlobukowskiFix incorrect projets item toggling
2018-06-30 Michal KlobukowskiFix react issue with calling actions in render method...
2018-06-30 Michal KlobukowskiImprove handling on of project url changes
2018-06-29 Michal KlobukowskiReplace go back item with browser back button support
2018-06-26 Michal KlobukowskiMerge branch 'master'
2018-06-26 Pawel Kowalczykmerge-conflicts
2018-06-26 Daniel Kosrefs #13666 Merge branch 'origin/13666-data-explorer...
2018-06-26 Daniel KosFixed not clearing project panel items immediately...
2018-06-26 Daniel KosNavigation fixes
2018-06-26 Michal KlobukowskiReplace project-panel with project-explorer
2018-06-26 Daniel KosPost merge fixes
2018-06-26 Daniel KosMerge branch 'origin/master' into 13666-data-explorer...
2018-06-25 Daniel KosAdded central action for navigation
2018-06-25 Michal KlobukowskiMerge branch 'master'
2018-06-25 Michal KlobukowskiConnect project explorer to the store
2018-06-25 Daniel Kosrefs #13598 Merge branch 'origin/#13598-Left-side-panel'
2018-06-25 Pawel Kowalczykmerge-conflicts
2018-06-24 Daniel KosAdded data selector for workbench data explorer
2018-06-22 Pawel Kowalczykleft-side-panel-small-refactor
2018-06-22 Michal KlobukowskiMerge branch '13633-data-explorer-column-filtering'
2018-06-21 Pawel Kowalczykleft-side-panel-with-tests
2018-06-20 Pawel KowalczykLeft-side-panel-without-tests
2018-06-20 Michal KlobukowskiExtract generic data-explorer component
2018-06-20 Michal KlobukowskiMerge branch 'master'
2018-06-20 Daniel Kosrefs #13632 Merge branch '13632-collections-service'
2018-06-19 Michal KlobukowskiMerge branch '13637-workbench-general-look-adjustments'
2018-06-19 Michal KlobukowskiMerge branch 'master' into 13637-workbench-general...
2018-06-19 Michal KlobukowskiUpdate workbench styles to handle main content vertical...
2018-06-19 Daniel KosDecoupled services from redux
2018-06-18 Daniel KosAdded collection service, reorganized components structure
2018-06-18 Michal KlobukowskiMerge branch '13628-connect-breadcrumbs-with-project...
2018-06-18 Michal KlobukowskiRename findTreeBranch to getTreePath
2018-06-18 Michal KlobukowskiMerge branch 'master'
2018-06-18 Michal KlobukowskiMerge branch '13601-basic-data-exploring-component'
2018-06-18 Michal KlobukowskiUpdate layout to match new latest mockups
2018-06-18 Michal KlobukowskiMerge branch 'master'
2018-06-18 Pawel KowalczykMerge branch '13618-Tree-component-adjustments-for...
2018-06-18 Pawel Kowalczykmerge-conflicts
2018-06-15 Pawel KowalczykTree-component-adjustments-for-dynamic-contents
2018-06-15 Michal KlobukowskiConnect breadcrumbs witg project tree
2018-06-15 Michal KlobukowskiUpdate data-explorer naming convention
2018-06-14 Michal KlobukowskiMerge branch 'master'
next