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

197 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Schäfer
0922e0cfda Clone+install backend at $TRAVIS_BRANCH in build 2018-12-11 18:26:35 +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
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
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
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
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
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
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
deb1fb5953
Merge pull request #77 from Human-Connection/fix_accessibility_for_cypress 
Bind name to name instead of model
 2018-12-08 14:36:54 +01:00
Robert Schäfer
d7b9dc1b23 No need to call xip.io anymore 
After https://github.com/Human-Connection/Nitro-Backend/pull/61
the xip.io URL has become obsolete
 2018-12-08 13:23:49 +01:00
Robert Schäfer
1fb8db2972 Bind name to name instead of model 
Apparently this slipped through somehow in
https://github.com/Human-Connection/Nitro-Web/pull/13
 2018-12-08 12:46:51 +01:00
Grzegorz Leoniec
987fa33d58
fixed linting issues 2018-12-07 19:29:37 +01:00
Grzegorz Leoniec
165d41c413
Merge pull request #75 from Human-Connection/upgrade-styleguide 
Upgraded Styleguide
 2018-12-07 17:31:12 +01:00
Grzegorz Leoniec
ff82035555
format styleguide config files 2018-12-07 17:20:40 +01:00
Grzegorz Leoniec
32dd2e4d4b
fixed whitespace 2018-12-07 16:11:30 +01:00
Grzegorz Leoniec
2ef13980a6
upgrade styleguide the second 2018-12-07 16:09:23 +01:00
Grzegorz Leoniec
0440d06e54
Merge remote-tracking branch 'origin/master' into upgrade-styleguide 2018-12-07 15:33:03 +01:00
Grzegorz Leoniec
53a45a38e2
upgraded partial of styleguide 2018-12-07 15:21:42 +01:00
Grzegorz Leoniec
f128dc3701
Merge pull request #68 from Human-Connection/tagged_deployments 
Copy+paste deployment configuration from backend
 2018-12-06 16:37:54 +01:00
Grzegorz Leoniec
43ab84ee36
Merge branch 'master' into tagged_deployments 2018-12-06 16:37:30 +01:00
Grzegorz Leoniec
7bce96c171
Merge pull request #13 from Human-Connection/integration-testing 
Preparation for integration testing
 2018-12-06 16:35:36 +01:00
Robert Schäfer
364fa73cc2
Fix merge accident 2018-12-06 15:22:25 +01:00
Robert Schäfer
7aa2befc94 Remove cypress.json (forgot that) 2018-12-06 15:20:47 +01:00
Robert Schäfer
6415426949 Merge remote-tracking branch 'origin/master' into integration-testing 2018-12-06 15:18:12 +01:00
Robert Schäfer
38f27743f2 Remove remains of cypress 
I love cypress already. However my suggestion is to create a separate
repository that includes `backend` and `web` run full stack tests from
there. It is possible to trigger builds in other repositories on Travis
CI. So here is my suggestion: We agree to have matching branch names in
all related repositories, so `branch-1` in repo `web`, `backend` and
`human-connection`.

As a start, the developer has to manually update the submodules in the
meta repository and trigger a build to run fullstack tests. In the
future we might automate this process by triggering builds in other
repos. That's possible on Travis CI, see:
https://docs.travis-ci.com/user/triggering-builds/

See each repository is responsible to keep their set of unit/integration
tests but the meta repository is responsible of carrying out full stack
testing.

@appinteractive your opinion?
 2018-12-06 15:15:33 +01:00
Robert Schäfer
8f42a18729
Merge pull request #69 from Human-Connection/dependabot/npm_and_yarn/eslint-plugin-vue-5.0.0 
Bump eslint-plugin-vue from 4.7.1 to 5.0.0
 2018-12-04 23:17:40 +01:00
JB
56ed20f3bf Use kebab-case for components in templates 2018-12-04 22:02:15 +01:00
dependabot[bot]
05dcfab27a
Bump eslint-plugin-vue from 4.7.1 to 5.0.0 
Bumps [eslint-plugin-vue](https://github.com/vuejs/eslint-plugin-vue) from 4.7.1 to 5.0.0.
- [Release notes](https://github.com/vuejs/eslint-plugin-vue/releases)
- [Commits](https://github.com/vuejs/eslint-plugin-vue/compare/v4.7.1...v5.0.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-12-04 04:36:22 +00:00
Robert Schäfer
eb29311cbb Copy+paste deployment configuration from backend 
See these commits:
5eae8a89785798519aec66fb708389f6e5ea0327
1b8edc22ff8b900c45486b815a8c9d4465e7edb7
 2018-12-04 01:01:28 +01:00
Grzegorz Leoniec
ba312ac5e0 vue-izitoast@1.1.2 2018-12-03 12:13:00 +01:00
Grzegorz Leoniec
20fcac8567
Merge pull request #64 from Human-Connection/adapt-styleguide-docs 
adapt docs to styleguide integration
 2018-11-30 15:45:24 +01:00
mediadivision
536defa1a4 Merge remote-tracking branch 'origin/adapt-styleguide-docs' into adapt-styleguide-docs 2018-11-30 15:06:32 +01:00
mediadivision
4ba0e82b71 adapt docs to styleguide integration 2018-11-30 15:06:21 +01:00
Grzegorz Leoniec
77cbf410d6
Merge branch 'master' into integration-testing 2018-11-30 14:35:31 +01:00
Grzegorz Leoniec
86b4684c1d
Merge branch 'master' into adapt-styleguide-docs 2018-11-30 14:34:28 +01:00
Grzegorz Leoniec
22200e6d3b
updated .gitignore 2018-11-30 12:36:52 +01:00
mediadivision
f0b34ab274 adapt docs to styleguide integration 2018-11-30 12:35:39 +01:00
Grzegorz Leoniec
bcc8b170c0 Update issue templates 2018-11-30 12:32:23 +01:00
Grzegorz Leoniec
7f7d2c2c2f
Merge branch 'master' into integration-testing 2018-11-30 12:28:40 +01:00
Grzegorz Leoniec
56da202ed5
Merge pull request #55 from Human-Connection/better-styleguide-integration 
Integrate styleguide with hot reload
 2018-11-30 12:27:59 +01:00
Grzegorz Leoniec
cc112e373e
Merge branch 'master' into better-styleguide-integration 2018-11-30 10:35:16 +01:00