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

3556 Commits

Author SHA1 Message Date
ogerly
bcb0bd21a5 test review2 2019-12-04 11:21:26 +01:00
ogerly
6ce797e8ef test review 2019-12-04 11:20:27 +01:00
mattwr18
80b65c205a Update yarn.lock after pulling in latest changes 
- not sure why these changes were not merged in with the PR that
upgraded these packages... maybe the dependabot PR was not rebased after
merging another package bump in?? anyways, everytime I run yarn install
in webapp after pulling in the latest changes, this appears.
 2019-12-04 10:28:54 +01:00
Alina Beck
68aabedc6d move css classes to the correct component files 2019-12-04 12:25:44 +03:00
roschaefer
d143d629ed Use data-test attributes, make test more resilient 
as suggested by @mattwr18
 2019-12-04 01:17:14 +01:00
roschaefer
84f574aaa0 Fix frontend tests 2019-12-04 00:22:28 +01:00
mattwr18
6d7820ca75 Update privacy path 2019-12-03 21:07:26 +01:00
Alexander Friedland
8d93956de0
change 
change representiere <TO> repräsentiere
 2019-12-03 18:47:38 +01:00
Robert Schäfer
ab4f658b69
Merge pull request #2385 from Human-Connection/swap_user_handle_with_name 
feat: swap user name<=>handle for discriminability
 2019-12-03 18:46:33 +01:00
ogerly
a5bbb06f77 fix Spec + lint 2019-12-03 18:27:05 +01:00
ogerly
38c58af1f3 add confirm checkboc No Comercial account 2019-12-03 17:57:30 +01:00
Alina Beck
750a1e523f extract ReportRow into separate component 2019-12-03 18:42:48 +03:00
mattwr18
66f1aa8888 Follow @roschaefer PR review suggestions 
- Update seed file with more human readable imageAspectRatios
- Remove copy script from Dockerfile to not expose to others. we'll need
to either start a maintenance server, so it has access to both the
backend/public/uploads and cypher-shell, or copy a script to the backend
that creates a csv, which can be copied to the neo4j pod and then loaded
into the cypher.
- Remove unintended changes to deployment/legacy-migration
- Add back image compression to Post images
 2019-12-03 15:33:54 +01:00
Alina Beck
3de205d7c2 style nested table 2019-12-03 14:03:31 +03:00
Robert Schäfer
cab2ce0229
Merge pull request #2397 from Human-Connection/dependabot/npm_and_yarn/webapp/storybook/vue-5.2.8 
build(deps-dev): bump @storybook/vue from 5.2.6 to 5.2.8 in /webapp
 2019-12-03 11:30:07 +01:00
Robert Schäfer
a971d1ff65
Merge pull request #2398 from Human-Connection/dependabot/npm_and_yarn/webapp/storybook/addon-actions-5.2.8 
build(deps-dev): bump @storybook/addon-actions from 5.2.6 to 5.2.8 in /webapp
 2019-12-03 11:29:48 +01:00
Robert Schäfer
f3afb79cb7
Merge pull request #2400 from Human-Connection/fix_shouts_translation 
Fix German translation of "Shouts"
 2019-12-03 11:29:19 +01:00
