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

2621 Commits

Author SHA1 Message Date
Robert Schäfer
a5511cf00d
Merge pull request #2579 from Human-Connection/dependabot/npm_and_yarn/webapp/babel/preset-env-7.7.7 
build(deps-dev): bump @babel/preset-env from 7.7.6 to 7.7.7 in /webapp
 2019-12-30 19:18:50 +01:00
Robert Schäfer
dfedf6e97b
Merge pull request #2617 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-6.8.0 
build(deps-dev): bump eslint from 6.7.2 to 6.8.0 in /webapp
 2019-12-30 19:16:01 +01:00
Robert Schäfer
180f2746d4
Merge pull request #2627 from Human-Connection/2239-show-language-on-post-page 
🍰 Added Language Tag For Posts
 2019-12-30 15:38:58 +01:00
dependabot-preview[bot]
9fddaba8cc
build(deps-dev): bump eslint from 6.7.2 to 6.8.0 in /webapp 
Bumps [eslint](https://github.com/eslint/eslint) from 6.7.2 to 6.8.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v6.7.2...v6.8.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-30 13:04:58 +00:00
Robert Schäfer
74a0447d45
Merge pull request #2619 from Human-Connection/2603-following-count-shows-0 
Fixes 2603
 2019-12-30 13:31:08 +01:00
dependabot-preview[bot]
f5ada74bca
build(deps-dev): bump @babel/preset-env from 7.7.6 to 7.7.7 in /webapp 
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.7.6 to 7.7.7.
- [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.7.6...v7.7.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-30 12:27:56 +00:00
Robert Schäfer
7882b28c96
Merge pull request #2581 from Human-Connection/dependabot/npm_and_yarn/webapp/babel/core-7.7.7 
build(deps-dev): bump @babel/core from 7.7.5 to 7.7.7 in /webapp
 2019-12-30 13:25:28 +01:00
Robert Schäfer
2d5084df15
Merge pull request #2624 from Human-Connection/dependabot/npm_and_yarn/webapp/handlebars-4.5.3 
build(deps): [security] bump handlebars from 4.1.2 to 4.5.3 in /webapp
 2019-12-30 13:22:27 +01:00
dependabot-preview[bot]
12b1eaad99
build(deps-dev): bump eslint-plugin-vue from 6.0.1 to 6.1.1 in /webapp 
Bumps [eslint-plugin-vue](https://github.com/vuejs/eslint-plugin-vue) from 6.0.1 to 6.1.1.
- [Release notes](https://github.com/vuejs/eslint-plugin-vue/releases)
- [Commits](https://github.com/vuejs/eslint-plugin-vue/compare/v6.0.1...v6.1.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-30 04:23:45 +00:00
Mo Zargham
e0b6f82878 removed typo! 2019-12-29 14:09:20 -05:00
Mo Zargham
4b9040a8a7 fixed format 2019-12-29 14:06:53 -05:00
Mo Zargham
3db3cb1171 removed ternary added v-if 2019-12-27 15:17:13 -05:00
Mo Zargham
3234c2e861 added language tag for posts 2019-12-27 15:02:51 -05:00
dependabot-preview[bot]
8a051610de
build(deps): [security] bump handlebars from 4.1.2 to 4.5.3 in /webapp 
Bumps [handlebars](https://github.com/wycats/handlebars.js) from 4.1.2 to 4.5.3. **This update includes a security fix.**
- [Release notes](https://github.com/wycats/handlebars.js/releases)
- [Changelog](https://github.com/wycats/handlebars.js/blob/master/release-notes.md)
- [Commits](https://github.com/wycats/handlebars.js/compare/v4.1.2...v4.5.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-26 18:37:54 +00:00
Moriz Wahl
a3cfbb09cb Fixes 2603 2019-12-23 15:24:51 +01:00
dependabot-preview[bot]
427c2113ba
build(deps-dev): bump @babel/core from 7.7.5 to 7.7.7 in /webapp 
Bumps [@babel/core](https://github.com/babel/babel) from 7.7.5 to 7.7.7.
- [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.7.5...v7.7.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-20 20:07:05 +00:00
mattwr18
9945076c9e
Merge pull request #2595 from Human-Connection/dependabot/docker/webapp/node-13.5.0-alpine 
build(deps): bump node from 13.4.0-alpine to 13.5.0-alpine in /webapp
 2019-12-20 11:34:38 +01:00
dependabot-preview[bot]
9d1751f779
build(deps): bump node from 13.4.0-alpine to 13.5.0-alpine in /webapp 
Bumps node from 13.4.0-alpine to 13.5.0-alpine.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-20 04:18:47 +00:00
dependabot-preview[bot]
88d39c4a42
build(deps-dev): bump storybook-design-token in /webapp 
Bumps [storybook-design-token](https://github.com/UX-and-I/storybook-design-token) from 0.4.1 to 0.5.0.
- [Release notes](https://github.com/UX-and-I/storybook-design-token/releases)
- [Commits](https://github.com/UX-and-I/storybook-design-token/compare/v0.4.1...v0.5.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-20 04:18:30 +00:00
mattwr18
a33cb1e6fc Make tests accurate 2019-12-20 01:14:43 +01:00
mattwr18
730da2029c Fix imageAspectRatio set to null UpdatePost 
- we were not setting the form.imageAspectRatio to the value of the
post's imageAspectRatio, so when a user updated their post, but did not
update their imageAspectRatio it would set it to null
 2019-12-20 00:59:29 +01:00
mattwr18
efd4d1f2af
Merge pull request #2563 from Human-Connection/lokalise-2019-12-18_10-06-16 
Lokalise: Translations update
 2019-12-19 12:27:04 +01:00
mattwr18
a5542c5b4c
Merge pull request #2580 from Human-Connection/dependabot/npm_and_yarn/webapp/style-resources-loader-1.3.3 
build(deps-dev): bump style-resources-loader from 1.3.2 to 1.3.3 in /webapp
 2019-12-19 12:13:52 +01:00
mattwr18
8f5dbe60c0
Merge pull request #2577 from Human-Connection/dependabot/docker/webapp/node-13.4.0-alpine 
build(deps): bump node from 13.3.0-alpine to 13.4.0-alpine in /webapp
 2019-12-19 11:49:38 +01:00
Wolfgang Huß
377f2eecd2
Merge pull request #2351 from Human-Connection/1746-Blur_explicit_Image_Content 
Blur Images
 2019-12-19 11:46:38 +01:00
dependabot-preview[bot]
ffa6825f06
build(deps-dev): bump style-resources-loader in /webapp 
Bumps [style-resources-loader](https://github.com/yenshih/style-resources-loader) from 1.3.2 to 1.3.3.
- [Release notes](https://github.com/yenshih/style-resources-loader/releases)
- [Changelog](https://github.com/yenshih/style-resources-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yenshih/style-resources-loader/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-19 04:21:36 +00:00
dependabot-preview[bot]
3816e79b6d
build(deps): bump node from 13.3.0-alpine to 13.4.0-alpine in /webapp 
Bumps node from 13.3.0-alpine to 13.4.0-alpine.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-19 04:20:21 +00:00
mattwr18
57a4309b30
Merge pull request #2544 from Human-Connection/2543-add-back-layout-changes 
Add back layout changes/update db_manipulation
 2019-12-18 16:16:00 +01:00
mattwr18
e002ed0b49 Add back layout changes/update db_manipulation 
- we had removed these changes till we could deploy them by themselves
and run the db_manipulation

Co-authored-by: Alina Beck <alina.beck@mail.com>
 2019-12-18 15:39:42 +01:00
Alina Beck
2e26e3f3f9
Apply suggestions from code review 
change FAQ link text
 2019-12-18 17:36:24 +05:30
Alina Beck
c74bfde652 refactor to use only one value for the blurImage status 2019-12-18 15:26:45 +05:30
Alina Beck
edaac117eb remove code related to imageAspectRatio 2019-12-18 15:26:45 +05:30
lokalise-bot
b70ff73bba Lokalise: update of webapp/locales/ru.json 2019-12-18 10:06:18 +01:00
ogerly
0213d64ba5 change const height = Math.min, remove 2000 2019-12-18 07:56:36 +01:00
dependabot-preview[bot]
bff3cfe2d7
build(deps-dev): bump css-loader from 3.3.2 to 3.4.0 in /webapp 
Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 3.3.2 to 3.4.0.
- [Release notes](https://github.com/webpack-contrib/css-loader/releases)
- [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/css-loader/compare/v3.3.2...v3.4.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-18 04:19:40 +00:00
Robert Schäfer
c1969ac12b
Merge pull request #2535 from Human-Connection/dependabot/npm_and_yarn/webapp/tiptap-extensions-1.28.6 
build(deps): bump tiptap-extensions from 1.28.5 to 1.28.6 in /webapp
 2019-12-17 21:47:56 +01:00
Robert Schäfer
71e9090833
Merge pull request #2542 from Human-Connection/2541-fix-master-build-add-explicit-query 
Fix maintenance service/LocaleSwitch import
 2019-12-17 19:11:15 +01:00
dependabot-preview[bot]
947db53990
build(deps): bump tiptap-extensions from 1.28.5 to 1.28.6 in /webapp 
Bumps [tiptap-extensions](https://github.com/scrumpy/tiptap) from 1.28.5 to 1.28.6.
- [Release notes](https://github.com/scrumpy/tiptap/releases)
- [Commits](https://github.com/scrumpy/tiptap/compare/tiptap-extensions@1.28.5...tiptap-extensions@1.28.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-17 16:23:22 +00:00
mattwr18
e15b7c8d03
Merge pull request #2523 from Human-Connection/dependabot/npm_and_yarn/webapp/apollo-client-2.6.8 
build(deps): bump apollo-client from 2.6.4 to 2.6.8 in /webapp
 2019-12-17 17:21:00 +01:00
mattwr18
52cd5ac332
Merge pull request #2521 from Human-Connection/dependabot/npm_and_yarn/webapp/stack-utils-2.0.1 
build(deps): bump stack-utils from 1.0.2 to 2.0.1 in /webapp
 2019-12-17 17:20:42 +01:00
mattwr18
3abfe13dcc Fix maintenance service/LocaleSwitch import 2019-12-17 16:15:11 +01:00
dependabot-preview[bot]
565c58224d
build(deps): bump apollo-client from 2.6.4 to 2.6.8 in /webapp 
Bumps [apollo-client](https://github.com/apollographql/apollo-client) from 2.6.4 to 2.6.8.
- [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.4...v2.6.8)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-17 09:24:48 +00:00
Robert Schäfer
360078f023
Merge pull request #2519 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-plugin-prettier-3.1.2 
build(deps-dev): bump eslint-plugin-prettier from 3.1.1 to 3.1.2 in /webapp
 2019-12-17 10:23:00 +01:00
Robert Schäfer
15b762507b
Merge pull request #2527 from Human-Connection/dependabot/npm_and_yarn/webapp/apollo-cache-inmemory-1.6.5 
build(deps): bump apollo-cache-inmemory from 1.6.3 to 1.6.5 in /webapp
 2019-12-17 10:20:52 +01:00
dependabot-preview[bot]
2e0a488345
build(deps): bump stack-utils from 1.0.2 to 2.0.1 in /webapp 
Bumps [stack-utils](https://github.com/tapjs/stack-utils) from 1.0.2 to 2.0.1.
- [Release notes](https://github.com/tapjs/stack-utils/releases)
- [Commits](https://github.com/tapjs/stack-utils/compare/v1.0.2...v2.0.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-17 09:20:33 +00:00
Robert Schäfer
47688fd5b0
Merge pull request #2537 from Human-Connection/dependabot/npm_and_yarn/webapp/tiptap-1.26.6 
build(deps): bump tiptap from 1.26.5 to 1.26.6 in /webapp
 2019-12-17 10:17:38 +01:00
Alexander Friedland
ed617f8c83
Merge branch 'master' into 1746-Blur_explicit_Image_Content 2019-12-17 07:39:26 +01:00
dependabot-preview[bot]
b552bfd349
build(deps-dev): bump vue-loader from 15.7.2 to 15.8.3 in /webapp 
Bumps [vue-loader](https://github.com/vuejs/vue-loader) from 15.7.2 to 15.8.3.
- [Release notes](https://github.com/vuejs/vue-loader/releases)
- [Changelog](https://github.com/vuejs/vue-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-loader/compare/v15.7.2...v15.8.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-17 04:21:48 +00:00
dependabot-preview[bot]
ddd11d1621
build(deps): bump tiptap from 1.26.5 to 1.26.6 in /webapp 
Bumps [tiptap](https://github.com/scrumpy/tiptap) from 1.26.5 to 1.26.6.
- [Release notes](https://github.com/scrumpy/tiptap/releases)
- [Commits](https://github.com/scrumpy/tiptap/compare/tiptap@1.26.5...tiptap@1.26.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-17 04:21:00 +00:00
mattwr18
c2bb406502
Merge pull request #2512 from Human-Connection/refactor_content_menu 
Refactor: content menu
 2019-12-16 16:13:45 +01:00