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
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
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
8c1b1fcd25
Merge branch 'master' into admin-tags-and-categories
2018-12-08 14:43:04 +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
Grzegorz Leoniec
4283c4d729
fixed dublicated classes
2018-12-08 14:30:30 +01:00
Grzegorz Leoniec
f3bf82fdab
remove location related stuff
2018-12-08 14:02:35 +01:00
Grzegorz Leoniec
9042089d5e
fixed linting issues
2018-12-08 13:51:52 +01:00
Grzegorz Leoniec
c96e22492c
merged tags and categories in
2018-12-08 13:44:22 +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
e2c6305f21
fixing linting issues
2018-12-07 19:42:57 +01:00
Grzegorz Leoniec
572e5005d0
Merge remote-tracking branch 'origin/master' into locations
2018-12-07 19:30:11 +01:00
Grzegorz Leoniec
987fa33d58
fixed linting issues
2018-12-07 19:29:37 +01:00
Grzegorz Leoniec
d70042cd22
merged master in
2018-12-07 17:38:18 +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
ae96b95798
merged master in
2018-12-07 15:37:00 +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
Grzegorz Leoniec
34817378a4
Merge branch 'master' into locations
2018-12-04 21:32:54 +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
8ebaf41b77
Merge branch 'master' into locations
2018-11-30 14:35:10 +01:00
