Norbert de Langen
|
7e12272a12
|
FIX merge conflict
|
2019-03-14 09:28:57 +01:00 |
|
Norbert de Langen
|
0994524da1
|
Merge branch 'next' into tech/api-package
# Conflicts:
# addons/a11y/package.json
# addons/actions/package.json
# addons/backgrounds/package.json
# addons/cssresources/package.json
# addons/notes/package.json
# lib/addons/package.json
# lib/router/package.json
# lib/ui/package.json
|
2019-03-13 11:44:11 +01:00 |
|
Norbert de Langen
|
eac83131e6
|
FIX version
|
2019-03-11 17:59:15 +01:00 |
|
Norbert de Langen
|
de5e55acb7
|
Merge branch 'next' into tech/api-package
# Conflicts:
# lib/api/src/modules/stories.ts
# lib/router/package.json
# lib/ui/package.json
# yarn.lock
|
2019-03-09 22:44:30 +01:00 |
|
Norbert de Langen
|
fd968846f2
|
FIX after merge
|
2019-03-08 23:58:14 +01:00 |
|
Norbert de Langen
|
3f6d16dc10
|
FIX version
|
2019-03-08 11:51:14 +01:00 |
|
Norbert de Langen
|
710025d8fc
|
UPDATE version.ts
|
2019-03-06 16:56:00 +01:00 |
|
Norbert de Langen
|
f893431a8d
|
Merge branch 'next' into tech/api-package
# Conflicts:
# addons/cssresources/src/register.tsx
# addons/notes/src/Panel.tsx
# addons/notes/src/giphy.tsx
# examples/official-storybook/stories/core/parameters.stories.js
# lib/api/src/init-provider-api.ts
# lib/api/src/lib/id.ts
# lib/api/src/modules/addons.ts
# lib/api/src/modules/layout.ts
# lib/api/src/modules/stories.ts
# lib/api/src/modules/url.ts
# lib/api/src/modules/versions.ts
# lib/api/src/store.ts
# lib/api/src/tests/id.test.js
# lib/api/src/tests/versions.test.js
# lib/client-api/src/client_api.js
# lib/client-logger/src/index.ts
# lib/router/package.json
# lib/router/src/tests/id.test.js
# lib/router/src/typings.d.ts
# lib/router/src/utils.ts
# lib/theming/src/themes/dark-syntax.ts
# lib/theming/src/themes/dark.ts
# lib/theming/src/themes/light-syntax.ts
# lib/theming/src/themes/light.ts
# lib/ui/package.json
# lib/ui/src/components/sidebar/treeview/utils.js
# lib/ui/src/containers/nav.js
# lib/ui/src/containers/preview.js
# lib/ui/src/core/context.js
# lib/ui/src/core/initial-state.js
# lib/ui/src/index.js
# lib/ui/src/libs/id.test.js
# lib/ui/src/settings/__snapshots__/shortcuts.stories.storyshot
# lib/ui/src/settings/about_page.js
# lib/ui/src/settings/shortcuts.stories.js
# lib/ui/src/settings/shortcuts_page.js
# yarn.lock
|
2019-03-06 16:45:13 +01:00 |
|
Norbert de Langen
|
5380276d7d
|
FIX tests & linting
|
2019-01-29 13:28:14 +01:00 |
|
Norbert de Langen
|
accb7ff476
|
REFACTOR context into it's own package && REFACTOR into typescript
|
2019-01-29 13:14:39 +01:00 |
|