merge conflicts
[arvados.git] / src / services / favorite-service /
2018-09-18 Daniel Kosrefs #14161 Merge branch 'origin/14161-inputs-focus...
2018-09-18 Daniel Kosrefs #14186 Merge branch 'origin/14186-progress-indicat...
2018-09-18 Daniel Kosrefs #master Merge branch 'origin/master' into 14186...
2018-09-16 Daniel KosAdd progress indicator for services
2018-09-04 Pawel Kowalczykmerge master
2018-09-04 Daniel Kosrefs #13828 Merge branch 'origin/13828-trash-view'
2018-09-03 Daniel KosCR fixes III
2018-08-20 Janicki ArturMerge branch 'master' into 14039-details-view-improvements
2018-08-17 Michal KlobukowskiMerge branch '14013-upload-collection-files-using-webda...
2018-08-17 Michal KlobukowskiMerge branch 'master'
2018-08-17 Michal KlobukowskiMerge branch 'master' into 13990-collection-files-servi...
2018-08-17 Pawel Kowalczykmerge master
2018-08-17 Daniel Kosrefs #master Merge branch 'origin/master' into 13986...
2018-08-17 Daniel KosFix tests passing
2018-08-17 Daniel Kosrefs #master Merge branch 'origin/master' into 13986...
2018-08-17 Daniel Kosrefs #14044 Merge branch 'origin/14044-filter-order...
2018-08-17 Daniel Kosrefs #master Merge branch 'origin/master' into 14044...
2018-08-15 Daniel KosSimplify order and filter builder
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 Michal KlobukowskiMerge branch 'master'
2018-08-07 Daniel Kosrefs #13856 Merge branch 'origin/13856-upload-component'
2018-08-06 Daniel KosAdd adding files to upload zone
2018-07-30 Janicki ArturMerge branch 'master' into 13853-collection-view-info...
2018-07-26 Michal KlobukowskiMerge branch 'master' into 13887-extract-common-functio...
2018-07-26 Pawel KowalczykMerge branch 'master' into 13883-arrow-animation-is...
2018-07-26 Pawel KowalczykMerge branch '13830-change-snakecase-to-upper-case...
2018-07-26 Pawel Kowalczykmerge master
2018-07-25 Pawel Kowalczykchange-snakecase-to-uppercase-in-enums
2018-07-24 Daniel Kosrefs #13573 Merge branch '13753-favorites-view'
2018-07-24 Pawel KowalczykMerge branch 'master' into 13885-refactor-and-unify...
2018-07-24 Michal KlobukowskiMerge branch 'master'
2018-07-24 Michal KlobukowskiMerge branch '13753-favorites-view' of git.curoverse...
2018-07-24 Michal KlobukowskiAdd ordering of favorite list results
2018-07-24 Pawel Kowalczykmerge master
2018-07-24 Janicki ArturMerge branch 'master' into 13786-current-token
2018-07-24 Daniel KosMerge 'origin/master' into 13753-favorites-view
2018-07-24 Michal KlobukowskiMerge branch '13784-add-to-favorite'
2018-07-24 Michal KlobukowskiSave resource name when creating favorite
2018-07-23 Daniel KosAdd favorite panel
2018-07-23 Michal KlobukowskiAdd method for checking if resource is present in favorites
2018-07-23 Pawel KowalczykMerge branch 'master' into 13885-refactor-and-unify...
2018-07-23 Michal KlobukowskiMerge branch '13840-favorites-service'
2018-07-23 Michal KlobukowskiMerge branch 'master' into 13840-favorites-service
2018-07-23 Michal KlobukowskiCreate util for mocking resource services, create tests...
2018-07-23 Michal KlobukowskiMerge branch 'master'
2018-07-18 Michal KlobukowskiRestric order and filters arguments of favorite list
2018-07-18 Michal KlobukowskiAdd recursive flag to favorite contents api call
2018-07-18 Michal KlobukowskiCreate FavoriteService