IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2026-01-16 01:44:37 +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
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
Matt Rider
eded1a5f7b Merge branch 'master' of github.com:Human-Connection/Human-Connection into 779-tags-of-contribution-in-text 2019-07-04 10:58:58 -03: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
dependabot-preview[bot]
7fbf634ff4
Bump graphql from 14.4.0 to 14.4.2 in /backend 
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:38 +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
Wolfgang Huß
83c4a1c638
Merge pull request #963 from Human-Connection/716-Postcar-content-excerpt-overflow 
long links and content is wrapped
 2019-07-04 08:11:43 +02:00
Wolfgang Huß
4b1bcdc0f9
Merge pull request #951 from Human-Connection/805-remove-unused-query 
Remove unused query as cleanup
 2019-07-04 08:09:58 +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
bb93052b88 Add FilterPosts dropdown with category names 2019-07-03 19:46:49 -03:00
Matt Rider
c6b261853f Add test for filter posts by category 2019-07-03 19:46:26 -03:00
Robert Schäfer
8b991ea686 Less log output 2019-07-03 23:22:31 +02:00
Robert Schäfer
09ff79763d Follow @mattwr18's other suggestion 2019-07-03 23:20:36 +02:00
senderfm
07b8116447 Update of polish locales 2019-07-03 22:51:39 +02:00
Robert Schäfer
ef46f71c0d Follow @mattwr18 code review 👍 2019-07-03 22:22:42 +02:00
Matt Rider
e7b70ce7cd Fix failing test after new implementation merged in 2019-07-03 17:08:47 -03: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
Matt Rider
ed658e9d32 Dockerize embed, kubernetes config, add back deployment .env 2019-07-03 11:12:43 -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
Matt Rider
eabb58e851 Merge in Nitro-Embed 2019-07-03 08:51:39 -03:00
Matt Rider
7a3694aff4 Merging embed to master 2019-07-03 08:47:45 -03:00
Matt Rider
089b07c3e0 Merging Human-Connection to master 2019-07-03 08:47:30 -03:00
Matt Rider
cc6819e77b Root commit for master branch 2019-07-03 08:47:30 -03:00
senderfm
ccafc8709c fixed a bug 2019-07-03 12:29:24 +02:00
Alexander Friedland
324330ad8e
Merge pull request #864 from Human-Connection/844-Comments-cannot-be-expanded-if-they-are-too-long 
🐛 [Bug] :  long comments can be folded up and down
 2019-07-03 10:52:19 +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
Robert Schäfer
47732b3e13
Merge pull request #954 from Human-Connection/765-refactor-to-extract-query 
Refactor code to extract query to it's own file
 2019-07-03 00:31:00 +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
mattwr18
5091fe5759
Merge pull request #76 from Human-Connection/dependabot/npm_and_yarn/metascraper-soundcloud-5.5.3 
Bump metascraper-soundcloud from 4.8.5 to 5.5.3
 2019-07-02 17:00:06 -03:00
mattwr18
638f1f3782
Merge pull request #75 from Human-Connection/dependabot/npm_and_yarn/apollo-server-2.6.7 
Bump apollo-server from 2.3.1 to 2.6.7
 2019-07-02 16:59:55 -03:00
mattwr18
27eb5a2156
Merge pull request #73 from Human-Connection/dependabot/npm_and_yarn/metascraper-url-5.5.0 
Bump metascraper-url from 4.8.5 to 5.5.0
 2019-07-02 16:59:43 -03:00
Matt Rider
93e82de8f1 Merge branch 'master' of github.com:Human-Connection/Nitro-Embed into dependabot/npm_and_yarn/metascraper-url-5.5.0 2019-07-02 16:59:16 -03:00
dependabot-preview[bot]
721c75eeea
Bump metascraper-soundcloud from 4.8.5 to 5.5.3 
Bumps [metascraper-soundcloud](https://github.com/microlinkhq/metascraper-soundcloud) from 4.8.5 to 5.5.3.
- [Release notes](https://github.com/microlinkhq/metascraper-soundcloud/releases)
- [Commits](https://github.com/microlinkhq/metascraper-soundcloud/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-02 19:58:37 +00:00
mattwr18
46edb248a1
Merge pull request #72 from Human-Connection/dependabot/npm_and_yarn/metascraper-video-5.5.0 
Bump metascraper-video from 4.8.5 to 5.5.0
 2019-07-02 16:58:00 -03:00
mattwr18
0e89f27a07
Merge pull request #71 from Human-Connection/dependabot/npm_and_yarn/metascraper-audio-5.5.0 
Bump metascraper-audio from 4.8.5 to 5.5.0
 2019-07-02 16:57:49 -03:00
mattwr18
a22edd9cbf
Merge pull request #69 from Human-Connection/dependabot/npm_and_yarn/metascraper-logo-5.5.0 
Bump metascraper-logo from 4.8.5 to 5.5.0
 2019-07-02 16:57:39 -03:00
mattwr18
acfc9569f1
Merge pull request #25 from Human-Connection/dependabot/npm_and_yarn/metascraper-clearbit-logo-5.3.0 
Bump metascraper-clearbit-logo from 4.8.5 to 5.3.0
 2019-07-02 16:57:26 -03:00
mattwr18
d6333314a9
Merge pull request #67 from Human-Connection/dependabot/npm_and_yarn/metascraper-description-5.5.0 
Bump metascraper-description from 4.8.5 to 5.5.0
 2019-07-02 16:57:04 -03:00
Matt Rider
bc9c21c662 Merge branch 'dependabot/npm_and_yarn/metascraper-description-5.5.0' of github.com:Human-Connection/Nitro-Embed into dependabot/npm_and_yarn/metascraper-description-5.5.0 2019-07-02 16:56:43 -03:00
Matt Rider
05db6fe168 Merge branch 'master' of github.com:Human-Connection/Nitro-Embed into dependabot/npm_and_yarn/metascraper-description-5.5.0 2019-07-02 16:56:18 -03:00
dependabot-preview[bot]
b8725f1591
Bump metascraper-url from 4.8.5 to 5.5.0 
Bumps [metascraper-url](https://github.com/microlinkhq/metascraper) from 4.8.5 to 5.5.0.
- [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/v4.8.5...v5.5.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-02 19:56:09 +00:00
dependabot-preview[bot]
af8ed1c007
Bump apollo-server from 2.3.1 to 2.6.7 
Bumps [apollo-server](https://github.com/apollographql/apollo-server) from 2.3.1 to 2.6.7.
- [Release notes](https://github.com/apollographql/apollo-server/releases)
- [Changelog](https://github.com/apollographql/apollo-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-server/compare/apollo-server@2.3.1...apollo-server@2.6.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-02 19:56:08 +00:00