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

4123 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
dependabot-preview[bot]
db4122da09
Bump @babel/core from 7.5.0 to 7.5.4 in /webapp 
Bumps [@babel/core](https://github.com/babel/babel) from 7.5.0 to 7.5.4.
- [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.5.0...v7.5.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-10 04:24:01 +00:00
Robert Schäfer
54947b113d
Merge pull request #958 from Human-Connection/984-minimum-size-of-body 
🐛 [Bug]  full ads width use with small devices
 2019-07-10 02:00:29 +02:00
Robert Schäfer
310cc52ddf Don't remove the previous styling 2019-07-10 01:23:36 +02:00
Robert Schäfer
4b308886ff
Merge pull request #976 from Human-Connection/961-thumbnail-for-the-contributions-must-get-a-maximum-height 
large images are set to maximum height
 2019-07-09 23:21:27 +02:00
Robert Schäfer
4b09284011 Merge remote-tracking branch 'origin_https/master' into 984-minimum-size-of-body 2019-07-09 22:52:58 +02:00
Alexander Friedland
a4a875c2e1
Merge pull request #993 from Human-Connection/user_role_not_nullable 
User role not nullable
 2019-07-09 20:50:03 +02:00
Wolfgang Huß
458229eb77
Merge pull request #848 from Human-Connection/779-tags-of-contribution-in-text 
Tags in the Text of a Contribution like Mentions
 2019-07-09 16:47:17 +02:00
Robert Schäfer
a5f655058e
Merge pull request #989 from Human-Connection/fix_env_var_name 
Neo4j uses a different name for its env vars
 2019-07-09 15:21:22 +02:00
Robert Schäfer
5342f0d435
Merge pull request #995 from alina-beck/update-docs 
Update docs
 2019-07-09 15:19:52 +02:00
Robert Schäfer
c811461157
Merge pull request #998 from Human-Connection/dependabot/npm_and_yarn/backend/graphql-shield-6.0.3 
Bump graphql-shield from 6.0.2 to 6.0.3 in /backend
 2019-07-09 15:17:01 +02:00
Robert Schäfer
34f923ad97 Merge remote-tracking branch 'origin/master' into 779-tags-of-contribution-in-text 2019-07-09 14:40:59 +02:00
Robert Schäfer
6f24f066d6 Revert "Get rid of obsolete /search/hashtag page" 
This reverts commit ec19c732e5678544d8dfd50c25f2c33e5aeb217e.

Ok, native module URL cannot parse relative URLs. It ensures that all parts
of the URL are present. So I'll revert this to get the ball rolling. We
can refactor out the obsolete page later on.

FYI @Tirokk
 2019-07-09 14:39:28 +02:00
dependabot-preview[bot]
f5522d0e40
Bump graphql-shield from 6.0.2 to 6.0.3 in /backend 
Bumps [graphql-shield](https://github.com/maticzav/graphql-shield) from 6.0.2 to 6.0.3.
- [Release notes](https://github.com/maticzav/graphql-shield/releases)
- [Commits](https://github.com/maticzav/graphql-shield/compare/v6.0.2...v6.0.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-09 04:26:39 +00:00
mattwr18
54463f2a37
Merge pull request #988 from Human-Connection/dependabot/npm_and_yarn/backend/babel/core-7.5.0 
Bump @babel/core from 7.4.5 to 7.5.0 in /backend
 2019-07-08 21:44:16 -03:00
mattwr18
77c18bd7ce
Merge pull request #996 from Human-Connection/dependabot/npm_and_yarn/backend/babel/preset-env-7.5.2 
Bump @babel/preset-env from 7.4.5 to 7.5.2 in /backend
 2019-07-08 21:43:54 -03:00
Robert Schäfer
8303febc80 Merge remote-tracking branch 'origin/master' into 779-tags-of-contribution-in-text 2019-07-08 23:51:56 +02:00
dependabot-preview[bot]
96be771f3d
Bump @babel/preset-env from 7.4.5 to 7.5.2 in /backend 
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.4.5 to 7.5.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.4.5...v7.5.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-08 21:50:40 +00:00
dependabot-preview[bot]
5063f9a447
Bump @babel/core from 7.4.5 to 7.5.0 in /backend 
Bumps [@babel/core](https://github.com/babel/babel) from 7.4.5 to 7.5.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.4.5...v7.5.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-08 21:49:22 +00:00
Robert Schäfer
22b4e07c75
Merge pull request #987 from Human-Connection/dependabot/docker/backend/node-12.6-alpine 
Bump node from 12.5-alpine to 12.6-alpine in /backend
 2019-07-08 23:48:22 +02:00
Robert Schäfer
f36333c8ce
Merge pull request #985 from Human-Connection/dependabot/docker/webapp/node-12.6-alpine 
Bump node from 12.5-alpine to 12.6-alpine in /webapp
 2019-07-08 23:47:36 +02:00
Robert Schäfer
1602f2468c
Merge pull request #984 from Human-Connection/dependabot/npm_and_yarn/backend/babel/preset-env-7.5.0 
Bump @babel/preset-env from 7.4.5 to 7.5.0 in /backend
 2019-07-08 23:47:14 +02:00
Robert Schäfer
21054c9858
Merge pull request #983 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-plugin-jest-22.7.2 
Bump eslint-plugin-jest from 22.7.1 to 22.7.2 in /webapp
 2019-07-08 23:46:54 +02:00
Robert Schäfer
ca8a34e3f2
Merge pull request #982 from Human-Connection/dependabot/npm_and_yarn/backend/babel/node-7.5.0 
Bump @babel/node from 7.4.5 to 7.5.0 in /backend
 2019-07-08 23:46:33 +02:00
Robert Schäfer
01ee2f1475
Merge pull request #981 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-plugin-jest-22.7.2 
Bump eslint-plugin-jest from 22.7.1 to 22.7.2 in /backend
 2019-07-08 23:46:13 +02:00
Robert Schäfer
8aa61cf1b0
Merge pull request #980 from Human-Connection/dependabot/npm_and_yarn/webapp/babel/core-7.5.0 
Bump @babel/core from 7.4.5 to 7.5.0 in /webapp
 2019-07-08 23:45:54 +02:00
Robert Schäfer
090b3022fe
Merge pull request #979 from Human-Connection/dependabot/npm_and_yarn/backend/babel/cli-7.5.0 
Bump @babel/cli from 7.4.4 to 7.5.0 in /backend
 2019-07-08 23:45:29 +02:00
Robert Schäfer
7c3008a72d
Merge pull request #978 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-loader-2.2.1 
Bump eslint-loader from 2.2.0 to 2.2.1 in /webapp
 2019-07-08 23:45:10 +02:00
Robert Schäfer
f3ac218c73 Silly cypress cannot deal with fs npm module 
... a server-side npm package and does not work for the browser.
 2019-07-08 23:43:44 +02:00
Robert Schäfer
ec19c732e5 Get rid of obsolete /search/hashtag page 
@Tirokk there is this neat URL module: https://nodejs.org/api/url.html

It has convenience methods for adding query params. I'm just not quite
sure about browser compatibility though.
 2019-07-08 23:10:46 +02:00
Robert Schäfer
20c118eab1 Prefer nuxt-link component over events 
@Tirokk I believe the Logo should also reset the search and filter
settings. However, even the previous implementation did not behave in
that way. A click on the logo will bring you back to the index page but
it will not reset your filter settings.

I fixed this because `$router.push(...).go(...)` will certainly throw an
null pointer error.
 2019-07-08 22:54:17 +02:00
Robert Schäfer
a3de375fef neodes withDir seems incompatible with cypress 2019-07-08 22:07:30 +02:00
Robert Schäfer
e4173a24aa Fix backend tests 2019-07-08 19:50:19 +02:00
Alina Beck
4479431486 replace internal links in features doc 2019-07-08 19:27:30 +02:00
Wolfgang Huß
e69f292bd8 Hashtags restricted in the chars, in Editor Suggestions and Backend 
Refactor Seeding with Tag ids as Tag names.
In Frontend: Done as a suggestion with all the forbidden chars removed.
In Backend by Regex only the fitting links.
Rewrite backend test to make sure Hashtag „id“ is the name of the Hashtag.
Test for „https://www.example.org/#anchor“

Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2019-07-08 19:25:57 +02:00
Alina Beck
a1f28810b9 fix link in contributing readme 2019-07-08 19:14:46 +02:00
Alina Beck
1f9f7e205a remove "not required" line from webapp docs 2019-07-08 19:10:21 +02:00
Alina Beck
b2e68bf9df fix typo in webapp readme 2019-07-08 18:57:34 +02:00
Wolfgang Huß
8d648deda4 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 779-tags-of-contribution-in-text 2019-07-08 18:48:00 +02:00
Alina Beck
4725f41a0d update neo4j readme 2019-07-08 18:26:22 +02:00
Alina Beck
888da86c6d update instructions to edit docs 2019-07-08 18:03:54 +02:00
Robert Schäfer
e77bf31470 User role must be set 2019-07-08 16:51:17 +02:00
Robert Schäfer
99b6254303 Split neode models into own directory 2019-07-08 16:45:39 +02:00
Wolfgang Huß
ae2cf31733
Merge pull request #966 from Human-Connection/965-update-post-without-image-throws-error 
Remove request for image in UpdatePost mutation from UI
 2019-07-08 13:45:19 +02:00
Robert Schäfer
66740b0f55 Neo4j uses a different name for its env vars 2019-07-05 15:57:38 +02:00
dependabot-preview[bot]
27cc6c49af
Bump node from 12.5-alpine to 12.6-alpine in /backend 
Bumps node from 12.5-alpine to 12.6-alpine.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-05 04:24:30 +00:00
dependabot-preview[bot]
4c2619acb8
Bump node from 12.5-alpine to 12.6-alpine in /webapp 
Bumps node from 12.5-alpine to 12.6-alpine.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-05 04:24:17 +00:00
dependabot-preview[bot]
01c73e9996
Bump @babel/preset-env from 7.4.5 to 7.5.0 in /backend 
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.4.5 to 7.5.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.4.5...v7.5.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-05 04:24:02 +00:00
dependabot-preview[bot]
4436d06c69
Bump eslint-plugin-jest from 22.7.1 to 22.7.2 in /webapp 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 22.7.1 to 22.7.2.
- [Release notes](https://github.com/jest-community/eslint-plugin-jest/releases)
- [Changelog](https://github.com/jest-community/eslint-plugin-jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jest-community/eslint-plugin-jest/compare/v22.7.1...v22.7.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-05 04:23:31 +00:00
dependabot-preview[bot]
7f054809d6
Bump @babel/node from 7.4.5 to 7.5.0 in /backend 
Bumps [@babel/node](https://github.com/babel/babel) from 7.4.5 to 7.5.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.4.5...v7.5.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-05 04:23:30 +00:00
dependabot-preview[bot]
c0f7b48a07
Bump eslint-plugin-jest from 22.7.1 to 22.7.2 in /backend 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 22.7.1 to 22.7.2.
- [Release notes](https://github.com/jest-community/eslint-plugin-jest/releases)
- [Changelog](https://github.com/jest-community/eslint-plugin-jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jest-community/eslint-plugin-jest/compare/v22.7.1...v22.7.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-05 04:22:52 +00:00