IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2026-01-20 20:01:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,400 Commits 5 Branches 2 Tags
Commit Graph

1923 Commits

Author SHA1 Message Date
roschaefer
16d07bd3ba refactor: lint, frontend tests, vuex store 
This fixes the lint errors and failing frontend tests. Also, when the
user chooses another orderBy, the menu gets translated.

The refactoring moves code and complexity into the vuex store where it
can be tested separately.
 2019-10-18 21:58:53 +02:00
Nimit Bhargava
7330987a69 fix - maintaining sorting after navigation 2019-10-18 16:03:14 +02:00
Alexander Friedland
c819edc293
Merge pull request #1927 from Human-Connection/Set_and_save_language_in_user_settings 
Language will be saved in the database of the user during registration
 2019-10-18 15:11:04 +02:00
Alexander Friedland
1fce840efb
locale 
change language to locale
 2019-10-18 12:16:32 +02:00
Alexander Friedland
0b5c1f831d
locale 
change language to locale
 2019-10-18 11:52:48 +02:00
Alexander Friedland
bfb3923023
locale 
change language to locale
 2019-10-18 11:50:42 +02:00
Alexander Friedland
18fe54e095
Update Registration.js 
change language to locale
 2019-10-18 11:49:14 +02:00
mattwr18
3f2d476cf9
Merge pull request #1941 from Human-Connection/1311-fix-vue-errors 
Fix vue errors for Contribution form
 2019-10-17 16:45:27 +02:00
Vasily Belolapotkov
20d9ba2439 wrap user component with client-only 2019-10-17 16:45:09 +03:00
mattwr18
5505deee79
Follow @alina-beck and @Tirokk PR suggestions 2019-10-17 12:44:30 +02:00
Robert Schäfer
56b7aa6d0a
Merge pull request #1925 from Human-Connection/better-truncate-comments 
Improved comment truncation
 2019-10-17 12:21:43 +02:00
Robert Schäfer
ea1b9d6e1e
Merge pull request #1911 from Human-Connection/typo 
fix: typo in German translation
 2019-10-17 12:18:01 +02:00
ppelegrin
48cfc017ea
Merge pull request #1921 from Human-Connection/dependabot/npm_and_yarn/webapp/date-fns-2.5.0 
build(deps): bump date-fns from 2.4.1 to 2.5.0 in /webapp
 2019-10-17 10:03:38 +02:00
ogerly
54465c04a3 Fix Jest tests 2019-10-17 08:26:15 +02:00
mattwr18
d62ee23f2a Create new File with blob 
- maintain filename
- reduce image size
 2019-10-16 17:20:35 +02:00
