IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2026-04-06 01:25:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,126 Commits 6 Branches 103 Tags
Commit Graph

7126 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
lokalise-bot
d2b3396e9b Lokalise: update of webapp/locales/de.json 2019-11-22 12:55:25 +01:00
mattwr18
5007520749
Merge pull request #2310 from Human-Connection/make-cypress-work-for-i18n-again 
Changed translation must change test :(
 2019-11-22 12:52:29 +01:00
mattwr18
08d78a2005
Merge pull request #2318 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-testing-2.9.12 
build(deps-dev): bump apollo-server-testing from 2.9.9 to 2.9.12 in /backend
 2019-11-22 10:14:13 +01:00
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
9a6da009ff
Merge pull request #2302 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-config-prettier-6.7.0 
build(deps-dev): bump eslint-config-prettier from 6.6.0 to 6.7.0 in /webapp
 2019-11-22 10:13:21 +01:00
mattwr18
95b500be05
Merge pull request #2301 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-lang-5.8.9 
build(deps): bump metascraper-lang from 5.8.7 to 5.8.9 in /backend
 2019-11-22 10:13:05 +01:00
mattwr18
0aea441e2b
Merge pull request #2298 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-soundcloud-5.8.9 
build(deps): bump metascraper-soundcloud from 5.8.7 to 5.8.9 in /backend
 2019-11-22 10:12:44 +01:00
mattwr18
489e6cc476
Merge pull request #2297 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-youtube-5.8.9 
build(deps): bump metascraper-youtube from 5.8.7 to 5.8.9 in /backend
 2019-11-22 10:12:32 +01:00
mattwr18
c453fd1207
Merge pull request #2296 from Human-Connection/dependabot/npm_and_yarn/date-fns-2.8.0 
build(deps-dev): bump date-fns from 2.7.0 to 2.8.0
 2019-11-22 10:12:16 +01:00
dependabot-preview[bot]
b3cbe8ac9b
build(deps-dev): bump apollo-server-testing in /backend 
Bumps [apollo-server-testing](https://github.com/apollographql/apollo-server) from 2.9.9 to 2.9.12.
- [Release notes](https://github.com/apollographql/apollo-server/releases)
- [Changelog](https://github.com/apollographql/apollo-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-server/compare/apollo-server-testing@2.9.9...apollo-server-testing@2.9.12)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-22 04:20:12 +00:00
Moriz Wahl
7be79ddcf8 Same translation as in cypress test 2019-11-21 11:45:25 +01:00
mattwr18
b859102275
Merge pull request #2311 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-2.9.11 
build(deps): bump apollo-server from 2.9.9 to 2.9.11 in /backend
 2019-11-21 11:37:59 +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
dependabot-preview[bot]
3ecd1d6b24
build(deps): bump apollo-server from 2.9.9 to 2.9.11 in /backend 
Bumps [apollo-server](https://github.com/apollographql/apollo-server) from 2.9.9 to 2.9.11.
- [Release notes](https://github.com/apollographql/apollo-server/releases)
- [Changelog](https://github.com/apollographql/apollo-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-server/compare/apollo-server@2.9.9...apollo-server@2.9.11)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-21 04:19:41 +00:00
Moriz Wahl
a39a040e91 Changed translation must change test :( 2019-11-20 19:48:04 +01:00
steffi
e8e78a62b0 Fixed the link to development environment and text 2019-11-20 19:27:07 +01:00
steffi
98758e527a Fixed the link to development environment 2019-11-20 19:24:45 +01: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
Alina Beck
03eb32131c configure storybook to load BaseComponents and svgs 2019-11-20 18:19:36 +03: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
dependabot-preview[bot]
1d34e8c1cc
build(deps): bump metascraper-lang from 5.8.7 to 5.8.9 in /backend 
Bumps [metascraper-lang](https://github.com/microlinkhq/metascraper) from 5.8.7 to 5.8.9.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.8.7...v5.8.9)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-20 04:23:06 +00:00
dependabot-preview[bot]
102c99409a
build(deps): bump metascraper-soundcloud from 5.8.7 to 5.8.9 in /backend 
Bumps [metascraper-soundcloud](https://github.com/microlinkhq/metascraper-soundcloud) from 5.8.7 to 5.8.9.
- [Release notes](https://github.com/microlinkhq/metascraper-soundcloud/releases)
- [Commits](https://github.com/microlinkhq/metascraper-soundcloud/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-20 04:22:02 +00:00
dependabot-preview[bot]
271ace7173
build(deps): bump metascraper-youtube from 5.8.7 to 5.8.9 in /backend 
Bumps [metascraper-youtube](https://github.com/microlinkhq/metascraper-youtube) from 5.8.7 to 5.8.9.
- [Release notes](https://github.com/microlinkhq/metascraper-youtube/releases)
- [Commits](https://github.com/microlinkhq/metascraper-youtube/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-20 04:21:18 +00:00
dependabot-preview[bot]
70d23aa58f
build(deps-dev): bump date-fns from 2.7.0 to 2.8.0 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.7.0 to 2.8.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.7.0...v2.8.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-20 04:20:49 +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
Robert Schäfer
aca775c198
Merge pull request #2283 from Human-Connection/dependabot/npm_and_yarn/backend/neo4j-graphql-js-2.9.3 
build(deps): bump neo4j-graphql-js from 2.9.0 to 2.9.3 in /backend
 2019-11-19 13:13:23 +01:00
Robert Schäfer
85985d9141
Merge pull request #2285 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-plugin-jest-23.0.4 
build(deps-dev): bump eslint-plugin-jest from 23.0.3 to 23.0.4 in /backend
 2019-11-19 13:11:17 +01:00
Robert Schäfer
2a161aa1f8
Merge pull request #2286 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-config-prettier-6.7.0 
build(deps-dev): bump eslint-config-prettier from 6.5.0 to 6.7.0 in /backend
 2019-11-19 13:10:57 +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
dependabot-preview[bot]
6c2c0851d8
build(deps-dev): bump eslint-config-prettier in /backend 
Bumps [eslint-config-prettier](https://github.com/prettier/eslint-config-prettier) from 6.5.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-19 07:36:21 +00: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
2ee3a79867
Merge pull request #2281 from Human-Connection/dependabot/npm_and_yarn/backend/prettier-1.19.1 
build(deps-dev): bump prettier from 1.18.2 to 1.19.1 in /backend
 2019-11-19 08:33:03 +01:00
mattwr18
2d581b1727
Merge pull request #2280 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-2.9.9 
build(deps): bump apollo-server from 2.9.7 to 2.9.9 in /backend
 2019-11-19 08:32:11 +01:00
mattwr18
9ddd424132
Merge pull request #2279 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-testing-2.9.9 
build(deps-dev): bump apollo-server-testing from 2.9.7 to 2.9.9 in /backend
 2019-11-19 08:31:43 +01:00
mattwr18
388c669f40
Merge pull request #2278 from Human-Connection/dependabot/npm_and_yarn/backend/sentry/node-5.9.0 
build(deps): bump @sentry/node from 5.8.0 to 5.9.0 in /backend
 2019-11-19 08:30:46 +01:00
dependabot-preview[bot]
477285a095
build(deps-dev): bump eslint-plugin-jest in /backend 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 23.0.3 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.3...v23.0.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-19 04:23:18 +00:00
dependabot-preview[bot]
0172e23c36
build(deps): bump neo4j-graphql-js from 2.9.0 to 2.9.3 in /backend 
Bumps [neo4j-graphql-js](https://github.com/neo4j-graphql/neo4j-graphql-js) from 2.9.0 to 2.9.3.
- [Release notes](https://github.com/neo4j-graphql/neo4j-graphql-js/releases)
- [Changelog](https://github.com/neo4j-graphql/neo4j-graphql-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/neo4j-graphql/neo4j-graphql-js/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-19 04:22:15 +00:00
dependabot-preview[bot]
4f103f986b
build(deps-dev): bump prettier from 1.18.2 to 1.19.1 in /backend 
Bumps [prettier](https://github.com/prettier/prettier) from 1.18.2 to 1.19.1.
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prettier/prettier/compare/1.18.2...1.19.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-19 04:21:15 +00:00