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
7,193 Commits 117 Branches 1,511 Tags
Commit Graph

7193 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
dependabot-preview[bot]
6be72696e7
build(deps): bump apollo-server from 2.9.7 to 2.9.9 in /backend 
Bumps [apollo-server](https://github.com/apollographql/apollo-server) from 2.9.7 to 2.9.9.
- [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.7...apollo-server@2.9.9)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-19 04:20:49 +00:00
dependabot-preview[bot]
eb8dc82123
build(deps-dev): bump apollo-server-testing in /backend 
Bumps [apollo-server-testing](https://github.com/apollographql/apollo-server) from 2.9.7 to 2.9.9.
- [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.7...apollo-server-testing@2.9.9)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-19 04:20:23 +00:00
dependabot-preview[bot]
a6a34f9d45
build(deps): bump @sentry/node from 5.8.0 to 5.9.0 in /backend 
Bumps [@sentry/node](https://github.com/getsentry/sentry-javascript) from 5.8.0 to 5.9.0.
- [Release notes](https://github.com/getsentry/sentry-javascript/releases)
- [Changelog](https://github.com/getsentry/sentry-javascript/blob/master/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-javascript/compare/5.8.0...5.9.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-19 04:19:46 +00: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
Robert Schäfer
9a985d464c
Merge pull request #2257 from Human-Connection/bump_metascraper_modules 
build(deps): bump metascraper modules
 2019-11-18 22:00:26 +01:00
mattwr18
123fc2f666 Fix lint with updated linter 2019-11-18 21:54:24 +01:00
mattwr18
0b5b7f5cbd
Merge pull request #2273 from Human-Connection/stale_bot 
build: configure stale bot
 2019-11-18 21:47:53 +01:00
mattwr18
19d2e2cd41
Merge pull request #2243 from Human-Connection/refactor_neo4j-graphql-js 
Explicitly define our schema, improve performance
 2019-11-18 21:46:56 +01:00
Robert Schäfer
92b036604f
Merge pull request #2274 from Human-Connection/dependabot/npm_and_yarn/https-proxy-agent-2.2.4 
build(deps): [security] bump https-proxy-agent from 2.2.1 to 2.2.4
 2019-11-18 21:32:51 +01:00
mattwr18
71f7f9ad43
Merge pull request #2251 from Human-Connection/record_cypress_tests 
build: record and publish all cypress test results
 2019-11-18 21:31:19 +01:00
mattwr18
399e13360e Update tests to test new validations 2019-11-18 21:23:12 +01:00
dependabot-preview[bot]
87273d7856
build(deps): [security] bump https-proxy-agent from 2.2.1 to 2.2.4 
Bumps [https-proxy-agent](https://github.com/TooTallNate/node-https-proxy-agent) from 2.2.1 to 2.2.4. **This update includes security fixes.**
- [Release notes](https://github.com/TooTallNate/node-https-proxy-agent/releases)
- [Commits](https://github.com/TooTallNate/node-https-proxy-agent/compare/2.2.1...2.2.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-18 19:22:45 +00:00
roschaefer
c35df53fdc build: record and publish all cypress test results 2019-11-18 18:32:33 +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
Robert Schäfer
bf067a3761
Merge pull request #2261 from Human-Connection/add-emacs-backups-to-gitignore 
Add Emacs Backup Files To Gitignore (*~)
 2019-11-18 18:05:27 +01:00
roschaefer
8de2f1cc8d build: configure stale bot 
@tirokk I increased the days of inactivity to 60 and 30. You can disable
stale issues permanently by using a label "pinned".
 2019-11-18 18:01:01 +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
mattwr18
0ca20187dc
Merge pull request #2163 from Human-Connection/2119_Create_Post_consistent_form_input_validation-improvements 
2119 create post consistent form input validation improvements
 2019-11-18 15:04:09 +01:00
Robert Schäfer
bb038ed46b
Merge pull request #2250 from Human-Connection/yarn_install_all 
Helper script to install all packages
 2019-11-18 11:27:26 +01:00
Robert Schäfer
602c2fd9f9
Merge pull request #2247 from Human-Connection/remove_unused_port_configuration 
refactor: remove redundant port configuration
 2019-11-18 11:26:14 +01:00
Alina Beck
48398075c8 style base icon 2019-11-18 12:23:26 +03: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