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

7426 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
dependabot-preview[bot]
7d87183e87
build(deps-dev): bump @babel/core from 7.7.4 to 7.7.5 in /webapp 
Bumps [@babel/core](https://github.com/babel/babel) from 7.7.4 to 7.7.5.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.7.4...v7.7.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-09 04:21:20 +00:00
Robert Schäfer
65988ea0a1
Merge pull request #2304 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-5.8.9 
build(deps): bump metascraper from 5.8.8 to 5.8.9 in /backend
 2019-12-06 13:49:23 +01:00
Robert Schäfer
714da96a54
Merge pull request #2303 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-video-5.8.9 
build(deps): bump metascraper-video from 5.8.7 to 5.8.9 in /backend
 2019-12-06 13:49:11 +01:00
Robert Schäfer
8e9e0be333
Merge pull request #2440 from Human-Connection/dependabot/npm_and_yarn/backend/neo4j-graphql-js-2.10.0 
build(deps): bump neo4j-graphql-js from 2.9.3 to 2.10.0 in /backend
 2019-12-06 12:37:33 +01:00
mattwr18
a8edf46b56
Merge pull request #2422 from Human-Connection/2401-Hide_Donations_Bar 
Hide Donations Bar
 2019-12-06 11:25:55 +01:00
mattwr18
8a06e9bb25
Merge pull request #2436 from Human-Connection/dependabot/npm_and_yarn/backend/sentry/node-5.10.1 
build(deps): bump @sentry/node from 5.10.0 to 5.10.1 in /backend
 2019-12-06 10:44:33 +01:00
mattwr18
2d332e0707
Merge pull request #2437 from Human-Connection/dependabot/npm_and_yarn/cypress-cucumber-preprocessor-1.18.0 
build(deps-dev): bump cypress-cucumber-preprocessor from 1.17.0 to 1.18.0
 2019-12-06 10:44:13 +01:00
mattwr18
0671a0cdf4
Merge pull request #2439 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-testing-2.9.13 
build(deps-dev): bump apollo-server-testing from 2.9.12 to 2.9.13 in /backend
 2019-12-06 10:43:55 +01:00
mattwr18
e020c3bfdb
Merge pull request #2441 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-2.9.13 
build(deps): bump apollo-server from 2.9.12 to 2.9.13 in /backend
 2019-12-06 10:39:24 +01:00
mattwr18
3a455a647a
Merge pull request #2435 from Human-Connection/eliminate_database_calls 
Eliminate database calls for reports query
 2019-12-06 10:36:50 +01:00
dependabot-preview[bot]
5ee362e411
build(deps): bump apollo-server from 2.9.12 to 2.9.13 in /backend 
Bumps [apollo-server](https://github.com/apollographql/apollo-server) from 2.9.12 to 2.9.13.
- [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.12...apollo-server@2.9.13)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-06 04:20:20 +00:00
dependabot-preview[bot]
c0d9fed9eb
build(deps): bump neo4j-graphql-js from 2.9.3 to 2.10.0 in /backend 
Bumps [neo4j-graphql-js](https://github.com/neo4j-graphql/neo4j-graphql-js) from 2.9.3 to 2.10.0.
- [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-12-06 04:19:37 +00:00
dependabot-preview[bot]
57696454ca
build(deps-dev): bump apollo-server-testing in /backend 
Bumps [apollo-server-testing](https://github.com/apollographql/apollo-server) from 2.9.12 to 2.9.13.
- [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.12...apollo-server-testing@2.9.13)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-06 04:19:24 +00:00
dependabot-preview[bot]
a0aa794ebb
build(deps-dev): bump cypress-cucumber-preprocessor 
Bumps [cypress-cucumber-preprocessor](https://github.com/TheBrainFamily/cypress-cucumber-preprocessor) from 1.17.0 to 1.18.0.
- [Release notes](https://github.com/TheBrainFamily/cypress-cucumber-preprocessor/releases)
- [Changelog](https://github.com/TheBrainFamily/cypress-cucumber-preprocessor/blob/master/CHANGELOG.md)
- [Commits](https://github.com/TheBrainFamily/cypress-cucumber-preprocessor/compare/v1.17.0...v1.18.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-06 04:18:22 +00:00
dependabot-preview[bot]
5ca46d8855
build(deps): bump @sentry/node from 5.10.0 to 5.10.1 in /backend 
Bumps [@sentry/node](https://github.com/getsentry/sentry-javascript) from 5.10.0 to 5.10.1.
- [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.10.0...5.10.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-06 04:18:14 +00:00
roschaefer
fdca5b008b Return empty array instead null for "not reviewed" 
@mattwr18 why did you add the null check in th resolver?
 2019-12-06 02:47:14 +01:00
roschaefer
2f2bf571ed Eliminate database calls for filed and reviewed 
I learned map projections and list comprehensions in cypher tonight!
🎉 So much wow!
 2019-12-06 01:57:49 +01:00
Robert Schäfer
942e74163e
Merge pull request #2430 from Human-Connection/load-svgs-with-babel 
Use babel-loader with vue-svg-loader
 2019-12-05 23:27:24 +01:00
mattwr18
4d0df181b6
Merge pull request #2432 from Human-Connection/remove-query-for-disable-property-for-reports 
Remove disable from reports.disable Query
 2019-12-05 21:14:55 +01:00
mattwr18
9fd4ad47dd
Merge pull request #2317 from Human-Connection/2253-fix-scroll-layout-issue 
2253 fix scroll layout issue
 2019-12-05 21:02:10 +01:00
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
mattwr18
55f25b153c Remove disable from models/Report.js 
- we are not setting this property, and it's inclusion in this model
with a default false value meant that there were no errors with seeded
data, but with the data returned from the db_manipulation there was.
 2019-12-05 20:31:19 +01:00
mattwr18
b82e6f4d81 Move db script to neo4j/db_manipulation directory 2019-12-05 19:57:53 +01:00
mattwr18
517963174b We are not setting disable on Report node 
- we are adding the report rule which says that if a resource was
disabled by a report with this rule, then the latest review was the one
that disabled it.
- fix db script/ add new directory for keeping record of db scripts
 2019-12-05 19:52:05 +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
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
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
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