IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2025-12-13 07:45:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,208 Commits 5 Branches 2 Tags
Commit Graph

13208 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Schäfer
4513b40fb3 Fix the clone of backend repo 
See: https://stackoverflow.com/a/20115678
 2018-12-13 12:42:23 +01:00
Robert Schäfer
00552c15af Merge remote-tracking branch 'origin/master' into admin-tags-and-categories 2018-12-13 10:59:05 +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]
4b9797e713
Merge pull request #82 from Human-Connection/dependabot/submodules/Nitro-Backend-766be0b 2018-12-13 04:41:47 +00:00
dependabot[bot]
0f26382ebe
Merge pull request #81 from Human-Connection/dependabot/submodules/Nitro-Web-40e1ab3 2018-12-13 04:40:59 +00:00
dependabot[bot]
b4e1e1f44e
Bump Nitro-Backend from 99a9d51 to 766be0b 
Bumps [Nitro-Backend](https://github.com/Human-Connection/Nitro-Backend) from `99a9d51` to `766be0b`.
- [Release notes](https://github.com/Human-Connection/Nitro-Backend/releases)
- [Commits](99a9d51596...766be0bb80)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-12-13 04:40:37 +00:00
dependabot[bot]
3de6b6623f
Bump Nitro-Web from 64abd76 to 40e1ab3 
Bumps [Nitro-Web](https://github.com/Human-Connection/Nitro-Web) from `64abd76` to `40e1ab3`.
- [Release notes](https://github.com/Human-Connection/Nitro-Web/releases)
- [Commits](64abd767e2...40e1ab3483)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-12-13 04:40:36 +00: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
Robert Schäfer
766be0bb80
Merge pull request #66 from Human-Connection/run_full_stack_tests 
Docker ignore scripts folder, bash compatibility
 2018-12-12 16:34:46 +01:00
Robert Schäfer
a0c831fb81
Merge branch 'master' into run_full_stack_tests 2018-12-12 16:33:56 +01:00
Robert Schäfer
66f7265b15 Remove the script to trigger full stack tests 
This will be handled by the frontend repo
 2018-12-12 16:32:50 +01:00
Grzegorz Leoniec
794d8361d5
merged master in 2018-12-12 16:30:08 +01:00
Grzegorz Leoniec
755e54f303
Merge pull request #63 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:16:13 +01:00
Grzegorz Leoniec
0d7a7e2ca7
Merge pull request #71 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:15:42 +01:00
Grzegorz Leoniec
4a50e40864
Merge pull request #67 from Human-Connection/dependabot/npm_and_yarn/slug-0.9.3 
Bump slug from 0.9.2 to 0.9.3
 2018-12-12 16:15:28 +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
Robert Schäfer
1c889d0ab6
Merge pull request #79 from Human-Connection/remove_e2e 
Remove end-to-end tests
 2018-12-12 14:24:28 +01:00
Robert Schäfer
ec4a50a03e Merge remote-tracking branch 'origin/master' into remove_e2e 2018-12-12 14:23:36 +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
dc8fb8b38c
Merge pull request #69 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:04:09 +01:00
Grzegorz Leoniec
6f1b46a2ca
Merge pull request #68 from Human-Connection/dependabot/npm_and_yarn/graphql-shield-4.1.2 
Bump graphql-shield from 4.1.1 to 4.1.2
 2018-12-12 14:03:36 +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]
0fd65793da
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:35:55 +00: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
dependabot[bot]
e93043eeba
Merge pull request #80 from Human-Connection/dependabot/submodules/Nitro-Web-6f782ef 2018-12-12 04:27:38 +00:00
dependabot[bot]
4b3bab7979
Bump Nitro-Web from 22354ce to 6f782ef 
Bumps [Nitro-Web](https://github.com/Human-Connection/Nitro-Web) from `22354ce` to `6f782ef`.
- [Release notes](https://github.com/Human-Connection/Nitro-Web/releases)
- [Commits](22354ce865...6f782efbfb)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-12-12 04:27:01 +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
c0deb83f24 Merge remote-tracking branch 'origin/master' into admin-tags-and-categories 2018-12-12 01:47:51 +01:00
Robert Schäfer
6f9015bb8f Follow CodeFactors suggestions 2018-12-12 01:07:17 +01:00
Robert Schäfer
e158747c3f Delete remainings of cypress tests 2018-12-12 01:00:16 +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