ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-13 07:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,022 Commits 117 Branches 1,511 Tags
Commit Graph

4022 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matt Rider
e04ab842bd Add service yaml for nginx(maintenance) service 2019-07-03 14:27:30 -03: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
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
db3221cec6
Merge pull request #948 from Human-Connection/dependabot/npm_and_yarn/backend/graphql-shield-6.0.2 
Bump graphql-shield from 5.6.2 to 6.0.2 in /backend
 2019-07-02 13:38:57 -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
mattwr18
97f31abccd
Merge pull request #905 from Human-Connection/850-api-mapbox-check-place-or-region 
region and place is no longer created twice.
 2019-07-02 12:18:12 -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
Robert Schäfer
0bc1444336 Explicitly define all comment mutations in schema 
Remove `postId` as part of the to-be-saved comment type.
 2019-07-02 15:11:21 +02:00
Robert Schäfer
cbc8fc8d83 Add missing German translations 2019-07-02 14:18:39 +02:00
Matt Rider
17ff9c4c0f Add caching rule to allow for upgrade 2019-07-02 08:36:47 -03:00
dependabot-preview[bot]
dfa41aa67f
Bump graphql-shield from 5.6.2 to 6.0.2 in /backend 
Bumps [graphql-shield](https://github.com/maticzav/graphql-shield) from 5.6.2 to 6.0.2.
- [Release notes](https://github.com/maticzav/graphql-shield/releases)
- [Commits](https://github.com/maticzav/graphql-shield/compare/v5.6.2...v6.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-02 04:22:58 +00:00
Ulf Gebhardt
3a961e5b77
Merge pull request #941 from Human-Connection/dependabot/docker/backend/node-12.5-alpine 
Bump node from 12.4-alpine to 12.5-alpine in /backend
 2019-07-02 01:25:34 +02:00
Ulf Gebhardt
55b598fb69
Merge pull request #942 from Human-Connection/dependabot/docker/webapp/node-12.5-alpine 
Bump node from 12.4-alpine to 12.5-alpine in /webapp
 2019-07-02 01:25:13 +02:00
Ulf Gebhardt
03eedfc836
Merge pull request #937 from Human-Connection/dependabot/npm_and_yarn/cypress-file-upload-3.2.0 
Bump cypress-file-upload from 3.1.4 to 3.2.0
 2019-07-02 01:24:41 +02:00
Matt Rider
b034d22732 Fix failing cypress test 2019-07-01 18:50:24 -03:00
Matt Rider
f302961376 Get categories working with UpdatePost, refactor 2019-07-01 18:00:55 -03:00
Matt Rider
b8ea32cfc1 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 778-categories-for-posts 2019-07-01 15:06:52 -03:00
mattwr18
730c18faec
Merge pull request #935 from Human-Connection/fix_cypher_injection 
Patch cypher injection vulnerability
 2019-07-01 12:30:31 -03:00
mattwr18
14b5109e78
Merge pull request #787 from Human-Connection/759-teaser-image-create-posts 
Add teaser image to contribution form
 2019-07-01 12:29:47 -03:00
Matt Rider
2edf99148d Remove test 
- we don't set the form language because we want to have the name of the language as a placeholder, not its code
 2019-07-01 08:22:46 -03:00
Matt Rider
51a7a0e5d8 Add back test accidentally deleted 2019-07-01 07:29:06 -03:00
senderfm
d7b423ec61 code variable designation changed from isActive to isCollapsed 2019-07-01 12:17:14 +02:00
senderfm
e255b71cc8 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 844-Comments-cannot-be-expanded-if-they-are-too-long 2019-07-01 11:19:01 +02:00
dependabot-preview[bot]
292b527ea2
Bump node from 12.4-alpine to 12.5-alpine in /webapp 
Bumps node from 12.4-alpine to 12.5-alpine.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-01 04:31:58 +00:00
dependabot-preview[bot]
2437d9100b
Bump node from 12.4-alpine to 12.5-alpine in /backend 
Bumps node from 12.4-alpine to 12.5-alpine.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-01 04:31:48 +00:00
dependabot-preview[bot]
9ac513ad45
Bump cypress-file-upload from 3.1.4 to 3.2.0 
Bumps [cypress-file-upload](https://github.com/abramenal/cypress-file-upload) from 3.1.4 to 3.2.0.
- [Release notes](https://github.com/abramenal/cypress-file-upload/releases)
- [Commits](https://github.com/abramenal/cypress-file-upload/compare/v3.1.4...v3.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-01 04:26:37 +00:00
mattwr18
2040c480fb
Merge pull request #930 from Human-Connection/dependabot/npm_and_yarn/backend/date-fns-2.0.0-beta.2 
Bump date-fns from 2.0.0-beta.1 to 2.0.0-beta.2 in /backend
 2019-06-29 22:54:26 -03:00
mattwr18
a57fdec86c
Merge pull request #928 from Human-Connection/dependabot/npm_and_yarn/webapp/date-fns-2.0.0-beta.2 
Bump date-fns from 2.0.0-alpha.37 to 2.0.0-beta.2 in /webapp
 2019-06-29 22:54:02 -03:00
mattwr18
9ac0c9b7cf
Merge pull request #924 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-2.6.7 
Bump apollo-server from 2.6.6 to 2.6.7 in /backend
 2019-06-29 22:53:39 -03:00
mattwr18
084447c743
Merge pull request #929 from Human-Connection/dependabot/npm_and_yarn/cypress-3.3.2 
Bump cypress from 3.3.1 to 3.3.2
 2019-06-29 22:53:13 -03:00
Wolfgang Huß
118e53fa02 Added a missing Deletable 2019-06-29 19:21:20 +02:00
Matt Rider
d6f0698ef7 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 759-teaser-image-create-posts 2019-06-29 13:53:37 -03:00
dependabot-preview[bot]
2e48a3529b
Bump date-fns from 2.0.0-alpha.37 to 2.0.0-beta.2 in /webapp 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.0.0-alpha.37 to 2.0.0-beta.2.
- [Release notes](https://github.com/date-fns/date-fns/releases)
- [Changelog](https://github.com/date-fns/date-fns/blob/master/CHANGELOG.md)
- [Commits](https://github.com/date-fns/date-fns/compare/v2.0.0-alpha.37...v2.0.0-beta.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-29 16:22:49 +00:00
Matt Rider
e06b05af90 Remove request for categories from CreatePost 2019-06-29 13:09:48 -03:00
Robert Schäfer
4e687a06ea Patch cypher injection vulnerability 
@mattwr18 this patches the vulnerability. However we should never do
string interpolation with user input.
 2019-06-29 13:48:40 +02:00
Matt Rider
865e2c0ec3 Refactor resolver, rename params 
- Use one cypher statement

Co-authored-by: Tirokk <wolle.huss@pjannto.com>
 2019-06-28 10:17:22 -03:00
senderfm
7879ec9233 clear bug of testcode remove 2019-06-28 11:21:41 +02:00
senderfm
ac6da2e42c fixed lint und test ok 2019-06-28 11:19:22 +02:00
senderfm
1b2396645f main menu changed to flex menu and responsively adapted, search edited 2019-06-28 09:01:47 +02:00
dependabot-preview[bot]
0271f95146
Bump date-fns from 2.0.0-beta.1 to 2.0.0-beta.2 in /backend 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.0.0-beta.1 to 2.0.0-beta.2.
- [Release notes](https://github.com/date-fns/date-fns/releases)
- [Changelog](https://github.com/date-fns/date-fns/blob/master/CHANGELOG.md)
- [Commits](https://github.com/date-fns/date-fns/compare/v2.0.0-beta.1...v2.0.0-beta.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-28 04:23:19 +00:00
dependabot-preview[bot]
5980249703
Bump cypress from 3.3.1 to 3.3.2 
Bumps [cypress](https://github.com/cypress-io/cypress) from 3.3.1 to 3.3.2.
- [Release notes](https://github.com/cypress-io/cypress/releases)
- [Commits](https://github.com/cypress-io/cypress/compare/v3.3.1...v3.3.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-28 04:22:52 +00:00
mattwr18
7763083bd6
Merge pull request #925 from Human-Connection/dependabot/npm_and_yarn/webapp/date-fns-2.0.0-beta.1 
Bump date-fns from 2.0.0-alpha.37 to 2.0.0-beta.1 in /webapp
 2019-06-27 18:18:13 -03:00
dependabot-preview[bot]
058eae515e
Bump apollo-server from 2.6.6 to 2.6.7 in /backend 
Bumps [apollo-server](https://github.com/apollographql/apollo-server) from 2.6.6 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.6.6...apollo-server@2.6.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-27 21:17:31 +00:00