Commit Graph

8458 Commits

Author SHA1 Message Date
Eduard Heimbuch
12ecfcd443 Merged in bugfix/empty_merge_git (pull request #334)
do merge commit also without diffs between branches

Approved-by: Rene Pfeuffer <rene.pfeuffer@cloudogu.com>
2019-10-17 06:16:28 +00:00
Eduard Heimbuch
3ed64d57e5 Close branch bugfix/empty_merge_git 2019-10-17 06:16:28 +00:00
Eduard Heimbuch
016eea56e8 fix ui bug 2019-10-16 17:28:06 +02:00
Rene Pfeuffer
4cb79ffe5a Detect proper merge and prevent empty commits 2019-10-16 14:59:38 +02:00
Sebastian Sdorra
453010c633 expose redux and react-redux nad fixed ui deployment 2019-10-16 12:11:52 +02:00
Sebastian Sdorra
8f6013fb5f close branch feature/restructure_ui 2019-10-16 11:29:03 +02:00
Sebastian Sdorra
d00d95d2f1 merge branch heads 2019-10-16 11:28:26 +02:00
Sebastian Sdorra
944c5e7a08 close branch feature/restructure_ui 2019-10-16 11:25:02 +02:00
Sebastian Sdorra
418d891554 merge with branch feature/restructure_ui 2019-10-16 11:24:43 +02:00
Sebastian Sdorra
03dba67223 added publish config to packages 2019-10-16 11:22:33 +02:00
Sebastian Sdorra
64d2d344de merge feature/restructure_ui 2019-10-16 10:57:57 +02:00
Sebastian Sdorra
eaa9ca108d close branch feature/restructure_ui 2019-10-16 10:57:21 +02:00
Sebastian Sdorra
1c42897285 use default registry 2019-10-16 10:41:00 +02:00
Eduard Heimbuch
b00f55e3a6 merge 2019-10-16 10:06:06 +02:00
Sebastian Sdorra
f6c4564a0c merge with 2.0.0-m3 2019-10-16 10:03:13 +02:00
Eduard Heimbuch
3c7c66a07e fix DiffFile-Tag margin-left 2019-10-16 10:02:25 +02:00
Florian Scholdei
60f4388623 Merged in bugfix/new_gitdiff_parser (pull request #335)
Use new version of gitdiff-parser
2019-10-16 07:18:55 +00:00
Florian Scholdei
c7044750e7 Close branch bugfix/new_gitdiff_parser 2019-10-16 07:18:55 +00:00
Sebastian Sdorra
37c8a1119f clean ui-webapp dependencies 2019-10-16 09:06:52 +02:00
Sebastian Sdorra
092fb6d90b added ui-plugins package to bundle all plugin dependencies 2019-10-16 08:30:15 +02:00
Sebastian Sdorra
839b966747 added publish command to ui-scripts 2019-10-16 08:08:37 +02:00
Sebastian Sdorra
70d90750ba added classnames and query-string as externals 2019-10-16 07:41:21 +02:00
Rene Pfeuffer
5f6c3b669a Use new version of gitdiff-parser 2019-10-15 16:37:49 +02:00
Sebastian Sdorra
468cc32d06 indent changes after lerna version 2019-10-15 13:23:47 +02:00
Sebastian Sdorra
91ba19cc36 remove unused plugin-scripts package and mark ui-styles as private 2019-10-15 13:14:33 +02:00
Sebastian Sdorra
9127dc5bf8 fix wrong package name 2019-10-15 13:13:21 +02:00
Eduard Heimbuch
668007e084 change unit test 2019-10-15 13:09:51 +02:00
Sebastian Sdorra
09eebd7985 use ui-scripts to build the core plugins 2019-10-15 13:07:22 +02:00
Sebastian Sdorra
61e2d065fd bump smp-maven-plugin version to fix plugin watch 2019-10-15 13:06:03 +02:00
Eduard Heimbuch
ef7d958ba1 fix / change unit test 2019-10-15 13:05:26 +02:00
Eduard Heimbuch
bf32f53c2d do merge commit also without diffs between branches 2019-10-15 10:16:26 +02:00
Sebastian Sdorra
cab5d6c863 start implementation of ui-scripts 2019-10-14 16:00:50 +02:00
Sebastian Sdorra
00117955e7 added shared prettier config 2019-10-14 11:58:18 +02:00
Sebastian Sdorra
7b8c56d71d added ui-extensions to sonar 2019-10-14 11:44:04 +02:00
Sebastian Sdorra
7073a4334d fix collecting coverage for jest tests 2019-10-14 11:06:23 +02:00
Sebastian Sdorra
b79249c20b fix wrong import of fetch-mock 2019-10-13 12:28:21 +02:00
Sebastian Sdorra
df07864fda use fixed timezone for jest tests 2019-10-13 12:25:05 +02:00
Sebastian Sdorra
b0dffa95e3 update ui-components snapshots 2019-10-12 15:43:45 +02:00
Sebastian Sdorra
b94b7403d4 use memoryrouter for decorating stories, which are using withRouter 2019-10-12 15:43:30 +02:00
Sebastian Sdorra
016579774d added fixed timezone and base date for DateFromNow stories 2019-10-12 14:03:49 +02:00
Sebastian Sdorra
176affb3e5 fixed snapshot tests on ci 2019-10-11 15:23:45 +02:00
Rene Pfeuffer
c465a48ece Set new plugin center url 2019-10-11 15:23:18 +02:00
Sebastian Sdorra
b10d7ddfd7 fix bugs found by sonarqube 2019-10-11 14:56:11 +02:00
Sebastian Sdorra
439f1d229d fix polyfil bundle reference 2019-10-11 14:26:57 +02:00
Sebastian Sdorra
5a82637382 use snapshot tests for ui-component stories 2019-10-11 14:09:22 +02:00
Sebastian Sdorra
889e186257 fix routing and added ui-extension package 2019-10-11 13:24:02 +02:00
Sebastian Sdorra
a9bcef2bfc remove outdated react-router-enzyme-context 2019-10-11 07:40:21 +02:00
Sebastian Sdorra
49a7aab45c merge branch heads and added ui-polyfill 2019-10-11 07:34:19 +02:00
Florian Scholdei
3b3d842fc9 try to fix 2019-10-10 16:38:24 +02:00
Florian Scholdei
28efd42955 try to fix tests 2019-10-10 16:38:04 +02:00