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

10123 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wolfgang Huß
8d6e3794cf Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 553-delete-comment 2019-05-20 06:08:55 +02:00
Robert Schäfer
859d3189f4
Merge pull request #616 from Human-Connection/docs-fix_wrong_instructions_where_to_find_external_ip_address 
Fix wrong screenshot in kubernetes docs
 2019-05-19 19:38:48 +02:00
Robert Schäfer
d73ec2288e
Merge pull request #626 from Human-Connection/613_revert-empty-component-to-use-img-tag 
Refactor to use <img> instead of <hc-image> component for images
 2019-05-19 19:25:44 +02:00
ALau2088
c76e18fae3 Merge remote-tracking branch 'upstream/master' into 552-update_comment 2019-05-19 09:30:11 -07:00
Wolfgang Huß
f5d9bc9ae4 First proof of functionality for Delete Comment and Post via DeleteModal 2019-05-19 12:54:25 +02:00
ALau2088
3fe8e9a288 552-update_comment 2019-05-18 23:42:17 -07:00
ALau2088
7ddbab83e9 552-update_comment 2019-05-18 23:32:24 -07:00
Wolfgang Huß
7f83f775a7 Clean up the delete-menu stuff for Comments and Posts 2019-05-19 08:23:51 +02:00
Wolfgang Huß
2016a9445b Rename confirm callbacks 2019-05-19 07:42:55 +02:00
ALau2088
f7ef09acbf add UpdateComment mutation 2019-05-18 18:20:43 -07:00
Wolfgang Huß
388e9ff6b2 Go ahead with refactoring of DeleteModal in Comments and Posts 2019-05-18 15:56:07 +02:00
Ulf Gebhardt
341baa5e3b
fixed lint rules 2019-05-18 15:43:26 +02:00
Ulf Gebhardt
e3f9d1fe73
dependencies, fixes 2019-05-18 15:33:12 +02:00
Ulf Gebhardt
b4e7b9c40f
dependencies 2019-05-18 15:31:03 +02:00
Ulf Gebhardt
161921c911
fixes 2019-05-18 15:29:21 +02:00
Ulf Gebhardt
c7070fe4d6
fixes 2019-05-18 15:26:30 +02:00
Ulf Gebhardt
afbfd00bec
jest plugin for eslint 2019-05-18 15:22:49 +02:00
Ulf Gebhardt
9edce764e3
dependencies 2019-05-18 15:18:48 +02:00
Ulf Gebhardt
1dc8f1a15f
dependencies 2019-05-18 15:17:56 +02:00
Ulf Gebhardt
beab5571fd
included license and author in package.json 2019-05-18 15:12:31 +02:00
Ulf Gebhardt
d9bd264106
updated package json 2019-05-18 15:11:37 +02:00
Ulf Gebhardt
1e20bb4bce
updated package json 2019-05-18 15:08:57 +02:00
Ulf Gebhardt
c69e5915f1
backend pretier, more linting rules 2019-05-18 15:07:02 +02:00
Ulf Gebhardt
9dda50cfd8
define vscode extension recommendations 2019-05-18 14:41:32 +02:00
Ulf Gebhardt
1351f1cee9
adjusted vscode settings 2019-05-18 14:37:35 +02:00
Ulf Gebhardt
eb6a9b3034
added vscode settings to project, removed ignore from gitignore for .vscode folder 2019-05-18 14:36:35 +02:00
Ulf Gebhardt
35853c049e
prettier setting frontend 2019-05-18 14:35:58 +02:00
Robert Schäfer
03bf8fb3d5 Merge remote-tracking branch 'origin/master' into 399-user-profile-image-uploads 2019-05-18 13:52:24 +02:00
Robert Schäfer
b7632ed1fa Follow "folder with spec and component" convention 2019-05-18 13:49:13 +02:00
Ulf Gebhardt
df3ec92cf1
Merge branch 'master' into 2019/kw20/fix_post_card_design 2019-05-18 13:01:40 +02:00
Wolfgang Huß
9af8c2b46c Refactored handling of DeleteModal in Comments and Posts 2019-05-18 12:58:51 +02:00
Ulf Gebhardt
a7fb3f0095
linting 2019-05-18 12:36:51 +02:00
Ulf Gebhardt
eda58c25e3
ribbon tests, ribbon positions, fixed ssr stuff, fied missing language things 2019-05-18 12:33:41 +02:00
Wolfgang Huß
04deda57ae Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 553-delete-comment 2019-05-18 08:28:40 +02:00
Wolfgang Huß
8033556145 Investigation how to update the Comments List intelligent 2019-05-18 07:35:45 +02:00
Ulf Gebhardt
7095e38947
fixed post card design 2019-05-17 23:10:10 +02:00
Robert Schäfer
45694b0f89
Merge pull request #617 from Human-Connection/dependabot/npm_and_yarn/backend/node-fetch-2.6.0 
Bump node-fetch from 2.5.0 to 2.6.0 in /backend
 2019-05-17 22:41:15 +02:00