Alina Beck
d685ff9e7b translate and style user count 2019-12-03 13:25:20 +03:00
Alina Beck
9801369343 merge table rows 2019-12-03 13:07:24 +03:00
Alina Beck
4585dc7e8c table cell content design tweaks 2019-12-03 12:45:28 +03:00
Alina Beck
febabf9303 rename table header translations 2019-12-03 12:25:19 +03:00
Alina Beck
21a3ff4bc8 render just one thead and tbody for the reports table 2019-12-03 12:03:41 +03:00
dependabot-preview[bot]
eee0253c2c
build(deps-dev): bump @storybook/vue from 5.2.6 to 5.2.8 in /webapp 
Bumps [@storybook/vue](https://github.com/storybookjs/storybook/tree/HEAD/app/vue) from 5.2.6 to 5.2.8.
- [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.2.8/app/vue)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-03 08:41:37 +00:00
dependabot-preview[bot]
7669586690
build(deps-dev): bump @storybook/addon-actions in /webapp 
Bumps [@storybook/addon-actions](https://github.com/storybookjs/storybook/tree/HEAD/addons/actions) from 5.2.6 to 5.2.8.
- [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.2.8/addons/actions)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-03 08:41:36 +00:00
mattwr18
462750add6
Merge pull request #2407 from Human-Connection/dependabot/npm_and_yarn/webapp/tiptap-extensions-1.28.5 
build(deps): bump tiptap-extensions from 1.28.4 to 1.28.5 in /webapp
 2019-12-03 09:40:53 +01:00
mattwr18
87bd623cdf
Merge pull request #2406 from Human-Connection/dependabot/npm_and_yarn/webapp/storybook/addon-a11y-5.2.8 
build(deps-dev): bump @storybook/addon-a11y from 5.2.7 to 5.2.8 in /webapp
 2019-12-03 09:39:08 +01:00
Alina Beck
150ffef35a style report list header 2019-12-03 11:37:58 +03:00
dependabot-preview[bot]
bd34a86569
build(deps): bump tiptap-extensions from 1.28.4 to 1.28.5 in /webapp 
Bumps [tiptap-extensions](https://github.com/scrumpy/tiptap) from 1.28.4 to 1.28.5.
- [Release notes](https://github.com/scrumpy/tiptap/releases)
- [Commits](https://github.com/scrumpy/tiptap/compare/tiptap-extensions@1.28.4...tiptap-extensions@1.28.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-03 04:23:18 +00:00
dependabot-preview[bot]
38d7718d60
build(deps-dev): bump @storybook/addon-a11y in /webapp 
Bumps [@storybook/addon-a11y](https://github.com/storybookjs/storybook/tree/HEAD/addons/a11y) from 5.2.7 to 5.2.8.
- [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.2.8/addons/a11y)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-03 04:22:42 +00:00
dependabot-preview[bot]
ab066dc8c9
build(deps-dev): bump css-loader from 3.2.0 to 3.2.1 in /webapp 
Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 3.2.0 to 3.2.1.
- [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/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-03 04:21:46 +00:00
roschaefer
75b2785941 Follow @alina-beck's suggestions 2019-12-03 00:47:07 +01:00
mattwr18
415ec7ba7a
Merge pull request #2399 from Human-Connection/dependabot/npm_and_yarn/webapp/storybook/addon-notes-5.2.8 
build(deps-dev): bump @storybook/addon-notes from 5.2.6 to 5.2.8 in /webapp
 2019-12-02 21:40:17 +01:00
mattwr18
5f14a2634d
Merge pull request #2393 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-6.7.2 
build(deps-dev): bump eslint from 6.7.1 to 6.7.2 in /webapp
 2019-12-02 21:39:57 +01:00
mattwr18
b9778b2260
Merge pull request #2374 from Human-Connection/dependabot/npm_and_yarn/webapp/vue/cli-shared-utils-4.1.1 
build(deps-dev): bump @vue/cli-shared-utils from 4.0.5 to 4.1.1 in /webapp
 2019-12-02 21:39:39 +01:00
ogerly
fd3accd147 specs ok 2019-12-02 20:55:58 +01:00
mattwr18
bcbce2a34a Refactor modalData to use mapMutations, computed 
- clean it up some
 2019-12-02 20:50:55 +01:00
mattwr18
7db3696819 Return createdAt/updatedAt for Report 2019-12-02 20:50:28 +01:00
mattwr18
e1c56346cc Add story/spec for ReportsTable component/refactor 
- use data-test to target elements in tests
 2019-12-02 20:50:10 +01:00
mattwr18
46b6483c90 Add story/spec for CounterIcon component 2019-12-02 20:48:12 +01:00
ogerly
a7585721a7 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1746-Blur_explicit_Image_Content 2019-12-02 19:15:32 +01:00
ogerly
b4805aa2c6 add blur image on edit confirm 2019-12-02 19:12:26 +01:00
dependabot-preview[bot]
8d4757d771
build(deps-dev): bump eslint from 6.7.1 to 6.7.2 in /webapp 
Bumps [eslint](https://github.com/eslint/eslint) from 6.7.1 to 6.7.2.
- [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.1...v6.7.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-02 15:00:23 +00:00
mattwr18
c148ecb9a5
Merge pull request #2392 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-plugin-jest-23.1.1 
build(deps-dev): bump eslint-plugin-jest from 23.0.5 to 23.1.1 in /webapp
 2019-12-02 15:57:48 +01:00
roschaefer
58e7f4164d Fix German translation of "Shouts" 
Requested by @DennisHack

@Mogge are you "moriz" on our discord who keeps track of translations?
This might be interesting for you, too.
 2019-12-02 15:10:09 +01:00
Alina Beck
c75c8c6d2d pass imageAspectRatio to MasonryGridItems on user and more info page 2019-12-02 16:25:39 +03:00
Alina Beck
bf7042c423 enforce max image height 2019-12-02 16:14:18 +03:00
ogerly
19d183e13a Merge https://github.com/Human-Connection/Human-Connection into 1746-Blur_explicit_Image_Content 2019-12-02 13:22:42 +01:00
mattwr18
35c3219460
Merge pull request #2316 from Human-Connection/2170-Change_of_Terms_of_Service 
Terms of use extended with dot - no commercial use
 2019-12-02 13:10:58 +01:00
mattwr18
e2d443c87f
Merge pull request #2380 from Human-Connection/lokalise-2019-11-29_11-04-05 
Lokalise: Translations update
 2019-12-02 12:08:55 +01:00
dependabot-preview[bot]
f2d4980ed8
build(deps-dev): bump @storybook/addon-notes in /webapp 
Bumps [@storybook/addon-notes](https://github.com/storybookjs/storybook/tree/HEAD/addons/notes) from 5.2.6 to 5.2.8.
- [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.2.8/addons/notes)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-02 10:51:05 +00:00