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
2,351 Commits 117 Branches 1,511 Tags
Commit Graph

2351 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Schäfer
66f6987ab2
Merge pull request #383 from Human-Connection/338-fix_flaky_cucumbers 
Fix flaky cucumbers
 2019-04-04 12:49:23 +02:00
Robert Schäfer
3dbb41c6fa
Merge pull request #389 from Human-Connection/dependabot/npm_and_yarn/backend/jest-24.7.1 
Bump jest from 24.7.0 to 24.7.1 in /backend
 2019-04-04 10:58:04 +02:00
Robert Schäfer
a52213fb72
Merge branch 'master' into 338-fix_flaky_cucumbers 2019-04-04 10:57:27 +02:00
Robert Schäfer
83ad821bea
Merge pull request #380 from Human-Connection/344_fix_expired_kubeconfig 
Setup kubectl so it never expires
 2019-04-04 10:56:35 +02:00
dependabot[bot]
cdbe53650a
Bump jest from 24.7.0 to 24.7.1 in /backend 
Bumps [jest](https://github.com/facebook/jest) from 24.7.0 to 24.7.1.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/compare/v24.7.0...v24.7.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-04 04:54:15 +00:00
Robert Schäfer
4fade121cd Fix docker-compose routing 2019-04-03 21:52:21 +02:00
Robert Schäfer
6a356dd8b1 Hopefully fix flaky tags and categories test 2019-04-03 21:40:24 +02:00
Robert Schäfer
335d2cf1d6 Install kubectl via snap 2019-04-03 21:34:07 +02:00
Robert Schäfer
bd6ddff613 Install libgconf on Travis CI 2019-04-03 20:01:02 +02:00
Robert Schäfer
2dc5252f38 Install everything on Travis CI through snap 
This commit should setup kubectl in a way that it downloads a recent
`kubeconfig` from Digitial Ocean with `doctl`. Thus, deployments will
not fail after a kubeconfig has expired.

Since it seems to be the recommended way to install `doctl` through
[Snap](https://snapcraft.io/). I decided to install everything else
through snap too, including chrome and docker.
 2019-04-03 18:28:50 +02:00
Robert Schäfer
5f684479f0 Remove nyc altogether - it does not anyways 2019-04-03 18:25:19 +02:00
Robert Schäfer
6cd857c731 Sledgehammer cypress flaky tests with force 2019-04-03 17:19:15 +02:00
Robert Schäfer
1d41d6d070 Clean up webapp/package.json 2019-04-03 17:04:11 +02:00
Robert Schäfer
9663b23553 Add convenience package.json script for cypress 
This
* removes unnecessary backend server on :4001 (there is already one
running at :4000)
* allows to run `yarn run cypress:setup` independent of backend servers
 2019-04-03 17:03:46 +02:00
Robert Schäfer
81219096ff Update backend package.json 
cc @mattwr18 could you try out if `--watch` along with `yarn run
test:jest` works as expected? Before we did not use `yarn run dev` for
the test server and seeder. Now it should hot-reload your changed files
during testing.
 2019-04-03 16:44:41 +02:00
Robert Schäfer
2238afe73b
Merge pull request #367 from Human-Connection/dependabot/npm_and_yarn/backend/@babel/preset-env-7.4.3 
Bump @babel/preset-env from 7.4.2 to 7.4.3 in /backend
 2019-04-03 14:43:53 +02:00
Robert Schäfer
f26839fe8a
Merge pull request #364 from Human-Connection/dependabot/npm_and_yarn/backend/jest-24.7.0 
Bump jest from 24.6.0 to 24.7.0 in /backend
 2019-04-03 14:43:30 +02:00
Robert Schäfer
aba5335654
Merge pull request #369 from Human-Connection/dependabot/npm_and_yarn/webapp/@babel/preset-env-7.4.3 
Bump @babel/preset-env from 7.4.2 to 7.4.3 in /webapp
 2019-04-03 14:43:13 +02:00
Robert Schäfer
e680aa9b1a
Merge pull request #371 from Human-Connection/dependabot/npm_and_yarn/webapp/jest-24.7.0 
Bump jest from 24.6.0 to 24.7.0 in /webapp
 2019-04-03 14:42:53 +02:00
Ulf Gebhardt
e4cfa2403a
Merge pull request #360 from Human-Connection/2019/kw14/github_issue_pullrequest_templates 
2019/kw14/GitHub issue pullrequest templates
 2019-04-03 11:29:17 +02:00
Ulf Gebhardt
3ab1778d85
[typo] Englisch für Fortgeschrittene - English for runaways 2019-04-03 10:40:03 +02:00
dependabot[bot]
5d99803242
Bump jest from 24.6.0 to 24.7.0 in /webapp 
Bumps [jest](https://github.com/facebook/jest) from 24.6.0 to 24.7.0.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/compare/v24.6.0...v24.7.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-03 05:34:09 +00:00
dependabot[bot]
e7ee573c34
Bump @babel/preset-env from 7.4.2 to 7.4.3 in /webapp 
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.4.2 to 7.4.3.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.4.2...v7.4.3)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-03 05:33:13 +00:00
dependabot[bot]
853d47f05b
Bump @babel/preset-env from 7.4.2 to 7.4.3 in /backend 
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.4.2 to 7.4.3.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.4.2...v7.4.3)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-03 05:26:31 +00:00
dependabot[bot]
a08d38ea7f
Bump jest from 24.6.0 to 24.7.0 in /backend 
Bumps [jest](https://github.com/facebook/jest) from 24.6.0 to 24.7.0.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/compare/v24.6.0...v24.7.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-03 05:24:54 +00:00
Robert Schäfer
37014e6ac3
Merge pull request #355 from Human-Connection/dependabot/npm_and_yarn/webapp/jest-24.6.0 
Bump jest from 24.5.0 to 24.6.0 in /webapp
 2019-04-02 22:37:30 +02:00
dependabot[bot]
9d9beaef40
Bump jest from 24.5.0 to 24.6.0 in /webapp 
Bumps [jest](https://github.com/facebook/jest) from 24.5.0 to 24.6.0.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/compare/v24.5.0...v24.6.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-02 15:30:23 +00:00
Robert Schäfer
ba3c4b878e
Merge pull request #356 from Human-Connection/dependabot/npm_and_yarn/webapp/babel-jest-24.6.0 
Bump babel-jest from 24.5.0 to 24.6.0 in /webapp
 2019-04-02 17:27:29 +02:00
Robert Schäfer
9fc45216b0
Merge pull request #358 from Human-Connection/dependabot/npm_and_yarn/backend/jest-24.6.0 
Bump jest from 24.5.0 to 24.6.0 in /backend
 2019-04-02 17:26:46 +02:00
Robert Schäfer
b5abbead5b
Merge pull request #359 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-plugin-promise-4.1.1 
Bump eslint-plugin-promise from 4.0.1 to 4.1.1 in /backend
 2019-04-02 17:26:22 +02:00
Ulf Gebhardt
822b760a4f
new github templates for issues & prs 2019-04-02 12:21:05 +02:00
Ulf Gebhardt
145d4b43c7
removed .github folder from gitignore 2019-04-02 12:20:40 +02:00
dependabot[bot]
02113474dc
Bump eslint-plugin-promise from 4.0.1 to 4.1.1 in /backend 
Bumps [eslint-plugin-promise](https://github.com/xjamundx/eslint-plugin-promise) from 4.0.1 to 4.1.1.
- [Release notes](https://github.com/xjamundx/eslint-plugin-promise/releases)
- [Changelog](https://github.com/xjamundx/eslint-plugin-promise/blob/master/CHANGELOG.md)
- [Commits](https://github.com/xjamundx/eslint-plugin-promise/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-02 04:39:05 +00:00
dependabot[bot]
a2f7ed3cf5
Bump jest from 24.5.0 to 24.6.0 in /backend 
Bumps [jest](https://github.com/facebook/jest) from 24.5.0 to 24.6.0.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/compare/v24.5.0...v24.6.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-02 04:38:36 +00:00
dependabot[bot]
fd9de33dca
Bump babel-jest from 24.5.0 to 24.6.0 in /webapp 
Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest) from 24.5.0 to 24.6.0.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/commits/v24.6.0/packages/babel-jest)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-02 04:37:35 +00:00
Ulf Gebhardt
66b46f3c0d
Merge pull request #339 from Human-Connection/2019/kw14/fixed_windows_build_docu_fixed_server_start_text 
2019/kw14/fixed_windows_build_docu_fixed_server_start_text
 2019-04-01 19:17:26 +02:00
Robert Schäfer
3f44de4397
Update backend/README.md 
Co-Authored-By: ulfgebhardt <ulf.gebhardt@webcraft-media.de>
 2019-04-01 17:04:05 +02:00
Robert Schäfer
416da0d1ed
Update backend/README.md 
Co-Authored-By: ulfgebhardt <ulf.gebhardt@webcraft-media.de>
 2019-04-01 17:03:58 +02:00
Robert Schäfer
2218c4812c
Update backend/README.md 
Co-Authored-By: ulfgebhardt <ulf.gebhardt@webcraft-media.de>
 2019-04-01 17:03:41 +02:00
Robert Schäfer
50444ed6d1
Merge pull request #336 from Human-Connection/dependabot/npm_and_yarn/backend/slug-1.1.0 
Bump slug from 1.0.0 to 1.1.0 in /backend
 2019-04-01 16:41:14 +02:00
Robert Schäfer
aea25be7a5
Merge pull request #333 from Human-Connection/dependabot/npm_and_yarn/webapp/graphql-14.2.1 
Bump graphql from 14.2.0 to 14.2.1 in /webapp
 2019-04-01 16:40:23 +02:00
Robert Schäfer
2f5b145b5c
Merge pull request #334 from Human-Connection/dependabot/npm_and_yarn/backend/graphql-14.2.1 
Bump graphql from 14.2.0 to 14.2.1 in /backend
 2019-04-01 16:40:03 +02:00
Robert Schäfer
9405aace6e
Merge pull request #332 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-5.16.0 
Bump eslint from 5.15.3 to 5.16.0 in /webapp
 2019-04-01 16:38:43 +02:00
Robert Schäfer
e43c42e8e7
Merge pull request #335 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-5.16.0 
Bump eslint from 5.15.3 to 5.16.0 in /backend
 2019-04-01 16:37:59 +02:00
Ulf Gebhardt
cd6838a468
Fixed windows build, updated readme (prerequisites & requirements), fixed backend server start log output to reflect proper values 2019-04-01 16:32:08 +02:00
dependabot[bot]
4cbc6e8f9d
Bump slug from 1.0.0 to 1.1.0 in /backend 
Bumps [slug](https://github.com/Trott/node-slug) from 1.0.0 to 1.1.0.
- [Release notes](https://github.com/Trott/node-slug/releases)
- [Commits](https://github.com/Trott/node-slug/compare/v1.0.0...v1.1.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-01 04:52:22 +00:00
dependabot[bot]
00ba5413ca
Bump eslint from 5.15.3 to 5.16.0 in /backend 
Bumps [eslint](https://github.com/eslint/eslint) from 5.15.3 to 5.16.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.15.3...v5.16.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-01 04:51:37 +00:00
dependabot[bot]
bce853a89c
Bump graphql from 14.2.0 to 14.2.1 in /backend 
Bumps [graphql](https://github.com/graphql/graphql-js) from 14.2.0 to 14.2.1.
- [Release notes](https://github.com/graphql/graphql-js/releases)
- [Commits](https://github.com/graphql/graphql-js/compare/v14.2.0...v14.2.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-01 04:50:55 +00:00
dependabot[bot]
fcafdca306
Bump graphql from 14.2.0 to 14.2.1 in /webapp 
Bumps [graphql](https://github.com/graphql/graphql-js) from 14.2.0 to 14.2.1.
- [Release notes](https://github.com/graphql/graphql-js/releases)
- [Commits](https://github.com/graphql/graphql-js/compare/v14.2.0...v14.2.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-01 04:45:33 +00:00
dependabot[bot]
24eea67651
Bump eslint from 5.15.3 to 5.16.0 in /webapp 
Bumps [eslint](https://github.com/eslint/eslint) from 5.15.3 to 5.16.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.15.3...v5.16.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-01 04:45:06 +00:00