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

2378 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ulf Gebhardt
ea2499fafa
Merge branch 'master' into keep_private_rsa_key_secret 2019-04-05 19:59:15 +02:00
Wolfgang Huß
a995c84ddf Merge branch 'keep_private_rsa_key_secret' of https://github.com/Human-Connection/Human-Connection into keep_private_rsa_key_secret_TirNew 2019-04-05 18:43:47 +02:00
Wolfgang Huß
c4e57fc928 User to query for "publicKey" is generated on port "4001" 
But still no "publicKey" is generated.
So wished failing test shows not "publicKey" except other than "null".
 2019-04-05 18:32:11 +02:00
Wolfgang Huß
8713f61734 Added Tests to "user_management.spec.js" 
Implemented suppression of "publicKey", now commented out for testing approach.
Use port 4001 for querying, but forgot that I have to generate the user on the same port, before I can query it with generated "publicKey".
Do this in next commit.
 2019-04-05 17:44:43 +02:00
Ulf Gebhardt
c7cb5f3eec
Merge pull request #396 from Human-Connection/github_emojis 
Use github emojis if possible
 2019-04-05 16:07:08 +02:00
Robert Schäfer
c3b320380a
Merge pull request #368 from Human-Connection/dependabot/npm_and_yarn/webapp/@babel/core-7.4.3 
Bump @babel/core from 7.4.0 to 7.4.3 in /webapp
 2019-04-05 13:50:09 +02:00
dependabot[bot]
ca6acb4041
Bump @babel/core from 7.4.0 to 7.4.3 in /webapp 
Bumps [@babel/core](https://github.com/babel/babel) from 7.4.0 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.0...v7.4.3)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-05 10:45:58 +00:00
Robert Schäfer
2b725aec78
Merge pull request #390 from Human-Connection/dependabot/npm_and_yarn/webapp/jest-24.7.1 
Bump jest from 24.7.0 to 24.7.1 in /webapp
 2019-04-05 12:44:07 +02:00
Robert Schäfer
c543d7558c
Merge pull request #415 from Human-Connection/350-query_current_users_notifications 
350 query current users notifications
 2019-04-05 12:00:11 +02:00
dependabot[bot]
8b27a565e7
Bump jest from 24.7.0 to 24.7.1 in /webapp 
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-05 09:53:58 +00:00
Robert Schäfer
a6c2fcebde
Merge pull request #388 from Human-Connection/dependabot/npm_and_yarn/backend/babel-jest-24.7.1 
Bump babel-jest from 24.5.0 to 24.7.1 in /backend
 2019-04-05 11:51:49 +02:00
Robert Schäfer
710a8515d3 Fix lint 2019-04-05 11:20:19 +02:00
Robert Schäfer
bb3a8525db Only admins are allowed to query all notifications 2019-04-05 02:35:33 +02:00
Robert Schäfer
97d9b6d772 Add notifications to User 2019-04-05 02:35:33 +02:00
Robert Schäfer
03d4c93f96 Add Notification type 2019-04-05 02:35:33 +02:00
Robert Schäfer
8477e71c28 Sketch test for #350 2019-04-05 02:31:32 +02:00
Robert Schäfer
5f43fe77fc Fix kubeconfig filename 2019-04-05 00:25:59 +02:00
Robert Schäfer
8627d57906 Don't expose private RSA key 
cc @Tirokk
 2019-04-04 18:02:48 +02:00
Robert Schäfer
262655a1d8 Another try to setup doctl with the right version 2019-04-04 15:11:36 +02:00
Robert Schäfer
923d106c23 Does --classic install a newer version of doctl? 2019-04-04 15:03:11 +02:00
Robert Schäfer
d5b3383170 Use github emojis if possible 
cc @ulfgebhardt
Unicode emojis are not displayed in my browser for all font sizes.
Except in the title of an issue or PR you can use `:emoji:` notation
to let Github render emojis. That's possible in commit messages as well
as the description of PRs/issues and in comments.
 2019-04-04 14:56:23 +02:00
Robert Schäfer
8ce4e9be11
Merge pull request #363 from Human-Connection/dependabot/npm_and_yarn/backend/@babel/core-7.4.3 
Bump @babel/core from 7.4.0 to 7.4.3 in /backend
 2019-04-04 13:40:28 +02:00
Robert Schäfer
e899a91469 Create missing .kube/ directory 2019-04-04 13:41:03 +02:00
dependabot[bot]
c30f0164eb
Bump babel-jest from 24.5.0 to 24.7.1 in /backend 
Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest) from 24.5.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/commits/v24.7.1/packages/babel-jest)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-04 10:51:46 +00:00
dependabot[bot]
ae5f60684b
Bump @babel/core from 7.4.0 to 7.4.3 in /backend 
Bumps [@babel/core](https://github.com/babel/babel) from 7.4.0 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.0...v7.4.3)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-04 10:51:32 +00:00
Robert Schäfer
38949ac9b4
Merge pull request #391 from Human-Connection/dependabot/npm_and_yarn/webapp/babel-jest-24.7.1 
Bump babel-jest from 24.6.0 to 24.7.1 in /webapp
 2019-04-04 12:49:45 +02:00
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
dependabot[bot]
8bd437be07
Bump babel-jest from 24.6.0 to 24.7.1 in /webapp 
Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest) from 24.6.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/commits/v24.7.1/packages/babel-jest)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-04 09:00:25 +00: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