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

9189 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexander Friedland
25ac9b6cef
Merge pull request #2678 from Human-Connection/2659-text-change-for-signup 
Changes Text For SignUp
 2020-01-07 21:47:20 +01:00
Alexander Friedland
9c3f0f3d29
Merge pull request #2655 from Human-Connection/erhardtstiefel-patch-10-1 
Update de.json
 2020-01-07 21:45:26 +01:00
mattwr18
c297b83f87 Convert block/unblock to blacklist/whitelist 
- at the moment, we have implemented blocked like we want the
blacklist/whitelistUserContent to be, with the exception that is should
not be both ways. If I blacklist a user's content, they still see my
content in their news feed.
 2020-01-07 18:57:35 +01:00
Moriz Wahl
3f37b007d7 improved specs 2020-01-07 15:35:04 +01:00
mattwr18
df4c469c5c
Merge pull request #2682 from Human-Connection/dependabot/npm_and_yarn/backend/neode-0.3.7 
build(deps): bump neode from 0.3.6 to 0.3.7 in /backend
 2020-01-07 14:24:31 +01:00
dependabot-preview[bot]
a9b78ced7f
build(deps): bump neode from 0.3.6 to 0.3.7 in /backend 
Bumps [neode](https://github.com/adam-cowley/neode) from 0.3.6 to 0.3.7.
- [Release notes](https://github.com/adam-cowley/neode/releases)
- [Commits](https://github.com/adam-cowley/neode/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-07 11:33:15 +00:00
mattwr18
e2f99dbf51
Merge pull request #2546 from Human-Connection/update_neo4j_driver 
Update neo4j-driver
 2020-01-07 12:31:12 +01:00
mattwr18
303558d173 Merge branch 'master' of github.com:Human-Connection/Human-Connection into update_neo4j_driver 2020-01-07 11:38:01 +01:00
mattwr18
1c4651aa3f Merge branch 'update_neo4j_driver' of github.com:Human-Connection/Human-Connection into update_neo4j_driver 2020-01-07 11:09:16 +01:00
mattwr18
0d589cb4f9
Merge pull request #2681 from Human-Connection/dependabot/npm_and_yarn/backend/merge-graphql-schemas-1.7.6 
build(deps): bump merge-graphql-schemas from 1.7.5 to 1.7.6 in /backend
 2020-01-07 10:12:18 +01:00
mattwr18
076456e67f
Merge pull request #2680 from Human-Connection/dependabot/npm_and_yarn/backend/neo4j-graphql-js-2.11.3 
build(deps): bump neo4j-graphql-js from 2.11.2 to 2.11.3 in /backend
 2020-01-07 10:11:48 +01:00
mattwr18
f78fd9a762
Merge pull request #2679 from Human-Connection/dependabot/npm_and_yarn/neode-0.3.7 
build(deps-dev): bump neode from 0.3.6 to 0.3.7
 2020-01-07 10:08:57 +01:00
Moriz Wahl
57ab9128ea removed Hashtag search 2020-01-07 09:16:34 +01:00
ogerly
223d1ca3c0 remove console 2020-01-07 06:02:19 +01:00
ogerly
9aa680ce50 Fix lint 2020-01-07 05:40:09 +01:00
dependabot-preview[bot]
c956ed2cd9
build(deps): bump merge-graphql-schemas from 1.7.5 to 1.7.6 in /backend 
Bumps [merge-graphql-schemas](https://github.com/Urigo/merge-graphql-schemas) from 1.7.5 to 1.7.6.
- [Release notes](https://github.com/Urigo/merge-graphql-schemas/releases)
- [Changelog](https://github.com/Urigo/merge-graphql-schemas/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Urigo/merge-graphql-schemas/compare/1.7.5...1.7.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-07 04:18:19 +00:00
dependabot-preview[bot]
40e959a982
build(deps): bump neo4j-graphql-js from 2.11.2 to 2.11.3 in /backend 
Bumps [neo4j-graphql-js](https://github.com/neo4j-graphql/neo4j-graphql-js) from 2.11.2 to 2.11.3.
- [Release notes](https://github.com/neo4j-graphql/neo4j-graphql-js/releases)
- [Changelog](https://github.com/neo4j-graphql/neo4j-graphql-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/neo4j-graphql/neo4j-graphql-js/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-07 04:17:44 +00:00
dependabot-preview[bot]
6ca1b16172
build(deps-dev): bump neode from 0.3.6 to 0.3.7 
Bumps [neode](https://github.com/adam-cowley/neode) from 0.3.6 to 0.3.7.
- [Release notes](https://github.com/adam-cowley/neode/releases)
- [Commits](https://github.com/adam-cowley/neode/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-07 04:17:14 +00:00
Moriz Wahl
07b2b7ca3b Please pass the tests now 2020-01-06 18:36:59 +01:00
Robert Schäfer
a7b54bc6c5
Merge pull request #2674 from Human-Connection/2673-parse-xss-before-extracting-mentions-hashtags 
Parse xss before extracting mentions/hashtags
 2020-01-06 18:32:30 +01:00
ogerly
28839ee2b4 click on 'answered' to put the username of the respective comment into the editor as a mention. 2020-01-06 18:02:46 +01:00
Moriz Wahl
de6053dfa3 try again, cypress blackbox 2020-01-06 18:02:11 +01:00
Moriz Wahl
45e806defd Trying to fix cypress errors 2020-01-06 17:45:13 +01:00
Moriz Wahl
d4b3afb07f fixes #2659 2020-01-06 17:23:50 +01:00
Moriz Wahl
d2088a3a92 Missing SearchTag.vue added 2020-01-06 16:59:55 +01:00
Moriz Wahl
71c9d92aea query string for searches changed and basics for Hashtag search added 2020-01-06 16:46:43 +01:00
Moriz Wahl
bc3aa519d0 Specs for Searches 2020-01-06 16:10:28 +01:00
mattwr18
20a186db43
Merge pull request #2672 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-logo-5.8.13 
build(deps): bump metascraper-logo from 5.8.12 to 5.8.13 in /backend
 2020-01-06 15:45:52 +01:00
mattwr18
8ad5ac84f5
Merge pull request #2668 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-5.9.4 
build(deps): bump metascraper from 5.9.0 to 5.9.4 in /backend
 2020-01-06 15:45:38 +01:00
mattwr18
885fa8f1fc Parse xss before extracting mentions/hashtags 2020-01-06 15:39:26 +01:00
mattwr18
965b9a8c41
Merge pull request #2671 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-plugin-jest-23.3.0 
build(deps-dev): bump eslint-plugin-jest from 23.2.0 to 23.3.0 in /webapp
 2020-01-06 12:33:16 +01:00
mattwr18
f92a354a80
Merge pull request #2669 from Human-Connection/dependabot/npm_and_yarn/webapp/css-loader-3.4.1 
build(deps-dev): bump css-loader from 3.4.0 to 3.4.1 in /webapp
 2020-01-06 12:31:09 +01:00
dependabot-preview[bot]
d4f014c56c
build(deps): bump metascraper-logo from 5.8.12 to 5.8.13 in /backend 
Bumps [metascraper-logo](https://github.com/microlinkhq/metascraper) from 5.8.12 to 5.8.13.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.8.12...v5.8.13)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-06 10:27:34 +00:00
dependabot-preview[bot]
00faf1180c
build(deps): bump metascraper from 5.9.0 to 5.9.4 in /backend 
Bumps [metascraper](https://github.com/microlinkhq/metascraper) from 5.9.0 to 5.9.4.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.9.0...v5.9.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-06 10:27:33 +00:00
mattwr18
d8bb91d4ae
Merge pull request #2670 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-image-5.9.4 
build(deps): bump metascraper-image from 5.8.13 to 5.9.4 in /backend
 2020-01-06 11:25:26 +01:00
mattwr18
2628701423
Merge pull request #2667 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-testing-2.9.15 
build(deps-dev): bump apollo-server-testing from 2.9.14 to 2.9.15 in /backend
 2020-01-06 11:24:12 +01:00
dependabot-preview[bot]
3e925b5931
build(deps-dev): bump eslint-plugin-jest in /webapp 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 23.2.0 to 23.3.0.
- [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/v23.2.0...v23.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-06 10:23:32 +00:00
mattwr18
6eeff21bed
Merge pull request #2666 from Human-Connection/dependabot/npm_and_yarn/backend/neo4j-graphql-js-2.11.2 
build(deps): bump neo4j-graphql-js from 2.11.0 to 2.11.2 in /backend
 2020-01-06 11:23:13 +01:00
mattwr18
289d00dcc6
Merge pull request #2665 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-title-5.8.13 
build(deps): bump metascraper-title from 5.8.12 to 5.8.13 in /backend
 2020-01-06 11:22:23 +01:00
mattwr18
6483951ab2
Merge pull request #2664 from Human-Connection/dependabot/npm_and_yarn/backend/hapi/joi-17.0.0 
build(deps): bump @hapi/joi from 16.1.8 to 17.0.0 in /backend
 2020-01-06 11:21:53 +01:00
mattwr18
bba570aff2
Merge pull request #2663 from Human-Connection/dependabot/npm_and_yarn/cypress-file-upload-3.5.3 
build(deps-dev): bump cypress-file-upload from 3.5.1 to 3.5.3
 2020-01-06 11:21:17 +01:00
mattwr18
f315c846a0
Merge pull request #2662 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-plugin-jest-23.3.0 
build(deps-dev): bump eslint-plugin-jest from 23.1.1 to 23.3.0 in /backend
 2020-01-06 11:20:46 +01:00
ogerly
af760c17ea Merge branch '1188-Delete_teaser_image' of https://github.com/Human-Connection/Human-Connection into 1188-Delete_teaser_image 2020-01-06 11:07:46 +01:00
ogerly
f8c0a34194 Proposed changes accepted and incorporated 2020-01-06 11:06:59 +01:00
Alexander Friedland
cd8b244741
Update webapp/components/ContributionForm/ContributionForm.vue 
showDeleteButton change

Co-Authored-By: Robert Schäfer <git@roschaefer.de>
 2020-01-06 10:57:48 +01:00
ogerly
3599825436 merge master 2020-01-06 10:52:16 +01:00
ogerly
e61387bc5a change settings and rmove gitignore 2020-01-06 10:48:17 +01:00
ogerly
f06b04178f add vscode settings.json to gitignore 2020-01-06 10:43:32 +01:00
dependabot-preview[bot]
864ce58955
build(deps): bump metascraper-image from 5.8.13 to 5.9.4 in /backend 
Bumps [metascraper-image](https://github.com/microlinkhq/metascraper) from 5.8.13 to 5.9.4.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.8.13...v5.9.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-06 04:21:59 +00:00
dependabot-preview[bot]
b8b8d950fb
build(deps-dev): bump css-loader from 3.4.0 to 3.4.1 in /webapp 
Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 3.4.0 to 3.4.1.
- [Release notes](https://github.com/webpack-contrib/css-loader/releases)
- [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/css-loader/compare/v3.4.0...v3.4.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-06 04:21:35 +00:00