359 Commits

Author SHA1 Message Date
Grzegorz Leoniec
cb1815b560
added locales to admin and settings 2018-12-17 21:57:08 +01:00
Grzegorz Leoniec
223eff2381
added align to table col and header 2018-12-17 21:56:51 +01:00
Grzegorz Leoniec
0656291c52
added i18n and basic locales 2018-12-17 21:56:30 +01:00
Grzegorz Leoniec
68bce0c017
fixed user role check 2018-12-17 19:54:23 +01:00
Grzegorz Leoniec
1c53e06261
added icons to usermenu 2018-12-17 19:52:18 +01:00
Grzegorz Leoniec
938d7fb891
Merge pull request #94 from Human-Connection/dependabot/npm_and_yarn/nodemon-1.18.9
Bump nodemon from 1.18.8 to 1.18.9
2018-12-17 09:20:31 +01:00
dependabot[bot]
02473db25f
Bump nodemon from 1.18.8 to 1.18.9
Bumps [nodemon](https://github.com/remy/nodemon) from 1.18.8 to 1.18.9.
- [Release notes](https://github.com/remy/nodemon/releases)
- [Commits](https://github.com/remy/nodemon/compare/v1.18.8...v1.18.9)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-12-17 04:53:48 +00:00
Grzegorz Leoniec
7a149793e9
Merge pull request #91 from Human-Connection/roschaefer-patch-1
Add travis build status to README
2018-12-16 15:39:24 +01:00
Grzegorz Leoniec
1c9521bf34
Merge branch 'master' into roschaefer-patch-1 2018-12-15 13:12:59 +01:00
Grzegorz Leoniec
6390b7ef8d
Merge pull request #92 from Human-Connection/fix_seeding
Use build stage `builder` for backend
2018-12-15 13:12:41 +01:00
Robert Schäfer
c815f017a0 Use build stage builder for backend
After the backend uses multistage builds we also have to use `builder`
stage of the backend in Nitro-Web. Otherwise we won't be able to run the
seeds and login later on.
2018-12-15 12:52:14 +01:00
Robert Schäfer
d3d1dcb72f
Add travis build status to README 2018-12-15 12:48:05 +01:00
Grzegorz Leoniec
059abd924c
Merge pull request #90 from Human-Connection/docker_push
Add docker push script deployment
2018-12-15 11:20:19 +01:00
Robert Schäfer
7e663a6c19 Add docker push script deployment 2018-12-14 23:23:09 +01:00
Robert Schäfer
010bac50ab
Merge pull request #79 from Human-Connection/admin-tags-and-categories
Admin tags and categories
2018-12-13 13:33:22 +01:00
Robert Schäfer
2c463fdeaa
Merge branch 'master' into admin-tags-and-categories 2018-12-13 13:16:51 +01:00
Robert Schäfer
4513b40fb3 Fix the clone of backend repo
See: https://stackoverflow.com/a/20115678
2018-12-13 12:42:23 +01:00
Grzegorz Leoniec
2adb22d363
Merge pull request #89 from Human-Connection/dependabot/npm_and_yarn/vue-jest-3.0.2
Bump vue-jest from 3.0.1 to 3.0.2
2018-12-13 08:24:44 +01:00
dependabot[bot]
69ef2d65fc
Bump vue-jest from 3.0.1 to 3.0.2
Bumps [vue-jest](https://github.com/eddyerburgh/vue-jest) from 3.0.1 to 3.0.2.
- [Release notes](https://github.com/eddyerburgh/vue-jest/releases)
- [Commits](https://github.com/eddyerburgh/vue-jest/compare/v3.0.1...v3.0.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-12-13 04:26:14 +00:00
Robert Schäfer
a40fafa455 Cucumber preprocessor must be added locally 2018-12-12 22:14:56 +01:00
Robert Schäfer
fd7a4d89b6 Add cucumber-preprocessor to Travis build 2018-12-12 22:01:48 +01:00
Robert Schäfer
908e9b47f6 Merge remote-tracking branch 'origin/master' into admin-tags-and-categories 2018-12-12 21:44:43 +01:00
Robert Schäfer
669ef1076f Drop the component test for the page
@appinteractive and I decided to test the page with a fullstack test. It
makes more sense for pages who request data from the backend.
2018-12-12 21:39:36 +01:00
Robert Schäfer
c8f23f9e6e All cucumbers have passed 2018-12-12 21:35:37 +01:00
Robert Schäfer
96a30ca03e Implement first scenario for categories 2018-12-12 18:58:35 +01:00
Robert Schäfer
6fc203003a Undo the local imports 2018-12-12 18:01:04 +01:00
Grzegorz Leoniec
40e1ab3483
Merge pull request #82 from Human-Connection/dependabot/npm_and_yarn/eslint-5.10.0
Bump eslint from 5.9.0 to 5.10.0
2018-12-12 16:14:54 +01:00
Grzegorz Leoniec
d39eb9afd5
Merge pull request #88 from Human-Connection/dependabot/npm_and_yarn/date-fns-2.0.0-alpha.26
Bump date-fns from 2.0.0-alpha.25 to 2.0.0-alpha.26
2018-12-12 16:06:30 +01:00
Grzegorz Leoniec
a0ae416131
Merge branch 'master' into dependabot/npm_and_yarn/date-fns-2.0.0-alpha.26 2018-12-12 14:33:12 +01:00
Grzegorz Leoniec
25d1f62b89
Merge pull request #81 from Human-Connection/dependabot/npm_and_yarn/@vue/test-utils-1.0.0-beta.27
Bump @vue/test-utils from 1.0.0-beta.26 to 1.0.0-beta.27
2018-12-12 14:09:48 +01:00
Grzegorz Leoniec
a2b0e28542
Merge pull request #85 from Human-Connection/dependabot/npm_and_yarn/nodemon-1.18.8
Bump nodemon from 1.18.7 to 1.18.8
2018-12-12 14:09:18 +01:00
Grzegorz Leoniec
61a85f6eea
Merge branch 'master' into dependabot/npm_and_yarn/nodemon-1.18.8 2018-12-12 14:09:05 +01:00
Grzegorz Leoniec
15ff7fa9f7
Merge pull request #86 from Human-Connection/run_cypress_in_this_repo
Run full stack tests in the repo
2018-12-12 13:03:07 +01:00
dependabot[bot]
4fee4ebc59
Bump date-fns from 2.0.0-alpha.25 to 2.0.0-alpha.26
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.0.0-alpha.25 to 2.0.0-alpha.26.
- [Release notes](https://github.com/date-fns/date-fns/releases)
- [Changelog](https://github.com/date-fns/date-fns/blob/master/CHANGELOG.md)
- [Commits](https://github.com/date-fns/date-fns/compare/v2.0.0-alpha.25...v2.0.0-alpha.26)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-12-12 04:34:32 +00:00
Robert Schäfer
0fcff960f7 Fix lint 2018-12-12 03:27:27 +01:00
Robert Schäfer
131664421f Green the cucumber 2018-12-12 03:27:26 +01:00
Robert Schäfer
78931ef9a9 Implement cucumber test with cypress 2018-12-12 03:27:26 +01:00
Robert Schäfer
c1183e6994 Follow CodeFactors suggestions 2018-12-12 03:27:26 +01:00
Robert Schäfer
20225b61de Run cypress on Travis CI 2018-12-12 03:27:26 +01:00
Robert Schäfer
bf9db1edc1 Copy cypress files back 2018-12-12 03:27:03 +01:00
Robert Schäfer
5b1544de89 Clone+install backend at $TRAVIS_BRANCH in build 2018-12-12 03:27:03 +01:00
Robert Schäfer
6f9015bb8f Follow CodeFactors suggestions 2018-12-12 01:07:17 +01:00
Robert Schäfer
7d5c7f421a Run cypress on Travis CI 2018-12-11 18:31:24 +01:00
Robert Schäfer
437337b7aa Copy cypress files back 2018-12-11 18:29:18 +01:00
Robert Schäfer
0922e0cfda Clone+install backend at $TRAVIS_BRANCH in build 2018-12-11 18:26:35 +01:00
Grzegorz Leoniec
25c60d2a7b
Merge branch 'master' into admin-tags-and-categories 2018-12-11 14:59:46 +01:00
Grzegorz Leoniec
0aa550bcb1
Merge branch 'admin-tags-and-categories' of github.com:appinteractive/hc-prototype-ui into admin-tags-and-categories 2018-12-11 14:59:11 +01:00
Grzegorz Leoniec
7ecaeda48d
Merge remote-tracking branch 'origin/master' into admin-tags-and-categories 2018-12-11 14:58:46 +01:00
Grzegorz Leoniec
6f782efbfb
Merge pull request #84 from Human-Connection/several_updates_on_travis_yml
Several updates on travis yml
2018-12-11 14:53:42 +01:00
Robert Schäfer
33e6153273 Remove full_stack_test build
It's better to have cypress in this repository as @appinteractive said.
There is no additional value in having it in a separate repo.
2018-12-11 14:50:19 +01:00