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

4823 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wolfgang Huß
c2357d32b3 Fixed broken Editor tests without breaking the Mentions and the Hashtags in the Editor 2019-08-15 07:52:49 +02:00
Wolfgang Huß
e8c1a5fe8d Write backend tests 2019-08-14 18:05:13 +02:00
Wolfgang Huß
43c2764fcf Fix mentions and hashtags in editor 2019-08-14 18:05:03 +02:00
Wolfgang Huß
c5ff3b5c6d Fixing lint console.log 2019-08-14 13:24:30 +02:00
Wolfgang Huß
67f25104f4 Fixing lint 2019-08-14 13:22:01 +02:00
Wolfgang Huß
825a5f235a Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1017-send-out-notifications-on-create-omment 2019-08-14 13:10:19 +02:00
mattwr18
0213eec4e2
Merge pull request #1244 from Human-Connection/451-lokalise-unlocalised-texts-20190812 
🍰 454 Lokalise / translate all unlocalised Texts / Translations / Languages
 2019-08-14 12:01:56 +02:00
Wolfgang Huß
25981e0f35 Corrected Cypress test 2019-08-14 08:55:44 +02:00
Wolfgang Huß
ab7d158b26 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 451-lokalise-unlocalised-texts-20190812 2019-08-14 08:24:29 +02:00
Wolfgang Huß
bcb66b0cb3 Corrected English translations to @mattwr18 suggestions 2019-08-14 08:23:54 +02:00
Robert Schäfer
f711a9c288
Merge pull request #1251 from Human-Connection/dependabot/npm_and_yarn/webapp/storybook/vue-5.1.11 
Bump @storybook/vue from 5.1.10 to 5.1.11 in /webapp
 2019-08-13 12:16:55 +02:00
Robert Schäfer
658c5aff52
Merge pull request #1250 from Human-Connection/dependabot/npm_and_yarn/webapp/storybook/addon-a11y-5.1.11 
Bump @storybook/addon-a11y from 5.1.10 to 5.1.11 in /webapp
 2019-08-13 12:16:19 +02:00
Robert Schäfer
1a09354bc5
Merge pull request #1255 from Human-Connection/consistent-naming-conventions 
Maintain consistent naming/punctuation conventions
 2019-08-13 12:16:00 +02:00
Matt Rider
3eee50d952 Maintain consistent naming/punctuation conventions 2019-08-13 11:24:55 +02:00
Robert Schäfer
5c0432d855
Merge pull request #1253 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-plugin-jest-22.15.1 
Bump eslint-plugin-jest from 22.15.0 to 22.15.1 in /webapp
 2019-08-13 11:03:31 +02:00
mattwr18
c6deb051c5
Merge pull request #1232 from Human-Connection/get_rid_of_annoying_engines_constraint 
I had enough of `--ignore-engines`
 2019-08-13 10:46:25 +02:00