ogerly
dd2efad937 fix lint 2019-10-16 15:02:17 +02:00
ogerly
97dad41b27 Set language will be saved in the database of the user during registration 2019-10-16 15:01:07 +02:00
Alina Beck
a306b9cf4b use constants, truncate only comments with more than 300 characters 2019-10-16 13:56:57 +03:00
dependabot-preview[bot]
a815d92eb2
build(deps): bump date-fns from 2.4.1 to 2.5.0 in /webapp 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.4.1 to 2.5.0.
- [Release notes](https://github.com/date-fns/date-fns/releases)
- [Changelog](https://github.com/date-fns/date-fns/blob/master/CHANGELOG.md)
- [Commits](https://github.com/date-fns/date-fns/compare/v2.4.1...v2.5.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-16 10:19:18 +00:00
Robert Schäfer
0a0690aabd
Merge pull request #1903 from Human-Connection/highlight-linked-comment 
Highlight and expand linked comment
 2019-10-16 12:13:16 +02:00
Robert Schäfer
0792e06a24
Merge pull request #1910 from Human-Connection/add-missing-translations-contribution-form 
Add missing translations for Title placeholder
 2019-10-16 12:10:19 +02:00
Robert Schäfer
d18017e248
Update webapp/locales/de.json 2019-10-16 12:09:03 +02:00
Wolfgang Huß
6dff10b236 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1707-reporting-with-specific-information 2019-10-16 09:27:13 +02:00
roschaefer
6a50ef6134 fix: storybook story of Comment.vue 
This is the best solution that I can think of right now. Sure, it's not
so great to pass a property down from the page component. But at least
it fixes the storybook story, which is something.
 2019-10-16 01:14:32 +02:00
roschaefer
72016452e2 fix: typo in German translation 2019-10-16 00:20:43 +02:00
mattwr18
17ead96450 Add missing translations for Title placeholder 2019-10-15 23:50:34 +02:00
Robert Schäfer
ade9aa209a
Merge pull request #1907 from Human-Connection/Confirm_privacy_policy_minimum_age_at_registration 
Confirm privacy policy minimum age at registration
 2019-10-15 23:41:00 +02:00
mattwr18
29cf63e856
Merge pull request #1904 from Human-Connection/refactor_locale_imports 
refactor: improve locale imports
 2019-10-15 22:38:08 +02:00
roschaefer
58fb4d56c6 fix: use informal way of addressing in German 2019-10-15 22:29:03 +02:00
mattwr18
b6d3bcd245
Merge pull request #1899 from Human-Connection/dependabot/npm_and_yarn/webapp/storybook/addon-a11y-5.2.4 
build(deps-dev): bump @storybook/addon-a11y from 5.2.3 to 5.2.4 in /webapp
 2019-10-15 21:33:22 +02:00
mattwr18
e8c6941142 Follow @roschaefer's PR review suggestions 
- disable button if form.reasonCategory is falsy
- extract valuesReasonCategoryOptions to global constant
- extract reasonCategoryOptions to created lifecycle hook to keep data()
clean and use map
- extract formSchema to components/utils and test
- remove validator from formSchema and validate based on "Deep Rules" https://github.com/yiminghe/async-validator#deep-rules
- Use v-model to update reasonCategory and reasonDescription
- default to error message in English from backend
- Update template slot to use new syntax
 2019-10-15 20:28:25 +02:00
ogerly
d7dc0646e0 Confirm, privacy policy, minimum age at registration 2019-10-15 19:21:05 +02:00
roschaefer
b2dccfb51c refactor: improve locale imports 
While refactoring the login form component I found many inconsistent
ways of importing the list of locales. So I decided to refactor the
imports altogether. Don't use `process.env` to import locales!
 2019-10-15 16:41:33 +02:00
ogerly
461defd460 WITH CHECKBOXES 2019-10-15 15:43:31 +02:00
Alina Beck
2090e3939b add $route mock to Comment and CommentList spec 2019-10-15 16:07:09 +03:00
Alina Beck
202da2a67c remove unused css 2019-10-15 15:47:24 +03:00
Alina Beck
134cea4e47 expand targeted comment by default 2019-10-15 15:44:22 +03:00
Alina Beck
597ca3029f improve html and css for collapse-button 2019-10-15 15:07:30 +03:00
dependabot-preview[bot]
d1f2c7bb45
build(deps-dev): bump eslint-plugin-jest in /webapp 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 22.17.0 to 22.19.0.
- [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.17.0...v22.19.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-15 12:02:09 +00:00
dependabot-preview[bot]
d0bb81585f
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.3 to 5.2.4.
- [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.4/addons/a11y)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-15 12:01:49 +00:00
Robert Schäfer
6ddac7d737
Merge pull request #1894 from Human-Connection/dependabot/docker/webapp/node-12.12.0-alpine 
build(deps): bump node from 12.11.1-alpine to 12.12.0-alpine in /webapp
 2019-10-15 13:59:18 +02:00
Robert Schäfer
fe52846e7c
Merge pull request #1897 from Human-Connection/dependabot/npm_and_yarn/webapp/storybook/vue-5.2.4 
build(deps-dev): bump @storybook/vue from 5.2.3 to 5.2.4 in /webapp
 2019-10-15 13:59:02 +02:00
Alina Beck
6318ced7a0 refactor comment component to just use one content viewer 2019-10-15 14:52:02 +03:00
ogerly
855caf78e9 reference to terms of use, data protection, minimum age at added 2019-10-15 13:05:51 +02:00
Alina Beck
cd9f2633d7 highlight comment targeted in anchor link 2019-10-15 12:09:01 +03:00
dependabot-preview[bot]
b5d0170ab4
build(deps): bump node from 12.11.1-alpine to 12.12.0-alpine in /webapp 
Bumps node from 12.11.1-alpine to 12.12.0-alpine.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-15 08:53:30 +00:00
dependabot-preview[bot]
251c0d93e4
build(deps-dev): bump @storybook/vue from 5.2.3 to 5.2.4 in /webapp 
Bumps [@storybook/vue](https://github.com/storybookjs/storybook/tree/HEAD/app/vue) from 5.2.3 to 5.2.4.
- [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.4/app/vue)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-15 08:49:40 +00:00
mattwr18
5df108a89a
Merge pull request #1896 from Human-Connection/dependabot/npm_and_yarn/webapp/nuxtjs/sentry-3.0.1 
build(deps): bump @nuxtjs/sentry from 3.0.0 to 3.0.1 in /webapp
 2019-10-15 10:48:21 +02:00
dependabot-preview[bot]
9aa486f060
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.3 to 5.2.4.
- [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.4/addons/actions)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-15 07:08:05 +00:00
dependabot-preview[bot]
34b441a5aa
build(deps): bump @nuxtjs/sentry from 3.0.0 to 3.0.1 in /webapp 
Bumps [@nuxtjs/sentry](https://github.com/nuxt-community/sentry-module) from 3.0.0 to 3.0.1.
- [Release notes](https://github.com/nuxt-community/sentry-module/releases)
- [Changelog](https://github.com/nuxt-community/sentry-module/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nuxt-community/sentry-module/compare/v3.0.0...v3.0.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-15 07:06:54 +00:00