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

3916 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Schäfer
3526dc3de0
Merge pull request #243 from Human-Connection/234-fix 
Should fix #234 + refactor domain to hostname
 2019-03-25 17:05:58 +01:00
Robert Schäfer
09b6cbaba5 Trigger rollout with a change to spec.template 
The documentation clearly says:
```
Note: A Deployment’s rollout is triggered if and only if the
Deployment’s pod template (that is, .spec.template) is changed, for
example if the labels or container images of the template are updated.
Other updates, such as scaling the Deployment, do not trigger a
rollout.
```

Read: https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#updating-a-deployment
 2019-03-25 16:47:08 +01:00
Robert Schäfer
dc85ed825d Fix lint 2019-03-25 16:39:45 +01:00
Robert Schäfer
aa8278d061 Proxy /.well-known/webfinger to backend 
@Mastercuber I hope this does not interfere with anything that uses
`/.well-known`, too. Would you suggest to proxy everything related to
webfinger to the backend?

My motivation for proxying webfinger is that you can search for
`someuser@nitro-staging.human-connection.org` instead of `someuser@nitro-staging.human-connection.org/activityPub`. This is better user experience in my opinion.
 2019-03-25 15:52:34 +01:00
Robert Schäfer
b32c85b2de Choose correct env var + proxy /activityPub 2019-03-25 15:52:34 +01:00
Robert Schäfer
ebb1c283b7 Refactor: Use URL.host instead of hostname 
This way, we don't have to manually add the port number.

cc @Mastercuber

Documentation: https://nodejs.org/api/url.html#url_urlobject_host
 2019-03-25 15:52:34 +01:00
Armin
a55b253784 Fix for previous commit 2019-03-25 15:37:05 +01:00
Armin
f2735e6275 Use host instead of hostname 2019-03-25 15:33:53 +01:00
Armin
b6b8f073b8 Second fix 2019-03-25 13:50:34 +01:00
Armin
5e4ff7cf9b Fix tests 2019-03-25 13:34:02 +01:00
Armin
1d5a8d3917 Should fix #234 + refactor domain to hostname 2019-03-25 13:15:37 +01:00
Martin Döring
ecbdfdfb55
Merge pull request #233 from Human-Connection/212-change-password 
[User profile] Change password
 2019-03-25 13:11:21 +01:00
Martin Doering
9faa28f3b3 Merge branch 'network-concept' of https://github.com/Human-Connection/Nitro-Documentation into network-concept 
Merged in intermediate changes from origin
 2019-03-25 11:55:54 +01:00
Martin Doering
9a92ea4661 Clarified Blacklist, Votes, Article List and Typos 2019-03-25 11:51:33 +01:00
Robert Schäfer
3c475c508d
Update concept/concept.md 
Co-Authored-By: datenbrei <datenbrei@users.noreply.github.com>
 2019-03-25 11:38:20 +01:00
Robert Schäfer
60dc63a972
Update concept/concept.md 
Yes, better!

Co-Authored-By: datenbrei <datenbrei@users.noreply.github.com>
 2019-03-25 11:37:43 +01:00
Robert Schäfer
60e7477e84
Update concept/concept.md 
Co-Authored-By: datenbrei <datenbrei@users.noreply.github.com>
 2019-03-25 10:12:29 +01:00
Robert Schäfer
dce9a3eea2 Better use defaultOrder only for posts 
E.g. comments should be ordered exactly the opposite way.
 2019-03-24 22:50:29 +01:00
Robert Schäfer
4d70ba68c5 Fix lint 2019-03-24 22:48:44 +01:00
Robert Schäfer
1cbab2a5c4 Implement #238 2019-03-24 19:58:17 +01:00
Robert Schäfer
b9a03b9b8e Expose #238 2019-03-24 16:58:54 +01:00
Robert Schäfer
16c58b77ba Fix cypress test, green 🥒 2019-03-23 02:04:17 +01:00
Robert Schäfer
22367417de Implement component test 2019-03-23 01:37:36 +01:00
Robert Schäfer
47e67fe334
Merge pull request #194 from Human-Connection/dependabot/npm_and_yarn/backend/@babel/core-7.4.0 
Bump @babel/core from 7.3.4 to 7.4.0 in /backend
 2019-03-22 20:41:50 +01:00
Robert Schäfer
369669012f
Merge pull request #198 from Human-Connection/dependabot/npm_and_yarn/backend/helmet-3.16.0 
Bump helmet from 3.15.1 to 3.16.0 in /backend
 2019-03-22 20:41:21 +01:00
Robert Schäfer
8827add1c7 Improve 🥒 *must* fail if not implemented 
cc @mattwr18
 2019-03-22 20:03:25 +01:00
Matt Rider
aca3562e22 Migrate PRs from archived repos to monorepo 
Co-authored-by: Joseph Ngugi <jngugi88@gmail.com>
 2019-03-22 14:44:43 -03:00
Robert Schäfer
26ab3b9bbe Oops, moved the components to a wrong folder 2019-03-22 16:03:34 +01:00
Matt Rider
eb2552c9a9 Add cypress test, update variables 
- change to confirmPassword to be more consistent with oldPassword, newPassword
- change to validate, $t is used for a function for translation
 2019-03-22 15:53:01 +01:00
Robert Schäfer
e0432b2fd9 Styleguide blocks development 
cc @appinteractive

