ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-12 23:35:58 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,193 Commits 113 Branches 1,511 Tags
Commit Graph

7193 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
dependabot-preview[bot]
da8bdbb5e9
build(deps): bump cookie-universal-nuxt from 2.0.18 to 2.0.19 in /webapp 
Bumps [cookie-universal-nuxt](https://github.com/microcipcip/cookie-universal) from 2.0.18 to 2.0.19.
- [Release notes](https://github.com/microcipcip/cookie-universal/releases)
- [Commits](https://github.com/microcipcip/cookie-universal/compare/v2.0.18...v2.0.19)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-18 04:19:45 +00:00
Moriz Wahl
cac529a73d Test is running fine 2019-11-17 19:26:15 +01:00
Moriz Wahl
657a41ff7b Removed language method 2019-11-17 18:40:08 +01:00
Moriz Wahl
b0b6c7f14a Add Emacs Backup Files To Gitignore (*~) 2019-11-17 16:14:40 +01:00
dependabot-preview[bot]
36ef2d9c96
build(deps): bump node from 13.0.1-alpine to 13.1.0-alpine in /webapp 
Bumps node from 13.0.1-alpine to 13.1.0-alpine.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-16 19:43:41 +00:00
roschaefer
5d570c24a7 Fix tests 2019-11-16 20:21:27 +01:00
roschaefer
978347ba7b Tell github-linguists to ignore snapshots 2019-11-16 20:09:05 +01:00
Robert Schäfer
7afad12626
Merge pull request #2246 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-config-standard-14.1.0 
build(deps-dev): bump eslint-config-standard from 12.0.0 to 14.1.0 in /webapp
 2019-11-16 17:25:50 +01:00
roschaefer
2fbc16ffe1 build(deps): bump metascraper modules 2019-11-16 15:10:07 +01:00
roschaefer
36062ffa8c Fix lint 2019-11-16 14:34:23 +01:00
dependabot-preview[bot]
d0e3d33848
build(deps-dev): bump eslint-config-standard in /webapp 
Bumps [eslint-config-standard](https://github.com/standard/eslint-config-standard) from 12.0.0 to 14.1.0.
- [Release notes](https://github.com/standard/eslint-config-standard/releases)
- [Changelog](https://github.com/standard/eslint-config-standard/blob/master/CHANGELOG.md)
- [Commits](https://github.com/standard/eslint-config-standard/compare/v12.0.0...v14.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-16 13:28:40 +00:00
Robert Schäfer
4b550e2c21
Merge pull request #2236 from Human-Connection/dependabot/npm_and_yarn/backend/cucumber-6.0.5 
build(deps-dev): bump cucumber from 6.0.3 to 6.0.5 in /backend
 2019-11-16 14:25:53 +01:00
dependabot-preview[bot]
ff0e895866
build(deps-dev): bump cucumber from 6.0.3 to 6.0.5 in /backend 
Bumps [cucumber](https://github.com/cucumber/cucumber-js) from 6.0.3 to 6.0.5.
- [Release notes](https://github.com/cucumber/cucumber-js/releases)
- [Changelog](https://github.com/cucumber/cucumber-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/cucumber/cucumber-js/compare/v6.0.3...v6.0.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-15 17:56:00 +00:00
Robert Schäfer
e066715b2c
Merge pull request #2249 from Human-Connection/less_output_on_travis 
build: less verbose output on build server
 2019-11-15 18:52:44 +01:00
roschaefer
ba450a4f98 Helper script to install all packages 2019-11-15 18:02:04 +01:00
roschaefer
6b2b9fee93 Fix build 
I give up to run parallel frontends and backends for running fullstack
tests and development. Maybe it's even easier to have it that way.
 2019-11-15 17:32:07 +01:00
Robert Schäfer
f6550b9b00
Merge pull request #2248 from Human-Connection/2240-infinite-scrolling-out-of-control 
Fix infinite scrolling out of control
 2019-11-15 17:03:31 +01:00
roschaefer
4e34c668b3 build: less verbose output on build server 
I'm annoyed to scroll when I'm debugging the build server logs. I think,
if you run `jest` with an environment variable `CI` set to true, it will
not try to output colorized log and also does not output which test it's
currently running.

That should lead to the desired, smaller log on Travis CI.
 2019-11-15 17:02:52 +01:00
roschaefer
950df1cd07 Fix frontend tests 
I also removed one frontend test. The test case was checking an edge
case. We use `hasMore` as the single source of truth so I think it's
safe to remove this test case.
 2019-11-15 16:20:24 +01:00
Robert Schäfer
18ee5b4ac3
Merge pull request #2110 from Human-Connection/2106_unblock_a_user_in_the_user_settings 
2106-unblock a user in the user settings
 2019-11-15 15:51:52 +01:00
Robert Schäfer
fdb454c47a
Merge pull request #2241 from Human-Connection/fix-1936 
Fix 1936
 2019-11-15 15:50:44 +01:00
Robert Schäfer
fd4fee9aee
Merge pull request #2242 from Human-Connection/fix-1937 
fix(editor): Fix hashtags not working after embeded content
 2019-11-15 15:50:11 +01:00
Robert Schäfer
b6ecfa6ebb
Merge pull request #2185 from Human-Connection/dependabot/npm_and_yarn/webapp/prettier-1.19.1 
build(deps-dev): bump prettier from 1.18.2 to 1.19.1 in /webapp
 2019-11-15 15:49:29 +01:00
roschaefer
3fa7eeb038 @mattwr18 looks like you forgot $state 2019-11-15 15:37:16 +01:00
mattwr18
f8c5290be0 Clean up following @roschaefer PR review suggestions 2019-11-15 15:23:16 +01:00
mattwr18
a10a735e35 Tell vue-infinite-loader when complete or loaded 2019-11-15 14:56:44 +01:00
mattwr18
a6c169c2e0 Fix infinite scrolling out of control 2019-11-15 14:35:08 +01:00
roschaefer
56a940285b refactor: translations, tests 2019-11-15 14:29:33 +01:00
Alexander Friedland
767b4c8f15 Update webapp/locales/de.json 
Co-Authored-By: Alina Beck <alina.beck@mail.com>
 2019-11-15 14:29:33 +01:00
Alexander Friedland
dcc9889cee Update webapp/locales/en.json 
Co-Authored-By: Alina Beck <alina.beck@mail.com>
 2019-11-15 14:29:33 +01:00
Alexander Friedland
9bd1c59463 change unblk to unblock 2019-11-15 14:29:33 +01:00
Alexander Friedland
4b2da76709 change unblk TO unblock 
unblk TO unblock
 2019-11-15 14:29:33 +01:00
ogerly
e7056dd100 fix lint 2019-11-15 14:29:33 +01:00
ogerly
958b88ceda 2106-unblock a user in the user settings 2019-11-15 14:29:33 +01:00
roschaefer
c20a656405 Follow @mattwr18 suggestions 2019-11-15 12:04:43 +01:00
roschaefer
edbb0c3d1f Fix cypress tests 2019-11-15 11:55:15 +01:00
roschaefer
84d3323856 refactor: remove redundant port configuration 
If you set GRAPQHL_URI the port is already in there
 2019-11-15 11:45:52 +01:00
Robert Schäfer
90211b878c
Merge pull request #2245 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-plugin-jest-23.0.4 
build(deps-dev): bump eslint-plugin-jest from 23.0.2 to 23.0.4 in /webapp
 2019-11-15 11:21:53 +01:00
roschaefer
db25403429 Fix lint 2019-11-15 11:20:50 +01:00
roschaefer
fe48c0f4f2 Revert the taggedCount and postCount 
We need the order input types for our admin features.

This is a potential DOS vulnerability: Ordering the tags by taggedCount
might lead to very expensive cypher statements.
 2019-11-15 11:04:07 +01:00
roschaefer
0e3ace36fb Remove global filters for disabled/deleted 
I think there is no use case for it and it looks to me like sth. you
shouldn't be able to query for.
 2019-11-15 11:04:07 +01:00
roschaefer
034a353367 Hard-code graphql schema 
Apparently, `neo4j-graphql-js` *replaces* the schema partly. When we use
join models like `EMOTED`, `neo4j-graphql-js` puts in a join model with
the two names of the connected types.
 2019-11-15 11:04:07 +01:00
roschaefer
864f9db753 Remove potentially unused code 2019-11-15 11:04:07 +01:00
Robert Schäfer
98eea7d711
Merge pull request #2219 from Human-Connection/update_neo4j_graphql_js_and_remove_debug_statements 
build(deps): remove deprecated debug flags
 2019-11-15 11:03:09 +01:00
dependabot-preview[bot]
c31238087d
build(deps-dev): bump eslint-plugin-jest in /webapp 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 23.0.2 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.2...v23.0.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-15 04:21:57 +00:00
roschaefer
9b9b72d528 Fix lint 2019-11-15 00:22:00 +01:00
mattwr18
58f48781a2 Fix incorrect pronoun in docs 2019-11-14 23:53:31 +01:00
roschaefer
28e1ff9f55 Write documentation for neo4j-graphql-js 2019-11-14 23:13:10 +01:00
roschaefer
985e23c5b4 Remove obsolete script in package.json 
@mattwr18 nope, I would not create a script to debug neo4j-graphql-js.
If you use environment variables, please also use `cross-env`.
 2019-11-14 23:13:10 +01:00
Marco Bomfim
218faedbd9 Merge branch 'fix-1937' of https://github.com/MarcoBomfim/Human-Connection into fix-1937 2019-11-14 16:16:28 -03:00