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
11,943 Commits 5 Branches 2 Tags
Commit Graph

11943 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Grzegorz Leoniec
87cba32d87
Merge pull request #76 from Human-Connection/roschaefer-patch-1 
Add build status to README.md
 2018-12-11 15:24:56 +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
Grzegorz Leoniec
0d396712bd
downgrade graphql-middleware 2018-12-11 11:37:53 +01:00
dependabot[bot]
91f60439f4
Bump nodemon from 1.18.7 to 1.18.8 
Bumps [nodemon](https://github.com/remy/nodemon) from 1.18.7 to 1.18.8.
- [Release notes](https://github.com/remy/nodemon/releases)
- [Commits](https://github.com/remy/nodemon/compare/v1.18.7...v1.18.8)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-12-11 04:26:24 +00:00
dependabot[bot]
9cee0e7883
Bump graphql-shield from 4.1.1 to 4.1.2 
Bumps [graphql-shield](https://github.com/maticzav/graphql-shield) from 4.1.1 to 4.1.2.
- [Release notes](https://github.com/maticzav/graphql-shield/releases)
- [Commits](https://github.com/maticzav/graphql-shield/compare/v4.1.1...v4.1.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-12-11 04:26:07 +00:00
dependabot[bot]
35e7fd0cca
Bump slug from 0.9.2 to 0.9.3 
Bumps [slug](https://github.com/Trott/node-slug) from 0.9.2 to 0.9.3.
- [Release notes](https://github.com/Trott/node-slug/releases)
- [Commits](https://github.com/Trott/node-slug/compare/q0.9.2...v0.9.3)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-12-11 04:25:55 +00:00
dependabot[bot]
09e7dd5279
Bump nodemon from 1.18.7 to 1.18.8 
Bumps [nodemon](https://github.com/remy/nodemon) from 1.18.7 to 1.18.8.
- [Release notes](https://github.com/remy/nodemon/releases)
- [Commits](https://github.com/remy/nodemon/compare/v1.18.7...v1.18.8)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-12-11 04:24:02 +00:00
dependabot[bot]
1723e005e4
Merge pull request #78 from Human-Connection/dependabot/submodules/Nitro-Web-22354ce 2018-12-11 04:23:18 +00:00
dependabot[bot]
37bdb822fb
Merge pull request #77 from Human-Connection/dependabot/submodules/Nitro-Backend-bed0f81 2018-12-11 04:22:57 +00:00
dependabot[bot]
99ab380706
Bump Nitro-Web from 64abd76 to 22354ce 
Bumps [Nitro-Web](https://github.com/Human-Connection/Nitro-Web) from `64abd76` to `22354ce`.
- [Release notes](https://github.com/Human-Connection/Nitro-Web/releases)
- [Commits](64abd767e2...22354ce865)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-12-11 04:22:36 +00:00
dependabot[bot]
211fdb9708
Bump Nitro-Backend from 99a9d51 to bed0f81 
Bumps [Nitro-Backend](https://github.com/Human-Connection/Nitro-Backend) from `99a9d51` to `bed0f81`.
- [Release notes](https://github.com/Human-Connection/Nitro-Backend/releases)
- [Commits](99a9d51596...bed0f819ff)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-12-11 04:22:36 +00:00