Robert Schäfer
170f1cc35b
Merge pull request #618 from Human-Connection/dependabot/npm_and_yarn/backend/express-4.17.0 
Bump express from 4.16.4 to 4.17.0 in /backend
 2019-05-17 22:40:51 +02:00
Robert Schäfer
ee1af607de
Merge pull request #619 from Human-Connection/dependabot/npm_and_yarn/webapp/express-4.17.0 
Bump express from 4.16.4 to 4.17.0 in /webapp
 2019-05-17 22:40:34 +02:00
Robert Schäfer
f952e131e0
Merge pull request #620 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-config-prettier-4.3.0 
Bump eslint-config-prettier from 4.2.0 to 4.3.0 in /webapp
 2019-05-17 22:40:08 +02:00
Robert Schäfer
d39241b9ec
Merge pull request #621 from Human-Connection/dependabot/npm_and_yarn/webapp/@nuxtjs/apollo-4.0.0-rc4.2 
Bump @nuxtjs/apollo from 4.0.0-rc4.1 to 4.0.0-rc4.2 in /webapp
 2019-05-17 22:39:49 +02:00
Matt Rider
abcabc460f Merge branch 'master' of github.com:Human-Connection/Human-Connection into 399-user-profile-image-uploads 2019-05-17 07:33:14 -03:00
dependabot[bot]
1095d98131
Bump @nuxtjs/apollo from 4.0.0-rc4.1 to 4.0.0-rc4.2 in /webapp 
Bumps [@nuxtjs/apollo](https://github.com/nuxt-community/apollo-module) from 4.0.0-rc4.1 to 4.0.0-rc4.2.
- [Release notes](https://github.com/nuxt-community/apollo-module/releases)
- [Commits](https://github.com/nuxt-community/apollo-module/compare/v4.0.0-rc.4.1...v4.0.0-rc.4.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-17 04:52:11 +00:00
dependabot[bot]
505098dd2d
Bump eslint-config-prettier from 4.2.0 to 4.3.0 in /webapp 
Bumps [eslint-config-prettier](https://github.com/prettier/eslint-config-prettier) from 4.2.0 to 4.3.0.
- [Release notes](https://github.com/prettier/eslint-config-prettier/releases)
- [Changelog](https://github.com/prettier/eslint-config-prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prettier/eslint-config-prettier/compare/v4.2.0...v4.3.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-17 04:51:47 +00:00
dependabot[bot]
8df1648c5e
Bump express from 4.16.4 to 4.17.0 in /webapp 
Bumps [express](https://github.com/expressjs/express) from 4.16.4 to 4.17.0.
- [Release notes](https://github.com/expressjs/express/releases)
- [Changelog](https://github.com/expressjs/express/blob/master/History.md)
- [Commits](https://github.com/expressjs/express/compare/4.16.4...4.17.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-17 04:51:10 +00:00
dependabot[bot]
4bc6363eff
Bump express from 4.16.4 to 4.17.0 in /backend 
Bumps [express](https://github.com/expressjs/express) from 4.16.4 to 4.17.0.
- [Release notes](https://github.com/expressjs/express/releases)
- [Changelog](https://github.com/expressjs/express/blob/master/History.md)
- [Commits](https://github.com/expressjs/express/compare/4.16.4...4.17.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-17 04:48:14 +00:00
dependabot[bot]
f0272ef8ed
Bump node-fetch from 2.5.0 to 2.6.0 in /backend 
Bumps [node-fetch](https://github.com/bitinn/node-fetch) from 2.5.0 to 2.6.0.
- [Release notes](https://github.com/bitinn/node-fetch/releases)
- [Changelog](https://github.com/bitinn/node-fetch/blob/master/CHANGELOG.md)
- [Commits](https://github.com/bitinn/node-fetch/compare/v2.5.0...v2.6.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-17 04:47:39 +00:00
mattwr18
3612eae2af
Merge pull request #610 from Human-Connection/dependabot/npm_and_yarn/webapp/tiptap-extensions-1.19.4 
Bump tiptap-extensions from 1.19.2 to 1.19.4 in /webapp
 2019-05-17 00:43:28 -03:00
Matt Rider
69a01d31f9 Merge branch 'dependabot/npm_and_yarn/webapp/tiptap-extensions-1.19.4' of github.com:Human-Connection/Human-Connection into dependabot/npm_and_yarn/webapp/tiptap-extensions-1.19.4 2019-05-17 00:11:27 -03:00
Matt Rider
6825c58e0a Merge branch 'master' of github.com:Human-Connection/Human-Connection into dependabot/npm_and_yarn/webapp/tiptap-extensions-1.19.4 2019-05-17 00:10:16 -03:00