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,384 Commits 5 Branches 2 Tags
Commit Graph

7384 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Schäfer
b7be0f100b
Merge pull request #2424 from Human-Connection/update-test-description 
Update test description
 2019-12-05 20:55:59 +01:00
Robert Schäfer
4b12ddb87c
Merge pull request #2419 from Human-Connection/update-yarn-lock 
Update yarn.lock after pulling in latest changes
 2019-12-05 20:54:44 +01:00
mattwr18
2827a6ae38
Merge pull request #2417 from Human-Connection/2387-fix-incorrect-privacy-page-path 
Update privacy path
 2019-12-05 20:36:11 +01:00
Robert Schäfer
0a22e1cd1f
Merge pull request #2431 from Human-Connection/browserstack 
Add browserstack logo to attributions
 2019-12-05 14:39:11 +01:00
roschaefer
be22cb8cda Add browserstack logo to attributions 
This is a requirement of their plan:
https://www.browserstack.com/open-source
 2019-12-05 12:26:35 +01:00
mattwr18
7116f31cf2
Merge pull request #2428 from Human-Connection/dependabot/npm_and_yarn/backend/sentry/node-5.10.0 
build(deps): bump @sentry/node from 5.9.0 to 5.10.0 in /backend
 2019-12-05 11:21:11 +01:00
mattwr18
467756eafb
Merge pull request #2427 from Human-Connection/dependabot/npm_and_yarn/backend/nodemailer-6.4.0 
build(deps): bump nodemailer from 6.3.1 to 6.4.0 in /backend
 2019-12-05 11:20:45 +01:00
