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

7450 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alina Beck
557fa3211d rearrange button stories 2019-12-17 13:01:50 +05:30
Alina Beck
92856afa3c sort storybook stories alphabetically 2019-12-17 12:51:05 +05:30
Alina Beck
dd89c2655b add button states 2019-12-11 17:06:06 +03:00
Alina Beck
2c2f69fbf8 add BaseButton component 2019-12-10 16:25:14 +03:00
Alina Beck
8f70ce5b31 set up css resets 2019-12-10 13:17:04 +03:00
Robert Schäfer
6dd435a4d1
Merge pull request #2456 from Human-Connection/dependabot/npm_and_yarn/backend/nodemailer-6.4.1 
build(deps): bump nodemailer from 6.4.0 to 6.4.1 in /backend
 2019-12-09 22:18:44 +01:00
Robert Schäfer
147cc73adb
Merge pull request #2459 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-loader-3.0.3 
build(deps-dev): bump eslint-loader from 3.0.2 to 3.0.3 in /webapp
 2019-12-09 22:17:32 +01:00
Robert Schäfer
e3fcb9adbd
Merge pull request #2460 from Human-Connection/dependabot/npm_and_yarn/backend/babel/core-7.7.5 
build(deps-dev): bump @babel/core from 7.7.4 to 7.7.5 in /backend
 2019-12-09 22:17:16 +01:00
Robert Schäfer
4dd548174d
Merge pull request #2461 from Human-Connection/dependabot/npm_and_yarn/webapp/babel/core-7.7.5 
build(deps-dev): bump @babel/core from 7.7.4 to 7.7.5 in /webapp
 2019-12-09 22:16:39 +01:00
Robert Schäfer
c2924a1886
Merge pull request #2463 from Human-Connection/dependabot/npm_and_yarn/webapp/babel/preset-env-7.7.6 
build(deps-dev): bump @babel/preset-env from 7.7.4 to 7.7.6 in /webapp
 2019-12-09 22:16:15 +01:00
Robert Schäfer
8d2ed484ea
Merge pull request #2464 from Human-Connection/dependabot/npm_and_yarn/webapp/async-validator-3.2.3 
build(deps-dev): bump async-validator from 3.2.2 to 3.2.3 in /webapp
 2019-12-09 22:15:54 +01:00
Robert Schäfer
4ebf7a281f
Merge pull request #2465 from Human-Connection/dependabot/submodules/styleguide-7ef8340 
build(deps): bump styleguide from `808b3c5` to `7ef8340`
 2019-12-09 22:15:25 +01:00
mattwr18
a370c56b0b
Merge pull request #2466 from Human-Connection/2442-paginate-moderation-page 
Paginate moderations page without losing filtering
 2019-12-09 21:23:12 +01:00
roschaefer
5271337b49 Reduce the number of database calls even more 2019-12-09 18:49:27 +01:00
mattwr18
60bf819a56 Remove counts to make less expensive db requests 2019-12-09 17:41:38 +01:00
mattwr18
79c6bd5c20 Paginate moderations page without losing filtering 
Co-authored-by: Tirokk <wolle.huss@pjannto.com>
 2019-12-09 16:37:04 +01:00
Robert Schäfer
f41b52f6e0
Merge pull request #2451 from Human-Connection/erhardtstiefel-patch-8 
Update it.json
 2019-12-09 15:37:23 +01:00
dependabot-preview[bot]
9a9ccc59fa
build(deps): bump styleguide from 808b3c5 to 7ef8340 
Bumps [styleguide](https://github.com/Human-Connection/Nitro-Styleguide) from `808b3c5` to `7ef8340`.
- [Release notes](https://github.com/Human-Connection/Nitro-Styleguide/releases)
- [Commits](808b3c5a95...7ef8340500)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-09 04:45:47 +00:00
dependabot-preview[bot]
65c4b1e43e
build(deps-dev): bump async-validator from 3.2.2 to 3.2.3 in /webapp 
Bumps [async-validator](https://github.com/yiminghe/async-validator) from 3.2.2 to 3.2.3.
- [Release notes](https://github.com/yiminghe/async-validator/releases)
- [Changelog](https://github.com/yiminghe/async-validator/blob/master/HISTORY.md)
- [Commits](https://github.com/yiminghe/async-validator/compare/v3.2.2...v3.2.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-09 04:22:27 +00:00
dependabot-preview[bot]
ca9c73dc53
build(deps-dev): bump @babel/preset-env from 7.7.4 to 7.7.6 in /webapp 
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.7.4 to 7.7.6.
- [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.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-09 04:21:55 +00:00
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
dependabot-preview[bot]
065e55c9be
build(deps-dev): bump @babel/core from 7.7.4 to 7.7.5 in /backend 
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:20:46 +00:00
dependabot-preview[bot]
86f546547c
build(deps-dev): bump eslint-loader from 3.0.2 to 3.0.3 in /webapp 
Bumps [eslint-loader](https://github.com/webpack-contrib/eslint-loader) from 3.0.2 to 3.0.3.
- [Release notes](https://github.com/webpack-contrib/eslint-loader/releases)
- [Changelog](https://github.com/webpack-contrib/eslint-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/eslint-loader/compare/v3.0.2...v3.0.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-09 04:20:43 +00:00
dependabot-preview[bot]
82fcc0d414
build(deps): bump nodemailer from 6.4.0 to 6.4.1 in /backend 
Bumps [nodemailer](https://github.com/nodemailer/nodemailer) from 6.4.0 to 6.4.1.
- [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.4.0...v6.4.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-09 04:19:30 +00:00
Erhardt Stiefel
93e4712002
Update it.json 2019-12-07 18:40:12 +01: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