ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-13 07:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,408 Commits 117 Branches 1,511 Tags
Commit Graph

5716 Commits

Author SHA1 Message Date
mattwr18
b2119c1a07
Merge pull request #2314 from Human-Connection/dependabot/npm_and_yarn/webapp/fuse.js-3.4.6 
build(deps-dev): bump fuse.js from 3.4.5 to 3.4.6 in /webapp
 2019-11-22 10:13:44 +01:00
mattwr18
33fb439e18 Update component tests for imageAspectRatio 2019-11-21 13:54:05 +01:00
Moriz Wahl
7be79ddcf8 Same translation as in cypress test 2019-11-21 11:45:25 +01:00
mattwr18
b9d28e5a69 Set up frontend/backend to add imageAspectRatio 
- on create and update
 2019-11-21 11:32:42 +01:00
ogerly
b360f71112 Terms of use extended with dot - no commercial use 2019-11-21 10:16:10 +01:00
Wolfgang Huß
ef84e9991f Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1710-list-and-protocol-moderation 
# Conflicts:
#	backend/src/schema/index.js
 2019-11-21 08:09:50 +01:00
dependabot-preview[bot]
ab511138a6
build(deps-dev): bump fuse.js from 3.4.5 to 3.4.6 in /webapp 
Bumps [fuse.js](https://github.com/krisk/Fuse) from 3.4.5 to 3.4.6.
- [Release notes](https://github.com/krisk/Fuse/releases)
- [Changelog](https://github.com/krisk/Fuse/blob/master/CHANGELOG.md)
- [Commits](https://github.com/krisk/Fuse/compare/v3.4.5...v3.4.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-21 04:22:01 +00:00
Alina Beck
a158a88044 fix lint errors after merge 2019-11-20 19:36:47 +03:00
Alina Beck
a210dd599d Merge branch 'master' into migrate-styleguide-icons 2019-11-20 19:35:03 +03:00
Alina Beck
1f3159db47 add BaseIcon stories 2019-11-20 19:19:30 +03:00
mattwr18
95be6eaee6 Initial commit to add placeholder image for Post 2019-11-20 16:52:20 +01:00
Alina Beck
03eb32131c configure storybook to load BaseComponents and svgs 2019-11-20 18:19:36 +03:00
Wolfgang Huß
cf02ca4506 Refactor decide mutation to new CaseFolder structure 2019-11-20 15:17:37 +01:00
Alina Beck
0727c3314d move styles from view folder to assets 2019-11-20 16:13:07 +03:00
Alina Beck
70bfd9d70c fix console warnings and failing tests 2019-11-20 15:43:53 +03:00
Alina Beck
9bd4dbbd81 mock svg files in component tests 2019-11-20 15:27:30 +03:00
Alina Beck
4347bdd1ed replace require.context babel plugin 2019-11-20 15:12:51 +03:00
Alina Beck
77f4810ddc set up global localVue 
by setting up localVue with all required plugins (such as styleguide and vuex)
in a separate testSetup file we can avoid doing this individually in all component tests
the testSetup is executed before each test suite, so each test file gets a fresh
instance of localVue
 2019-11-20 12:31:40 +03:00
dependabot-preview[bot]
6f3bd47654
build(deps-dev): bump eslint-config-prettier in /webapp 
Bumps [eslint-config-prettier](https://github.com/prettier/eslint-config-prettier) from 6.6.0 to 6.7.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/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-20 04:23:25 +00:00
Robert Schäfer
694fb52381
Merge pull request #2293 from Human-Connection/2230-fix-typo 
Fix Typo Of Issue 2230
 2019-11-20 00:19:48 +01:00
Moriz Wahl
37b71b5e9a Fix Typo Of Issue 2230 2019-11-19 18:35:13 +01:00
mattwr18
c3d8cb68e0
Merge pull request #2076 from Human-Connection/1851-make-hashtags-clickable 
[Systems-Development-and-Frameworks] Clickable hashtags
 2019-11-19 14:00:28 +01:00
Alina Beck
90d4b361e8 update webapp readme to reflect new folder structure 2019-11-19 13:31:40 +03:00
Alina Beck
f9709bdcf3 add missing category icons 2019-11-19 12:29:08 +03:00
Alina Beck
4e6572a042 replace ds-icon with base-icon 2019-11-19 12:26:07 +03:00
Mogge
f7a072a64e
Merge pull request #2277 from Human-Connection/lokalise-2019-11-18_23-21-50 
Lokalise: Translations update
 2019-11-19 10:12:19 +01:00
mattwr18
48beeecaea
Merge pull request #2266 from Human-Connection/dependabot/npm_and_yarn/webapp/vue/eslint-config-prettier-6.0.0 
build(deps-dev): bump @vue/eslint-config-prettier from 5.0.0 to 6.0.0 in /webapp
 2019-11-19 08:34:15 +01:00
mattwr18
c775884c59
Merge pull request #2160 from Human-Connection/2119_Create_Post_consistent_form_input_validation 
🍰 2119-Fix Contribution  consistent form input validation
 2019-11-19 00:27:48 +01:00
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