git.arvados.org - arvados-workbench2.git/commit

projects / arvados-workbench2.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 0c0daef 663ddee)

author	Pawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
	Fri, 7 Dec 2018 09:21:57 +0000 (10:21 +0100)
committer	Pawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
	Fri, 7 Dec 2018 09:21:57 +0000 (10:21 +0100)
commit	4a055bfc98a5fc05cc311e2de1ab2213eec5497e
tree	f6f78b194ac6a410644149efcf5a4e80d5ec3931	tree \| snapshot
parent	0c0daef87be8abcbcc3498d817e453d7336554f8	commit \| diff
parent	663ddeefc6a120d6dba213b1392805146d659721	commit \| diff

conflicts

Feature #14504

Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>

14 files changed:

src/index.tsx	diff1 \|	diff2 \|	blob \| history
src/models/user.ts	diff1 \|	diff2 \|	blob \| history
src/routes/route-change-handlers.ts	diff1 \|	diff2 \|	blob \| history
src/routes/routes.ts	diff1 \|	diff2 \|	blob \| history
src/store/advanced-tab/advanced-tab.ts	diff1 \|	diff2 \|	blob \| history
src/store/navigation/navigation-action.ts	diff1 \|	diff2 \|	blob \| history
src/store/repositories/repositories-actions.ts	diff1 \|	diff2 \|	blob \| history
src/store/store.ts	diff1 \|	diff2 \|	blob \| history
src/store/workbench/workbench-actions.ts	diff1 \|	diff2 \|	blob \| history
src/validators/validators.tsx	diff1 \|	diff2 \|	blob \| history
src/views-components/context-menu/context-menu.tsx	diff1 \|	diff2 \|	blob \| history
src/views-components/main-app-bar/account-menu.tsx	diff1 \|	diff2 \|	blob \| history
src/views-components/main-content-bar/main-content-bar.tsx	diff1 \|	diff2 \|	blob \| history
src/views/workbench/workbench.tsx	diff1 \|	diff2 \|	blob \| history