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

4427 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Matt Rider
3dc5888364 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 967-filter-post-by-category 2019-07-08 10:21:33 -03: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
Matt Rider
98080b597d Style categories dropdown items 
- it's a vertical list, dealing with difficulties to make it horizontal
 2019-07-05 14:34:54 -03:00
Matt Rider
3b6db5f631 Set up posts in store, get working from FilterPosts 
- also, set it up to be mobile responsive
 2019-07-05 12:47:44 -03: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
dependabot-preview[bot]
069d461a41
Bump @babel/core from 7.4.5 to 7.5.0 in /webapp 
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-05 04:22:28 +00:00
dependabot-preview[bot]
d11881b2f4
Bump @babel/cli from 7.4.4 to 7.5.0 in /backend 
Bumps [@babel/cli](https://github.com/babel/babel) from 7.4.4 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.4...v7.5.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-05 04:22:06 +00:00
dependabot-preview[bot]
9d5ffa2480
Bump eslint-loader from 2.2.0 to 2.2.1 in /webapp 
Bumps [eslint-loader](https://github.com/webpack-contrib/eslint-loader) from 2.2.0 to 2.2.1.
- [Release notes](https://github.com/webpack-contrib/eslint-loader/releases)
- [Changelog](https://github.com/webpack-contrib/eslint-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/eslint-loader/compare/v2.2.0...v2.2.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-05 04:21:55 +00:00
mattwr18
cb19c43c22
Merge pull request #973 from Human-Connection/dependabot/npm_and_yarn/backend/graphql-14.4.2 
Bump graphql from 14.4.0 to 14.4.2 in /backend
 2019-07-04 21:53:20 -03:00
mattwr18
fdd8519fbe
Merge pull request #972 from Human-Connection/dependabot/npm_and_yarn/webapp/graphql-14.4.2 
Bump graphql from 14.4.0 to 14.4.2 in /webapp
 2019-07-04 21:52:58 -03:00
mattwr18
5747f67e3e
Merge pull request #971 from Human-Connection/dependabot/npm_and_yarn/webapp/vue/cli-shared-utils-3.9.0 
Bump @vue/cli-shared-utils from 3.8.0 to 3.9.0 in /webapp
 2019-07-04 21:52:37 -03:00
mattwr18
f307009e41
Merge pull request #970 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-loader-2.2.0 
Bump eslint-loader from 2.1.2 to 2.2.0 in /webapp
 2019-07-04 21:52:16 -03:00
Matt Rider
a875fe0d5e Merge branch 'master' of github.com:Human-Connection/Human-Connection into 967-filter-post-by-category 2019-07-04 20:33:24 -03:00
Matt Rider
65f11d6f98 Add functionality to filter posts by category 
- only filters if you send two requests :'(
 2019-07-04 20:32:16 -03:00
Wolfgang Huß
7211e781c7 Merge branch '779-tags-of-contribution-in-text' of https://github.com/Human-Connection/Human-Connection into 779-tags-of-contribution-in-text 2019-07-04 21:01:37 +02:00
Wolfgang Huß
ac17f3fe1c Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 779-tags-of-contribution-in-text 
# Conflicts:
#	backend/src/middleware/index.js
#	backend/src/schema/resolvers/passwordReset.js
 2019-07-04 20:56:14 +02:00