We're trying to cross-validate two form fields and don't know how.
We (ie. @kachulio1, @aonomike, myself) gave up after
we discovered https://github.com/Human-Connection/Nitro-Styleguide/issues/46
 2019-03-22 15:53:01 +01:00
Robert Schäfer
51a1678a38 [ChangePassword] Implement disabled property 2019-03-22 15:53:01 +01:00
Robert Schäfer
a900435d58 Sketch ChangePassword component + spec 2019-03-22 15:53:01 +01:00
dependabot[bot]
e676a8fa1d
Bump @babel/core from 7.3.4 to 7.4.0 in /backend 
Bumps [@babel/core](https://github.com/babel/babel) from 7.3.4 to 7.4.0.
- [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.3.4...v7.4.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-22 14:51:22 +00:00
Robert Schäfer
3a768a66d5
Merge pull request #190 from Human-Connection/dependabot/npm_and_yarn/webapp/@vue/cli-shared-utils-3.5.1 
Bump @vue/cli-shared-utils from 3.4.1 to 3.5.1 in /webapp
 2019-03-22 15:49:48 +01:00
Robert Schäfer
53a2cc0429
Merge pull request #195 from Human-Connection/dependabot/npm_and_yarn/webapp/@babel/core-7.4.0 
Bump @babel/core from 7.3.4 to 7.4.0 in /webapp
 2019-03-22 15:48:49 +01:00
Martin Doering
e992a591e6 Network Concept added 2019-03-22 13:24:53 +01:00
Robert Schäfer
073659b2a1
Merge pull request #200 from Human-Connection/dependabot/npm_and_yarn/webapp/vue-svg-loader-0.12.0 
Bump vue-svg-loader from 0.11.0 to 0.12.0 in /webapp
 2019-03-22 12:50:26 +01:00
dependabot[bot]
05c80f5991
Bump helmet from 3.15.1 to 3.16.0 in /backend 
Bumps [helmet](https://github.com/helmetjs/helmet) from 3.15.1 to 3.16.0.
- [Release notes](https://github.com/helmetjs/helmet/releases)
- [Changelog](https://github.com/helmetjs/helmet/blob/master/CHANGELOG.md)
- [Commits](https://github.com/helmetjs/helmet/compare/v3.15.1...v3.16.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-22 11:28:48 +00:00
Robert Schäfer
dfdced941c
Merge pull request #192 from Human-Connection/dependabot/npm_and_yarn/backend/supertest-4.0.2 
Bump supertest from 4.0.0 to 4.0.2 in /backend
 2019-03-22 12:26:14 +01:00
Robert Schäfer
84ca1e474d
Merge pull request #197 from Human-Connection/dependabot/npm_and_yarn/backend/graphql-shield-5.3.1 
Bump graphql-shield from 5.3.0 to 5.3.1 in /backend
 2019-03-22 12:23:53 +01:00
dependabot[bot]
e1a0a9535b
Bump @babel/core from 7.3.4 to 7.4.0 in /webapp 
Bumps [@babel/core](https://github.com/babel/babel) from 7.3.4 to 7.4.0.
- [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.3.4...v7.4.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-22 11:11:14 +00:00
dependabot[bot]
1e67976ade
Bump @vue/cli-shared-utils from 3.4.1 to 3.5.1 in /webapp 
Bumps [@vue/cli-shared-utils](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-shared-utils) from 3.4.1 to 3.5.1.
- [Release notes](https://github.com/vuejs/vue-cli/releases)
- [Changelog](https://github.com/vuejs/vue-cli/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-cli/commits/v3.5.1/packages/@vue/cli-shared-utils)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-22 11:10:13 +00:00
Robert Schäfer
3c14fa5b69
Merge pull request #228 from Human-Connection/dependabot/npm_and_yarn/webapp/@babel/preset-env-7.4.2 
Bump @babel/preset-env from 7.3.4 to 7.4.2 in /webapp
 2019-03-22 12:07:29 +01:00
Robert Schäfer
a1848e8dda
Merge pull request #223 from Human-Connection/204-tests-for-rewarding-badges 
204 tests for rewarding badges
 2019-03-22 11:49:42 +01:00
dependabot[bot]
d8d0775308
Bump @babel/preset-env from 7.3.4 to 7.4.2 in /webapp 
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.3.4 to 7.4.2.
- [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.3.4...v7.4.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-22 09:55:09 +00:00
Robert Schäfer
1d977cac1c
Merge pull request #227 from Human-Connection/dependabot/npm_and_yarn/backend/@babel/preset-env-7.4.2 
Bump @babel/preset-env from 7.3.4 to 7.4.2 in /backend
 2019-03-22 10:52:21 +01:00
Robert Schäfer
292d3bba22
Merge pull request #191 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-5.15.3 
Bump eslint from 5.15.1 to 5.15.3 in /backend
 2019-03-22 10:51:44 +01:00
Robert Schäfer
3ef0e11847
Merge pull request #229 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-config-prettier-4.1.0 
Bump eslint-config-prettier from 3.6.0 to 4.1.0 in /webapp
 2019-03-22 10:51:24 +01:00
Robert Schäfer
6cbdad096d One more path fix 2019-03-22 10:19:43 +01:00
dependabot[bot]
fb5f31a1bb
Bump @babel/preset-env from 7.3.4 to 7.4.2 in /backend 
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.3.4 to 7.4.2.
- [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.3.4...v7.4.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-22 08:35:09 +00:00