ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-13 07:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,408 Commits 117 Branches 1,511 Tags
Commit Graph

16408 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Robert Schäfer
92b06a352c Try write a component test for categories page 
@visualjerk could you help us out on this PR? I'm trying to get rid of
this error:
```
Unknown custom element: <ds-table> - did you register the component
correctly? For recursive components, make sure to provide the "name"
option.
```
How do we tell @vue/test-utils to stub globally registered components?

Second, I don't understand why the resulting html() of the categories
components looks so odd:

```
<h1 class="ds-heading ds-heading-h1" space="small" categories="[object Object],[object Object],[object Object],[object Object],[object Object]">
<h3 class="ds-card"><!----> <!----> <!----> <div class="ds-card-content">
  Themen / Kategorien
</div> <!----></h3> <ds-table data="" fields="icon,name,postCount" condensed=""></ds-table></h1>
```
Why on earth does the categories array end up in the `categories`
property of `ds-heading` component?

@visualjerk and @appinteractive have a look, please 😘
 2018-12-11 01:36:45 +01:00
Robert Schäfer
809a250f1f Run component tests on Travis CI 2018-12-11 00:33:09 +01:00
Robert Schäfer
30595f4b01 Merge branch 'several_updates_on_travis_yml' into admin-tags-and-categories 2018-12-11 00:32:40 +01:00
Robert Schäfer
5ed0954a4d Just ignore the test for the styleguide - passing 2018-12-11 00:31:42 +01:00
Robert Schäfer
ccb16fe795 Update @vue/test-utils + @vue/server-test-utils 2018-12-11 00:29:36 +01:00
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