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

2538 Commits

Author SHA1 Message Date
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
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
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
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
dependabot-preview[bot]
559737d8e4
build(deps-dev): bump eslint-plugin-jest in /webapp 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 23.0.5 to 23.1.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/v23.0.5...v23.1.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-02 10:50:25 +00:00
dependabot-preview[bot]
ef8e0e04c8
build(deps-dev): bump @vue/cli-shared-utils in /webapp 
Bumps [@vue/cli-shared-utils](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-shared-utils) from 4.0.5 to 4.1.1.
- [Release notes](https://github.com/vuejs/vue-cli/releases)
- [Changelog](https://github.com/vuejs/vue-cli/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-cli/commits/v4.1.1/packages/@vue/cli-shared-utils)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-02 10:49:53 +00:00
mattwr18
6edf169074
Merge pull request #2391 from Human-Connection/dependabot/npm_and_yarn/webapp/storybook/addon-a11y-5.2.7 
build(deps-dev): bump @storybook/addon-a11y from 5.2.6 to 5.2.7 in /webapp
 2019-12-02 11:48:10 +01:00
mattwr18
b6cfe087be
Merge pull request #2379 from Human-Connection/dependabot/npm_and_yarn/webapp/vue/server-test-utils-1.0.0-beta.30 
build(deps-dev): bump @vue/server-test-utils from 1.0.0-beta.29 to 1.0.0-beta.30 in /webapp
 2019-12-02 11:46:58 +01:00
mattwr18
00d5f58b00 Move components to features, style table[WIP] 
- In conversations with @alina-beck, she suggested we move the
ReportsTable and FiledTable to features since it is tightly coupled to
Reports... we can work towards a table that is "dumb" and just takes the
data and displays it in another PR
- Add extra column for Current status
- Fix widths
 2019-12-02 11:26:11 +01:00
dependabot-preview[bot]
6520a64b61
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.6 to 5.2.7.
- [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.7/addons/a11y)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-02 04:20:20 +00:00
roschaefer
048fb51116 feat: swap user name<=>handle for discriminability 2019-11-30 11:03:46 +01:00
roschaefer
3409a34374 Always show the menu to switch filters 2019-11-30 02:22:53 +01:00
roschaefer
74a65a9114 Be more specific "Current status" inst. of "Type" 2019-11-30 02:21:29 +01:00
roschaefer
9fd895fc42 Use <button> instead of <a> 
If you don't want to link somewhere, use a button instead of an anchor,
fellas. 😉
 2019-11-30 01:31:57 +01:00
mattwr18
985d53e52b Fix broken tests 2019-11-29 20:49:46 +01:00
mattwr18
7441dbf28c Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1710-list-and-protocol-moderation 2019-11-29 20:43:09 +01:00