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

5888 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Schäfer
bd26f738a5 Same as this commit: 
8b324fc8dd
 2018-12-10 17:42:12 +01:00
Robert Schäfer
8b324fc8dd Download trigger_build in folder scripts/ 
This way, it does not get added to our docker images which we upload to
docker hub.
 2018-12-10 17:39:47 +01:00
Robert Schäfer
31b017f7f6 Trigger fullstack tests from this repository 2018-12-10 17:35:41 +01:00
Robert Schäfer
7a517131e3 Re-add success notifications 
Those success notifications were just fine.
 2018-12-10 17:35:04 +01:00
Robert Schäfer
ee80f56c79 Run lint from the docker container 
We want to run everything, including eslint, from the docker container.
As a next step we would run software tests from the docker container.
Installing the correct version of docker-compose is required, the
default version docker-compose on Travis is older than 3.7.
 2018-12-10 17:33:00 +01:00
Robert Schäfer
4ba03d1881 Trigger a build in our meta repository 
For full stack testing.
 2018-12-10 15:44:09 +01:00
Robert Schäfer
6b8433e54b
Add build status to README.md 2018-12-10 15:15:54 +01:00
Grzegorz Leoniec
3490435bfd
Merge pull request #73 from Human-Connection/e2e 
Full stack tests with submodules and cypress
 2018-12-10 15:10:34 +01:00
