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
lokalise-bot
906e8518bf Lokalise: update of webapp/locales/ru.json 2019-11-18 23:21:52 +01:00
roschaefer
32b93d1ff3 docs: add storybook story for hashtag component 2019-11-18 22:50:21 +01:00
dependabot-preview[bot]
83c46a3de3
build(deps-dev): bump @vue/eslint-config-prettier in /webapp 
Bumps [@vue/eslint-config-prettier](https://github.com/vuejs/eslint-config-prettier) from 5.0.0 to 6.0.0.
- [Release notes](https://github.com/vuejs/eslint-config-prettier/releases)
- [Changelog](https://github.com/vuejs/eslint-config-prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/vuejs/eslint-config-prettier/compare/v5.0.0...v6.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-18 21:33:55 +00:00
Robert Schäfer
00fd014dc1
Merge pull request #2265 from Human-Connection/dependabot/npm_and_yarn/webapp/cookie-universal-nuxt-2.0.19 
build(deps): bump cookie-universal-nuxt from 2.0.18 to 2.0.19 in /webapp
 2019-11-18 22:30:32 +01:00
mattwr18
123fc2f666 Fix lint with updated linter 2019-11-18 21:54:24 +01:00
mattwr18
399e13360e Update tests to test new validations 2019-11-18 21:23:12 +01:00
mattwr18
5450eba1b9 Update validations for a Post's content 
- we were asked to remove a minimum of three characters since it's not
more substantive than a link.
 2019-11-18 18:23:41 +01:00
mattwr18
0815a12fc9 Decrease width of language select, pull right 
- @ogerly hope you are cool with this, I pulled it right so that the
validations you added still all line up on the right side

- @alina-beck I think you know a more sophisticated way to do this, it
was just easy for me to add an empty <ds-flex-item> with a 50% width on
medium and larger devices. This can also be populated with country of
contribution or visibility, when one of those is implemented.. what do
you think?
 2019-11-18 17:42:56 +01:00
mattwr18
04f07b9091 Fix lint 2019-11-18 17:25:44 +01:00
Robert Schäfer
9b01309838
Merge pull request #2267 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-config-prettier-6.6.0 
build(deps-dev): bump eslint-config-prettier from 6.5.0 to 6.6.0 in /webapp
 2019-11-18 17:09:05 +01:00
Robert Schäfer
ab819e2957
Merge pull request #2200 from Human-Connection/2187-language-does-not-change-on-edit 
2187 language does not change on edit
 2019-11-18 17:03:55 +01:00
Robert Schäfer
735a31ed00
Merge pull request #2101 from Human-Connection/1747-show-shouts 
1747 show shouts
 2019-11-18 17:00:43 +01:00
mattwr18
0cb75a1353
Merge pull request #2180 from Human-Connection/dependabot/docker/webapp/node-13.1.0-alpine 
build(deps): bump node from 13.0.1-alpine to 13.1.0-alpine in /webapp
 2019-11-18 15:59:44 +01:00
mattwr18
db86d248a7
Merge pull request #2078 from Human-Connection/fix-2042-back-link 
Fix #2042 Back Link To Login Page
 2019-11-18 15:59:12 +01:00
mattwr18
6685ff3df0 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 2119_Create_Post_consistent_form_input_validation 2019-11-18 15:57:58 +01:00
Wolfgang Huß
3b4de22855 Refactor reports mutation to CaseFolder structure 2019-11-18 11:25:47 +01:00
Alina Beck
48398075c8 style base icon 2019-11-18 12:23:26 +03:00
Wolfgang Huß
4a732beb0a Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1710-list-and-protocol-moderation 2019-11-18 07:59:44 +01:00
dependabot-preview[bot]
9188d84c4b
build(deps-dev): bump eslint-config-prettier in /webapp 
Bumps [eslint-config-prettier](https://github.com/prettier/eslint-config-prettier) from 6.5.0 to 6.6.0.
- [Release notes](https://github.com/prettier/eslint-config-prettier/releases)
- [Changelog](https://github.com/prettier/eslint-config-prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prettier/eslint-config-prettier/compare/v6.5.0...v6.6.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-18 04:20:52 +00:00
dependabot-preview[bot]
da8bdbb5e9
build(deps): bump cookie-universal-nuxt from 2.0.18 to 2.0.19 in /webapp 
Bumps [cookie-universal-nuxt](https://github.com/microcipcip/cookie-universal) from 2.0.18 to 2.0.19.
- [Release notes](https://github.com/microcipcip/cookie-universal/releases)
- [Commits](https://github.com/microcipcip/cookie-universal/compare/v2.0.18...v2.0.19)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-18 04:19:45 +00:00
Moriz Wahl
cac529a73d Test is running fine 2019-11-17 19:26:15 +01:00
Moriz Wahl
657a41ff7b Removed language method 2019-11-17 18:40:08 +01:00
dependabot-preview[bot]
36ef2d9c96
build(deps): bump node from 13.0.1-alpine to 13.1.0-alpine in /webapp 
Bumps node from 13.0.1-alpine to 13.1.0-alpine.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-16 19:43:41 +00:00
roschaefer
36062ffa8c Fix lint 2019-11-16 14:34:23 +01:00
dependabot-preview[bot]
d0e3d33848
build(deps-dev): bump eslint-config-standard in /webapp 
Bumps [eslint-config-standard](https://github.com/standard/eslint-config-standard) from 12.0.0 to 14.1.0.
- [Release notes](https://github.com/standard/eslint-config-standard/releases)
- [Changelog](https://github.com/standard/eslint-config-standard/blob/master/CHANGELOG.md)
- [Commits](https://github.com/standard/eslint-config-standard/compare/v12.0.0...v14.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-16 13:28:40 +00:00
Robert Schäfer
f6550b9b00
Merge pull request #2248 from Human-Connection/2240-infinite-scrolling-out-of-control 
Fix infinite scrolling out of control
 2019-11-15 17:03:31 +01:00
roschaefer
950df1cd07 Fix frontend tests 
I also removed one frontend test. The test case was checking an edge
case. We use `hasMore` as the single source of truth so I think it's
safe to remove this test case.
 2019-11-15 16:20:24 +01:00
Robert Schäfer
18ee5b4ac3
Merge pull request #2110 from Human-Connection/2106_unblock_a_user_in_the_user_settings 
2106-unblock a user in the user settings
 2019-11-15 15:51:52 +01:00
Robert Schäfer
fdb454c47a
Merge pull request #2241 from Human-Connection/fix-1936 
Fix 1936
 2019-11-15 15:50:44 +01:00
Robert Schäfer
fd4fee9aee
Merge pull request #2242 from Human-Connection/fix-1937 
fix(editor): Fix hashtags not working after embeded content
 2019-11-15 15:50:11 +01:00
Robert Schäfer
b6ecfa6ebb
Merge pull request #2185 from Human-Connection/dependabot/npm_and_yarn/webapp/prettier-1.19.1 
build(deps-dev): bump prettier from 1.18.2 to 1.19.1 in /webapp
 2019-11-15 15:49:29 +01:00
roschaefer
3fa7eeb038 @mattwr18 looks like you forgot $state 2019-11-15 15:37:16 +01:00
mattwr18
f8c5290be0 Clean up following @roschaefer PR review suggestions 2019-11-15 15:23:16 +01:00
mattwr18
a10a735e35 Tell vue-infinite-loader when complete or loaded 2019-11-15 14:56:44 +01:00
mattwr18
a6c169c2e0 Fix infinite scrolling out of control 2019-11-15 14:35:08 +01:00
roschaefer
56a940285b refactor: translations, tests 2019-11-15 14:29:33 +01:00
Alexander Friedland
767b4c8f15 Update webapp/locales/de.json 
Co-Authored-By: Alina Beck <alina.beck@mail.com>
 2019-11-15 14:29:33 +01:00
Alexander Friedland
dcc9889cee Update webapp/locales/en.json 
Co-Authored-By: Alina Beck <alina.beck@mail.com>
 2019-11-15 14:29:33 +01:00
Alexander Friedland
9bd1c59463 change unblk to unblock 2019-11-15 14:29:33 +01:00
Alexander Friedland
4b2da76709 change unblk TO unblock 
unblk TO unblock
 2019-11-15 14:29:33 +01:00
ogerly
e7056dd100 fix lint 2019-11-15 14:29:33 +01:00
ogerly
958b88ceda 2106-unblock a user in the user settings 2019-11-15 14:29:33 +01:00
roschaefer
db25403429 Fix lint 2019-11-15 11:20:50 +01:00
dependabot-preview[bot]
c31238087d
build(deps-dev): bump eslint-plugin-jest in /webapp 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 23.0.2 to 23.0.4.
- [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.2...v23.0.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-15 04:21:57 +00:00
roschaefer
9b9b72d528 Fix lint 2019-11-15 00:22:00 +01:00
Marco Bomfim
218faedbd9 Merge branch 'fix-1937' of https://github.com/MarcoBomfim/Human-Connection into fix-1937 2019-11-14 16:16:28 -03:00
Marco Bomfim
2951c3b526 Merge branch 'fix-1936' of https://github.com/MarcoBomfim/Human-Connection into fix-1936 2019-11-14 16:10:23 -03:00
Alina Beck
9a7222fad7 validate that name prop is included in the list of svg icons 2019-11-14 14:11:33 +03:00
Alina Beck
848e7d76da move icons to main assets folder 2019-11-14 14:11:00 +03:00
Alina Beck
2504fff3ba make BaseComponents globally available 2019-11-14 13:56:53 +03:00