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

10382 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
mattwr18
de64f1dd4a Refactor hashtagsMiddleware updateHashtagsOfPost 
- Favor transaction functions for production environment
- Use one transaction instead of two as we can use optional match to
delete potential previous relationships
 2019-12-05 13:43:55 +01:00
mattwr18
f2743c992f Use transaction function jwt/decode 2019-12-05 13:18:06 +01:00
mattwr18
5117a97b1c Use readTransaction for non-write transactions 2019-12-05 13:17:26 +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
Alina Beck
f20531ece3 use babel-loader with vue-svg-loader 2019-12-05 13:59:06 +03: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
mattwr18
be319615f8 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 2253-fix-scroll-layout-issue 2019-12-05 11:16:16 +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
ogerly
9ee8ce27bc Donate Button show , lint ok 2019-12-04 17:55:43 +01:00
ogerly
cc3c6e5d35 lint fix 2019-12-04 15:54:34 +01:00
ogerly
b532a38966 lint fix 2019-12-04 15:23:16 +01:00
ogerly
7c26e84463 rename Blur() to blur() 2019-12-04 15:17:21 +01:00
ogerly
7b0b2cc93e rename checkedBlur to blurImage, testing checkbox 2019-12-04 15:14:57 +01:00
Alina Beck
b1955e64f4 improve tests, following @roschaefer suggestions 2019-12-04 16:57:42 +03: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
58835947ad Remove data-test attriubutes in non-dev env 2019-12-04 11:56:52 +01:00
ogerly
bcb0bd21a5 test review2 2019-12-04 11:21:26 +01:00
ogerly
6ce797e8ef test review 2019-12-04 11:20:27 +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
Alexander Friedland
8d93956de0
change 
change representiere <TO> repräsentiere
 2019-12-03 18:47:38 +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
ogerly
a5bbb06f77 fix Spec + lint 2019-12-03 18:27:05 +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
ogerly
38c58af1f3 add confirm checkboc No Comercial account 2019-12-03 17:57:30 +01:00
Alina Beck
750a1e523f extract ReportRow into separate component 2019-12-03 18:42:48 +03:00
mattwr18
66f1aa8888 Follow @roschaefer PR review suggestions 
- Update seed file with more human readable imageAspectRatios
- Remove copy script from Dockerfile to not expose to others. we'll need
to either start a maintenance server, so it has access to both the
backend/public/uploads and cypher-shell, or copy a script to the backend
that creates a csv, which can be copied to the neo4j pod and then loaded
into the cypher.
- Remove unintended changes to deployment/legacy-migration
- Add back image compression to Post images
 2019-12-03 15:33:54 +01: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