fixed conflicts
[arvados-workbench2.git] / src / components / icon / icon.tsx
2018-11-21 Pawel Kowalczykfixed conflicts
2018-11-21 Pawel KowalczykMerge branch '13865-repositories'
2018-11-21 Pawel Kowalczykconflicts 13865-repositories
2018-11-21 Pawel Kowalczykfixed conflicts + link to ssh-keys panel
2018-11-21 Pawel KowalczykMerge branch 'master' into 13865-repositories
2018-11-20 Pawel Kowalczykadded-attributes-dialog-and-init-creating-repos
2018-11-16 Pawel Kowalczykvirtual-machines-panel-init
2018-11-09 Pawel KowalczykMerge branch 'master' into 14431-metadata
2018-11-08 Pawel KowalczykMerge branch 'master' into 14430-shared-with-me-tree 14430-shared-with-me-tree
2018-11-08 Pawel KowalczykMerge branch 'master' into 14129-inputs-modal-new
2018-11-06 Janicki ArturMerge branch '14315_fix_columns_height_and_sort_more_op...
2018-11-06 Janicki ArturMerge branch 'master' of git.curoverse.com:arvados... 14315_fix_columns_height_and_sort_more_options_for_items
2018-11-06 Pawel KromplewskiMerge branch '14425-update-material-ui-to-3.3.2'
2018-11-06 Pawel KromplewskiUse numeric value for font size instead of static class 14425-update-material-ui-to-3.3.2
2018-10-23 Daniel Kosrefs #14349 Merge branch 'origin/14349-files-placeholders'
2018-10-23 Pawel KowalczykMerge branch '14363-warning-note'
2018-10-23 Pawel KowalczykMerge branch 'master' into 14363-warning-note
2018-10-22 Pawel Kowalczykwarning-notes
2018-10-16 Daniel Kosrefs #14080 Merge branch 'origin/14080-cwl-graphs'
2018-10-16 Pawel KowalczykMerge branch '14277-search-results-view'
2018-10-16 Pawel Kowalczykmerge master
2018-10-16 Pawel Kowalczyksaved to local-storage
2018-10-02 Pawel Kowalczykmerge conflicts
2018-10-02 Michal KlobukowskiMerge branch '13863-workflow-inputs-processing'
2018-10-02 Michal KlobukowskiMerge branch 'master'
2018-10-02 Michal KlobukowskiMerge branch '13863-workflow-inputs-processing' of...
2018-10-02 Pawel KowalczykMerge branch '13863-workflow-inputs-processing' of...
2018-10-02 Pawel Kowalczykadvanced form
2018-09-18 Daniel Kosrefs #14161 Merge branch 'origin/14161-inputs-focus...
2018-09-18 Daniel Kosrefs #master Merge branch 'origin/master' into 14186...
2018-09-18 Michal KlobukowskiMerge branch 'master' of git.curoverse.com:arvados...
2018-09-18 Pawel KowalczykMerge branch '14219-missing-tooltip-for-filters-icon'
2018-09-18 Pawel KowalczykMerge branch 'master' into 14219-missing-tooltip-for...
2018-09-18 Pawel Kowalczyk14219-missing-tooltip-for-filters-icon
2018-09-17 Michal KlobukowskiMerge branch 'master' into 13751-shared-with-me-view
2018-09-13 Pawel Kowalczykmerge master
2018-09-13 Janicki ArturMerge branch '14137-new-button'
2018-09-13 Janicki ArturMerge branch 'master' into 14137-new-button
2018-09-12 Janicki Arturadd 'New' button with 3 options and clean code
2018-09-06 Michal KlobukowskiMerge branch 'master' of git.curoverse.com:arvados...
2018-09-06 Pawel KowalczykMerge branch '14125-help-page-is-empty'
2018-09-06 Pawel KowalczykMerge branch 'master' into 14125-help-page-is-empty
2018-09-06 Pawel Kowalczykmerge master
2018-09-06 Pawel Kowalczykadded icon
2018-09-06 Janicki ArturMerge branch '14148-add-new-icons'
2018-09-06 Janicki Arturadd icon for: log, command, input and output.
2018-09-04 Pawel Kowalczykmerge master
2018-09-04 Daniel Kosrefs #13828 Merge branch 'origin/13828-trash-view'
2018-09-03 Daniel KosAdd restore icon in trash panel
2018-09-03 Pawel Kowalczykmerge conflict
2018-09-03 Michal KlobukowskiMerge branch 'master' into 14100-process-logs-service
2018-09-03 Janicki ArturMerge branch '14098-log-view'
2018-09-03 Janicki Arturadd back link and fix styles
2018-08-30 Daniel Kosrefs #master Merge branch 'origin/master' into 13828...
2018-08-29 Daniel KosAdd trash view and trahsing/untrashing project/collection
2018-08-07 Michal KlobukowskiMerge branch 'master'
2018-08-07 Daniel Kosrefs #13856 Merge branch 'origin/13856-upload-component'
2018-08-07 Janicki ArturMerge branch 'master' into 13854-tags-card
2018-08-06 Daniel Kosrefs #13967 Merge branch 'origin/13967-collection-files...
2018-08-06 Pawel KowalczykMerge branch 'master' into 13905-restoring-correct...
2018-08-04 Daniel KosAdd component layout, add react-dropzone
2018-08-04 Daniel Kosrefs #master Merge branch 'origin/master' into 13856...
2018-08-03 Daniel Kosrefs # Update packages to the newest versions (includin...
2018-08-03 Daniel Kosrefs #master Merge branch 'origin/master' into 13901...
2018-08-02 Daniel Kosrefs #13887 Merge branch 'origin/13887-extract-common...
2018-07-31 Michal KlobukowskiMerge branch 'master'
2018-07-30 Pawel Kowalczykmerge master
2018-07-30 Janicki ArturMerge branch '13853-collection-view-info-card'
2018-07-30 Janicki ArturMerge branch 'master' into 13853-collection-view-info...
2018-07-30 Janicki Arturcreate collection context menu and modify code
2018-07-27 Janicki Arturinit collection view with routing and store
2018-07-23 Pawel Kowalczykmerge conflicts
2018-07-17 Michal KlobukowskiMerge branch '13764-icons-colors-unification-refactoring'
2018-07-17 Janicki ArturMerge branch 'master' into 13764-icons-colors-unificati...
2018-07-17 Janicki Arturchange code after CR
2018-07-17 Janicki Arturadd all icons to icon component, refactor code and...
2018-07-16 Janicki Arturadd all icons and modify items fo details panel
2018-07-16 Janicki Arturclean code after CR
2018-07-16 Janicki Arturimprove attributes and dt-factory, modify side-panel...
2018-07-10 Michal KlobukowskiResolve merge conflicts
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 Michal Klobukowskimerge changes
2018-07-10 Janicki Arturadd enum for icons types
2018-07-10 Janicki Arturmodify icon component
2018-07-10 Janicki Arturcreate re-usable components: attribute, empty-state...