Grzegorz Leoniec
9d68a8a304
updating api 2018-12-10 13:51:24 +01:00
Grzegorz Leoniec
2d330e5b85
removed fixed branch in triffer_build.sh 2018-12-10 13:24:55 +01:00
Grzegorz Leoniec
1700bff648
merge 2018-12-10 13:16:03 +01:00
Grzegorz Leoniec
afa143a627
added missing nyc dependency 2018-12-10 12:41:19 +01:00
Grzegorz Leoniec
1f62e1d3f3
merged master in 2018-12-10 12:37:07 +01:00
dependabot[bot]
499c6851a7
Bump eslint from 5.9.0 to 5.10.0 
Bumps [eslint](https://github.com/eslint/eslint) from 5.9.0 to 5.10.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v5.9.0...v5.10.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-12-10 11:35:16 +00:00
Grzegorz Leoniec
d5755569a0
Merge branch 'master' into ci-improvements 2018-12-10 12:33:03 +01:00
Grzegorz Leoniec
bed0f819ff
Merge pull request #21 from Human-Connection/mochajs 
Setup integration testing with MochaJS
 2018-12-10 12:32:38 +01:00
dependabot[bot]
d86140857e
Bump @vue/test-utils from 1.0.0-beta.26 to 1.0.0-beta.27 
Bumps [@vue/test-utils](https://github.com/vuejs/vue-test-utils) from 1.0.0-beta.26 to 1.0.0-beta.27.
- [Release notes](https://github.com/vuejs/vue-test-utils/releases)
- [Changelog](https://github.com/vuejs/vue-test-utils/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-test-utils/compare/v1.0.0-beta.26...v1.0.0-beta.27)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-12-10 09:03:51 +00:00
dependabot[bot]
e3545ab4a8
Bump eslint from 5.9.0 to 5.10.0 
Bumps [eslint](https://github.com/eslint/eslint) from 5.9.0 to 5.10.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v5.9.0...v5.10.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-12-10 09:02:27 +00:00
Grzegorz Leoniec
22354ce865
Merge pull request #83 from Human-Connection/dependabot/npm_and_yarn/node-sass-4.11.0 
Bump node-sass from 4.10.0 to 4.11.0
 2018-12-10 10:00:07 +01:00
dependabot[bot]
f0ea0384c7
Bump node-sass from 4.10.0 to 4.11.0 
Bumps [node-sass](https://github.com/sass/node-sass) from 4.10.0 to 4.11.0.
- [Release notes](https://github.com/sass/node-sass/releases)
- [Changelog](https://github.com/sass/node-sass/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sass/node-sass/compare/v4.10.0...v4.11.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-12-10 04:29:38 +00:00
dependabot[bot]
9879dd54fc
Merge pull request #75 from Human-Connection/dependabot/submodules/API-97d640d 2018-12-10 04:21:53 +00:00
dependabot[bot]
4c9d906f47
Bump API from 8ea42b5 to 97d640d 
Bumps [API](https://github.com/Human-Connection/API) from `8ea42b5` to `97d640d`.
- [Release notes](https://github.com/Human-Connection/API/releases)
- [Commits](8ea42b5b40...97d640d583)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-12-10 04:21:25 +00:00
Robert Schäfer
0b01ab3d01 Merge remote-tracking branch 'origin/master' into admin-tags-and-categories 2018-12-10 00:53:31 +01:00
Robert Schäfer
6e9348a6d3 Set executable permission on trigger_build.sh 2018-12-10 00:30:31 +01:00
Robert Schäfer
4489bbe662 Use export for Travis variable for convenience 
This way, we don't need to set the environment variable in the
`trigger_build.sh` script.
 2018-12-10 00:28:56 +01:00
Robert Schäfer
0a8aadbb2d Check out a common branch through environment var 
This will be useful if we trigger the build through the Travis CI API
where we can alter the environment variables in the request.
 2018-12-10 00:17:34 +01:00
Grzegorz Leoniec
f43458ba3d record test runs to https://dashboard.cypress.io/#/projects/qa7fe2/runs 2018-12-09 23:04:16 +01:00
Robert Schäfer
579cc3492c Coyp over files from webapp repository 2018-12-09 23:04:16 +01:00
Robert Schäfer
33290c32e0 Add Nitro-Web and Nitro-Backend as submodules 2018-12-09 23:04:16 +01:00
Grzegorz Leoniec
faca6069ab
meged mochajs in 2018-12-09 18:40:25 +01:00
Grzegorz Leoniec
1823223281
merged master in 2018-12-09 18:38:58 +01:00
Grzegorz Leoniec
3802780ffd
record test runs to https://dashboard.cypress.io/#/projects/qa7fe2/runs 2018-12-09 18:02:00 +01:00
Grzegorz Leoniec
eda9dfafb8
Merge pull request #76 from Human-Connection/docker_compose_override 
Split development config from production config
 2018-12-08 23:42:26 +01:00
Grzegorz Leoniec
2284e88f90
Merge pull request #80 from Human-Connection/fix_refresh_bug 
Fix refresh bug
 2018-12-08 23:38:36 +01:00
Robert Schäfer
d461238d2e This should be the first green build 2018-12-08 23:19:13 +01:00
Robert Schäfer
64abd767e2 Merge branch 'fix_refresh_bug' into temporary_merge_branch 2018-12-08 23:18:48 +01:00
Robert Schäfer
25f3da15c6 Merge branch 'docker_compose_override' into temporary_merge_branch 2018-12-08 23:18:41 +01:00
Robert Schäfer
2fcbdcb436 Fix refresh bug 
This misconfiguration doesn't produce a bug without the docker
environment. Better to use docker also for development. Let's make it the
single source of truth.
 2018-12-08 23:15:22 +01:00
Robert Schäfer
da498b28f0 Volume for styleguide dependencies 
Otherwise you would have to install dependencies on your host system
which is bad practice.
 2018-12-08 23:14:12 +01:00
Robert Schäfer
01497dddaa Reduce verbosity of database seeding 2018-12-08 22:47:43 +01:00
Robert Schäfer
e102b6e3fe Update submodules 2018-12-08 22:12:04 +01:00
Robert Schäfer
d4d0eb88cf Fix wrong folder names 
@appinteractive same same, git-grep is your friend
 2018-12-08 15:45:16 +01:00
Robert Schäfer
db724e7834 Split development config from production config 
in `docker-compose.yml` and `docker-compose.override.yml`. This should speed
up builds e.g. on Travis CI, which does not need to sync folders or run
`yarn run dev` if the docker image was built recently. Also it should
make the build more reliable as it behaves more similar to our deployment.
 2018-12-08 15:45:02 +01:00
Robert Schäfer
7f389e4939 Fix wrong folder name 2018-12-08 15:44:20 +01:00
Robert Schäfer
8e7a9644c0 Split development config from production config 
in `docker-compose.yml` and `docker-compose.override.yml`. This should speed
up builds e.g. on Travis CI, which does not need to sync folders or run
`yarn run dev` if the docker image was built recently. Also it should
make the build more reliable as it behaves more similar to our deployment.
 2018-12-08 15:43:50 +01:00
Grzegorz Leoniec
d1d1b1dfc9
Merge branch 'master' into locations 2018-12-08 14:45:16 +01:00
Grzegorz Leoniec
902f2d4c17
Merge branch 'master' into admin-tags-and-categories 2018-12-08 14:45:00 +01:00
Grzegorz Leoniec
826d987fcd
Merge pull request #78 from Human-Connection/remove_xip_hack 
No need to call xip.io anymore
 2018-12-08 14:44:34 +01:00
Grzegorz Leoniec
aa77d6bd8e
Merge branch 'master' into remove_xip_hack 2018-12-08 14:44:22 +01:00
Grzegorz Leoniec
99a9d51596
Merge pull request #61 from Human-Connection/remove_xipio_hack 
Remove xip.io hack
 2018-12-08 14:44:08 +01:00