dependabot-preview[bot]
bae2c63c78
Bump @storybook/vue from 5.1.10 to 5.1.11 in /webapp 
Bumps [@storybook/vue](https://github.com/storybookjs/storybook/tree/HEAD/app/vue) from 5.1.10 to 5.1.11.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v5.1.11/app/vue)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-13 08:11:45 +00:00
dependabot-preview[bot]
1fa1e278f2
Bump @storybook/addon-a11y from 5.1.10 to 5.1.11 in /webapp 
Bumps [@storybook/addon-a11y](https://github.com/storybookjs/storybook/tree/HEAD/addons/a11y) from 5.1.10 to 5.1.11.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v5.1.11/addons/a11y)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-13 08:11:45 +00:00
dependabot-preview[bot]
5c6fe99ffa
Bump eslint-plugin-jest from 22.15.0 to 22.15.1 in /webapp 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 22.15.0 to 22.15.1.
- [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.15.0...v22.15.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-13 08:10:53 +00:00
mattwr18
7c7ddfb4d8
Merge pull request #1249 from Human-Connection/dependabot/npm_and_yarn/webapp/storybook/addon-actions-5.1.11 
Bump @storybook/addon-actions from 5.1.10 to 5.1.11 in /webapp
 2019-08-13 10:08:55 +02:00
mattwr18
b1ef575329
Merge pull request #1248 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-plugin-jest-22.15.1 
Bump eslint-plugin-jest from 22.15.0 to 22.15.1 in /backend
 2019-08-13 10:08:09 +02:00
dependabot-preview[bot]
459099f1e1
Bump @storybook/addon-actions from 5.1.10 to 5.1.11 in /webapp 
Bumps [@storybook/addon-actions](https://github.com/storybookjs/storybook/tree/HEAD/addons/actions) from 5.1.10 to 5.1.11.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v5.1.11/addons/actions)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-13 04:22:57 +00:00
dependabot-preview[bot]
b56cabb8a4
Bump eslint-plugin-jest from 22.15.0 to 22.15.1 in /backend 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 22.15.0 to 22.15.1.
- [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.15.0...v22.15.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-13 04:22:43 +00:00
Wolfgang Huß
6d93391f87
Update webapp/locales/en.json 
Co-Authored-By: Robert Schäfer <git@roschaefer.de>
 2019-08-12 20:03:51 +02:00
Wolfgang Huß
33007c6bbe
Update webapp/locales/de.json 
Co-Authored-By: Robert Schäfer <git@roschaefer.de>
 2019-08-12 20:00:54 +02:00
Robert Schäfer
e46d8559ee
Merge pull request #1234 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-cache-inmemory-1.6.3 
Bump apollo-cache-inmemory from 1.6.2 to 1.6.3 in /backend
 2019-08-12 18:23:57 +02:00
Robert Schäfer
d5c7f78615
Merge pull request #1237 from Human-Connection/dependabot/npm_and_yarn/webapp/apollo-cache-inmemory-1.6.3 
Bump apollo-cache-inmemory from 1.6.2 to 1.6.3 in /webapp
 2019-08-12 18:23:14 +02:00
dependabot-preview[bot]
e34c7f196f
Bump apollo-cache-inmemory from 1.6.2 to 1.6.3 in /backend 
Bumps [apollo-cache-inmemory](https://github.com/apollographql/apollo-client) from 1.6.2 to 1.6.3.
- [Release notes](https://github.com/apollographql/apollo-client/releases)
- [Changelog](https://github.com/apollographql/apollo-client/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-client/compare/apollo-cache-inmemory@1.6.2...apollo-cache-inmemory@1.6.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-12 14:58:45 +00:00
Robert Schäfer
02dc30ea43
Merge pull request #1235 from Human-Connection/dependabot/npm_and_yarn/cypress-cucumber-preprocessor-1.13.1 
Bump cypress-cucumber-preprocessor from 1.13.0 to 1.13.1
 2019-08-12 16:57:33 +02:00
dependabot-preview[bot]
db0cd54dbc
Bump apollo-cache-inmemory from 1.6.2 to 1.6.3 in /webapp 
Bumps [apollo-cache-inmemory](https://github.com/apollographql/apollo-client) from 1.6.2 to 1.6.3.
- [Release notes](https://github.com/apollographql/apollo-client/releases)
- [Changelog](https://github.com/apollographql/apollo-client/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-client/compare/apollo-cache-inmemory@1.6.2...apollo-cache-inmemory@1.6.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-12 14:56:59 +00:00
Robert Schäfer
79f7e421ad
Merge pull request #1238 from Human-Connection/dependabot/npm_and_yarn/webapp/sass-loader-7.2.0 
Bump sass-loader from 7.1.0 to 7.2.0 in /webapp
 2019-08-12 16:56:52 +02:00
Robert Schäfer
98a6c333e9
Merge pull request #1236 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-client-2.6.4 
Bump apollo-client from 2.6.3 to 2.6.4 in /backend
 2019-08-12 16:55:13 +02:00
Robert Schäfer
b79951adb0
Merge pull request #1239 from Human-Connection/dependabot/npm_and_yarn/webapp/apollo-client-2.6.4 
Bump apollo-client from 2.6.3 to 2.6.4 in /webapp
 2019-08-12 16:54:38 +02:00
Wolfgang Huß
1d180480c4 Translated several texts and corrected and added some functionalities 2019-08-12 15:35:09 +02:00
Wolfgang Huß
5932d184d7 Corrected namings and countings 2019-08-12 13:27:14 +02:00
Wolfgang Huß
2d67ffd3fe
Merge pull request #1233 from Human-Connection/1231-fix_filters 
🍰 [Bugfix] Fix filter menu and refactor default layout
 2019-08-12 12:24:45 +02:00
Robert Schäfer
9026157018 Better hasMore: Don't wait until length == 0 
follow @Tirokk
 2019-08-12 11:50:23 +02:00
dependabot-preview[bot]
b02321b80d
Bump apollo-client from 2.6.3 to 2.6.4 in /webapp 
Bumps [apollo-client](https://github.com/apollographql/apollo-client) from 2.6.3 to 2.6.4.
- [Release notes](https://github.com/apollographql/apollo-client/releases)
- [Changelog](https://github.com/apollographql/apollo-client/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-client/compare/apollo-client@2.6.3...apollo-client@2.6.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-12 04:34:10 +00:00
dependabot-preview[bot]
8741ed567d
Bump sass-loader from 7.1.0 to 7.2.0 in /webapp 
Bumps [sass-loader](https://github.com/webpack-contrib/sass-loader) from 7.1.0 to 7.2.0.
- [Release notes](https://github.com/webpack-contrib/sass-loader/releases)
- [Changelog](https://github.com/webpack-contrib/sass-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/sass-loader/compare/v7.1.0...v7.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-12 04:33:06 +00:00
dependabot-preview[bot]
0fa3333d86
Bump apollo-client from 2.6.3 to 2.6.4 in /backend 
Bumps [apollo-client](https://github.com/apollographql/apollo-client) from 2.6.3 to 2.6.4.
- [Release notes](https://github.com/apollographql/apollo-client/releases)
- [Changelog](https://github.com/apollographql/apollo-client/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-client/compare/apollo-client@2.6.3...apollo-client@2.6.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-12 04:28:25 +00:00
dependabot-preview[bot]
dcb7af1aef
Bump cypress-cucumber-preprocessor from 1.13.0 to 1.13.1 
Bumps [cypress-cucumber-preprocessor](https://github.com/TheBrainFamily/cypress-cucumber-preprocessor) from 1.13.0 to 1.13.1.
- [Release notes](https://github.com/TheBrainFamily/cypress-cucumber-preprocessor/releases)
- [Changelog](https://github.com/TheBrainFamily/cypress-cucumber-preprocessor/blob/master/CHANGELOG.md)
- [Commits](https://github.com/TheBrainFamily/cypress-cucumber-preprocessor/compare/v1.13.0...v1.13.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-12 04:28:15 +00:00
Robert Schäfer
0b96b300d3 Implement hasMore feature on the index page 2019-08-10 03:50:24 +02:00
Robert Schäfer
0e707cdd4c Massive refactoring 
Fix #1231 the filter menu once and for all...
 2019-08-10 03:41:38 +02:00
Robert Schäfer
196cced8cf Implement+test postsFilter 
I think it's much cleaner to have just the filter object in the store
and to implement convenience methods to safely update the filter object.
 2019-08-10 03:02:02 +02:00
Robert Schäfer
a8cfe96f60 Don't chane the filterPostsMenu with state 
@mattwr18 state is the root of all evil
 2019-08-09 17:11:55 +02:00
Robert Schäfer
cea206d118
Merge pull request #1225 from Human-Connection/dependabot/npm_and_yarn/webapp/vue-sweetalert-icons-4.2.0 
Bump vue-sweetalert-icons from 4.1.0 to 4.2.0 in /webapp
 2019-08-09 14:13:55 +02:00
Robert Schäfer
8578cb5ab9 I had enough of --ignore-engines 
The maintainers of https://github.com/arthurvasconcelos/vue-izitoast are
not extremely responsive, so I decided to point our package to my own
fork.

This makes the flag `--ignore-engines` obsolete.
 2019-08-09 13:41:26 +02:00
Robert Schäfer
5d57f7b376 No global import - Thank you @JorgenVatle! ❤️ 
In version `v4.2.0` of `vue-sweetalert-icons` the local import is back, see:
https://github.com/JorgenVatle/vue-sweetalert-icons/issues/3#issuecomment-519497796
 2019-08-09 13:21:54 +02:00
Robert Schäfer
62098bb8cf
Merge pull request #1227 from Human-Connection/dependabot/docker/webapp/node-12.8-alpine 
Bump node from 12.7-alpine to 12.8-alpine in /webapp
 2019-08-09 11:58:03 +02:00
Robert Schäfer
425b53a53f
Merge pull request #1228 from Human-Connection/dependabot/docker/backend/node-12.8-alpine 
Bump node from 12.7-alpine to 12.8-alpine in /backend
 2019-08-09 11:57:50 +02:00