dependabot-preview[bot]
2d510ebd1e
build(deps): bump @sentry/node from 5.9.0 to 5.10.0 in /backend 
Bumps [@sentry/node](https://github.com/getsentry/sentry-javascript) from 5.9.0 to 5.10.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.9.0...5.10.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-05 04:21:13 +00:00
dependabot-preview[bot]
3f4d8a8d15
build(deps): bump nodemailer from 6.3.1 to 6.4.0 in /backend 
Bumps [nodemailer](https://github.com/nodemailer/nodemailer) from 6.3.1 to 6.4.0.
- [Release notes](https://github.com/nodemailer/nodemailer/releases)
- [Changelog](https://github.com/nodemailer/nodemailer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nodemailer/nodemailer/compare/v6.3.1...v6.4.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-05 04:20:21 +00:00
Robert Schäfer
4010635f2b
Merge pull request #1954 from Human-Connection/1710-list-and-protocol-moderation 
List and protocol moderation
 2019-12-04 23:22:42 +01:00
mattwr18
8bd69e9e2f Fix import path 2019-12-04 20:11:34 +01:00
mattwr18
ace7818eac Update test description 
- the test clearly tests that the createdAt doesn't change, we changed
the implementation, but didn't change the test description
 2019-12-04 19:56:49 +01:00
mattwr18
42540eb909 Remove dead code, code creep 2019-12-04 19:55:48 +01:00
mattwr18
7becb09ef7 Add tests/Refactor 
- Move tests which are not resource specific to own describe block, add
test cases
 2019-12-04 19:41:58 +01:00
mattwr18
fe63e42262 Refactor component/story/test 
- Remove data-test where not necessary
- Refactor tests to remove tests that belong in ReportRow
- Fix story
 2019-12-04 19:40:32 +01:00
mattwr18
a59e72d8a8 Add stories/specs for ReportList 2019-12-04 19:40:08 +01:00
mattwr18
d0a18fded8 Rename component, add story/specs 2019-12-04 19:39:36 +01:00
mattwr18
235702867d Move components to components/features 
- we are reserving _new directory for components that have no dependency
on the Nitro-Styleguide
- update pat
 2019-12-04 19:38:48 +01:00
mattwr18
26b4d4ab93 Add clock icon inside if clause 2019-12-04 19:37:21 +01:00
mattwr18
085b59bf4d Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1710-list-and-protocol-moderation 2019-12-04 13:23:06 +01:00
mattwr18
80b65c205a Update yarn.lock after pulling in latest changes 
- not sure why these changes were not merged in with the PR that
upgraded these packages... maybe the dependabot PR was not rebased after
merging another package bump in?? anyways, everytime I run yarn install
in webapp after pulling in the latest changes, this appears.
 2019-12-04 10:28:54 +01:00
Alina Beck
68aabedc6d move css classes to the correct component files 2019-12-04 12:25:44 +03:00
roschaefer
d143d629ed Use data-test attributes, make test more resilient 
as suggested by @mattwr18
 2019-12-04 01:17:14 +01:00
roschaefer
84f574aaa0 Fix frontend tests 2019-12-04 00:22:28 +01:00
Robert Schäfer
faefe75fe6
Merge pull request #2335 from Human-Connection/webfinger 
fix: Re-enable webfinger feature
 2019-12-03 22:49:03 +01:00
roschaefer
a6dd6b4f3a Follow @mattwr18's suggestions 2019-12-03 21:49:17 +01:00
Robert Schäfer
148016e2bf
Update backend/src/activitypub/routes/webfinger.spec.js 
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2019-12-03 21:43:47 +01:00
Robert Schäfer
030fc9c5a4
Merge pull request #2402 from Human-Connection/close_neo4j_driver_sessions 
Close neo4j driver sessions
 2019-12-03 21:42:46 +01:00
mattwr18
6d7820ca75 Update privacy path 2019-12-03 21:07:26 +01:00
mattwr18
b93f7c73cf Remove unrelated files added accidentally 2019-12-03 18:59:25 +01:00
Robert Schäfer
ab4f658b69
Merge pull request #2385 from Human-Connection/swap_user_handle_with_name 
feat: swap user name<=>handle for discriminability
 2019-12-03 18:46:33 +01:00
mattwr18
b3640659bb Add missing unit tests/refactor code 
- Refactoring without tests makes it riskier
- Move some tests from resolver to middleware unit tests to live closer
to where the validation happens, remove duplicate tests
- DRY out code
 2019-12-03 17:59:59 +01:00
Alina Beck
750a1e523f extract ReportRow into separate component 2019-12-03 18:42:48 +03:00
Alina Beck
3de205d7c2 style nested table 2019-12-03 14:03:31 +03:00
Robert Schäfer
cab2ce0229
Merge pull request #2397 from Human-Connection/dependabot/npm_and_yarn/webapp/storybook/vue-5.2.8 
build(deps-dev): bump @storybook/vue from 5.2.6 to 5.2.8 in /webapp
 2019-12-03 11:30:07 +01:00
Robert Schäfer
a971d1ff65
Merge pull request #2398 from Human-Connection/dependabot/npm_and_yarn/webapp/storybook/addon-actions-5.2.8 
build(deps-dev): bump @storybook/addon-actions from 5.2.6 to 5.2.8 in /webapp
 2019-12-03 11:29:48 +01:00
Robert Schäfer
f3afb79cb7
Merge pull request #2400 from Human-Connection/fix_shouts_translation 
Fix German translation of "Shouts"
 2019-12-03 11:29:19 +01:00
Alina Beck
d685ff9e7b translate and style user count 2019-12-03 13:25:20 +03:00
Alina Beck
9801369343 merge table rows 2019-12-03 13:07:24 +03:00
Alina Beck
4585dc7e8c table cell content design tweaks 2019-12-03 12:45:28 +03:00
Alina Beck
febabf9303 rename table header translations 2019-12-03 12:25:19 +03:00
Alina Beck
21a3ff4bc8 render just one thead and tbody for the reports table 2019-12-03 12:03:41 +03:00
dependabot-preview[bot]
eee0253c2c
build(deps-dev): bump @storybook/vue from 5.2.6 to 5.2.8 in /webapp 
Bumps [@storybook/vue](https://github.com/storybookjs/storybook/tree/HEAD/app/vue) from 5.2.6 to 5.2.8.
- [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.8/app/vue)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-03 08:41:37 +00:00
dependabot-preview[bot]
7669586690
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.6 to 5.2.8.
- [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.8/addons/actions)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-03 08:41:36 +00:00
mattwr18
462750add6
Merge pull request #2407 from Human-Connection/dependabot/npm_and_yarn/webapp/tiptap-extensions-1.28.5 
build(deps): bump tiptap-extensions from 1.28.4 to 1.28.5 in /webapp
 2019-12-03 09:40:53 +01:00
mattwr18
87bd623cdf
Merge pull request #2406 from Human-Connection/dependabot/npm_and_yarn/webapp/storybook/addon-a11y-5.2.8 
build(deps-dev): bump @storybook/addon-a11y from 5.2.7 to 5.2.8 in /webapp
 2019-12-03 09:39:08 +01:00
mattwr18
37ff9467e1
Merge pull request #2405 from Human-Connection/dependabot/npm_and_yarn/webapp/css-loader-3.2.1 
build(deps-dev): bump css-loader from 3.2.0 to 3.2.1 in /webapp
 2019-12-03 09:38:51 +01:00
Alina Beck
150ffef35a style report list header 2019-12-03 11:37:58 +03:00
dependabot-preview[bot]
bd34a86569
build(deps): bump tiptap-extensions from 1.28.4 to 1.28.5 in /webapp 
Bumps [tiptap-extensions](https://github.com/scrumpy/tiptap) from 1.28.4 to 1.28.5.
- [Release notes](https://github.com/scrumpy/tiptap/releases)
- [Commits](https://github.com/scrumpy/tiptap/compare/tiptap-extensions@1.28.4...tiptap-extensions@1.28.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-03 04:23:18 +00:00
dependabot-preview[bot]
38d7718d60
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.7 to 5.2.8.
- [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.8/addons/a11y)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-03 04:22:42 +00:00