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

836 Commits

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
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
5342f0d435
Merge pull request #995 from alina-beck/update-docs 
Update docs
 2019-07-09 15:19:52 +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
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
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
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
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
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
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
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
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
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
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]
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]
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]
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
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
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
Wolfgang Huß
1c8dac7359 Get the links of the Tags in the Post as a URL driven query to work 
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2019-07-04 19:55:06 +02:00
dependabot-preview[bot]
de6a57ebe7
Bump graphql from 14.4.0 to 14.4.2 in /webapp 
Bumps [graphql](https://github.com/graphql/graphql-js) from 14.4.0 to 14.4.2.
- [Release notes](https://github.com/graphql/graphql-js/releases)
- [Commits](https://github.com/graphql/graphql-js/compare/v14.4.0...v14.4.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-04 10:20:48 +00:00
mattwr18
063ba642a0
Merge pull request #945 from Human-Connection/943_bring_user_mutation_under_control 
943 bring user mutation under control
 2019-07-04 07:18:29 -03:00
senderfm
8de9516b96 large images are set to maximum height fix lint 2019-07-04 11:06:10 +02:00
senderfm
9d6d47cebb large images are set to maximum height 2019-07-04 10:22:03 +02:00
dependabot-preview[bot]
842df06754
Bump @vue/cli-shared-utils from 3.8.0 to 3.9.0 in /webapp 
Bumps [@vue/cli-shared-utils](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-shared-utils) from 3.8.0 to 3.9.0.
- [Release notes](https://github.com/vuejs/vue-cli/releases)
- [Changelog](https://github.com/vuejs/vue-cli/blob/v3.9.0/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-cli/commits/v3.9.0/packages/@vue/cli-shared-utils)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-04 04:30:49 +00:00
dependabot-preview[bot]
450555f658
Bump eslint-loader from 2.1.2 to 2.2.0 in /webapp 
Bumps [eslint-loader](https://github.com/webpack-contrib/eslint-loader) from 2.1.2 to 2.2.0.
- [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/2.1.2...v2.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-04 04:29:12 +00:00
Matt Rider
b187fbb7b2 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 779-tags-of-contribution-in-text 2019-07-03 16:30:15 -03:00
Matt Rider
daaa979c99 Remove request for image 
- we do not need to request it and if there is none it throws an error
 2019-07-03 16:20:30 -03:00
Robert Schäfer
10ae4abaae Use neode to bring User mutations under control 
This commit takes all backend changes for signup and invite feature. I
was working on these features and removed the generated mutations for
type user along the way.
 2019-07-03 15:58:42 +02:00
senderfm
d108ee5bab long links and content is wrapped 2019-07-03 15:30:21 +02:00
senderfm
ccafc8709c fixed a bug 2019-07-03 12:29:24 +02:00
senderfm
0c1403dda5 fix conflict 2019-07-03 10:06:48 +02:00
Alexander Friedland
76388d4c4b
Merge pull request #908 from Human-Connection/785-reporting-a-user-post-or-comment 
the one-time reporting of a user, post or comment
 2019-07-03 08:44:19 +02:00
senderfm
91f9aacb79 full ads width use with small devices 2019-07-03 08:26:15 +02:00
Robert Schäfer
a4dd65ab40
Merge pull request #955 from Human-Connection/717-comment-display-and-design 
Add basic styling for comment list
 2019-07-03 00:48:49 +02:00
Matt Rider
2407f0b0d1 Add basic styling for comment list 2019-07-02 19:14:18 -03:00
Matt Rider
1c1a390d0c Refactor code to extract query to it's own file 2019-07-02 18:38:41 -03:00
senderfm
ffb261b71c load long content after save 2019-07-02 18:18:18 +02:00
mattwr18
7fa3cc7709
Merge pull request #919 from Human-Connection/778-categories-for-posts 
Post with categories
 2019-07-02 12:20:43 -03:00
mattwr18
82c08b17b4
Merge pull request #933 from Human-Connection/907-Mobile-Responsive-Menu-Navbar 
907 mobile responsive menu navbar
 2019-07-02 12:18:59 -03:00
Matt Rider
677f657b2e Update schemas, fix typo 
Co-authored-by: Robert Schäfer <git@roschaefer.de>
 2019-07-02 10:40:32 -03:00