Merge branch 'origin/master' into 14478-log-in-into-clusters
authorDaniel Kos <daniel.kos@contractors.roche.com>
Tue, 18 Dec 2018 09:39:54 +0000 (10:39 +0100)
committerDaniel Kos <daniel.kos@contractors.roche.com>
Tue, 18 Dec 2018 09:39:54 +0000 (10:39 +0100)
commitf9dde5c781766b8be71d43d0f031c201a0edcfbb
tree1e85d2c243d84ad46651502bb8a4036aca2dcb75
parent95716b93cba4651180021c9a5b752fa10cf5a301
parentb6f9b49e6fed67626ae969a6864f45f002fcfd47
Merge branch 'origin/master' into 14478-log-in-into-clusters

Feature #14478

# Conflicts:
# src/common/config.ts
# src/components/text-field/text-field.tsx
# src/routes/route-change-handlers.ts
# src/routes/routes.ts
# src/services/auth-service/auth-service.ts
# src/services/common-service/common-resource-service.ts
# src/services/services.ts
# src/store/auth/auth-action.ts
# src/store/navigation/navigation-action.ts
# src/store/workbench/workbench-actions.ts
# src/validators/validators.tsx
# src/views-components/main-app-bar/account-menu.tsx
# src/views-components/main-content-bar/main-content-bar.tsx
# src/views/workbench/workbench.tsx

Arvados-DCO-1.1-Signed-off-by: Daniel Kos <daniel.kos@contractors.roche.com>
14 files changed:
src/common/config.ts
src/components/text-field/text-field.tsx
src/index.tsx
src/routes/route-change-handlers.ts
src/routes/routes.ts
src/services/auth-service/auth-service.ts
src/store/auth/auth-action-session.ts
src/store/auth/auth-action.test.ts
src/store/navigation/navigation-action.ts
src/store/workbench/workbench-actions.ts
src/validators/validators.tsx
src/views-components/main-app-bar/account-menu.tsx
src/views-components/main-content-bar/main-content-bar.tsx
src/views/workbench/workbench.tsx