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

6994 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wolfgang Huß
4a732beb0a Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1710-list-and-protocol-moderation 2019-11-18 07:59:44 +01:00
Wolfgang Huß
b569f46dad Refactor report mutation beginn 2019-11-18 07:57:52 +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
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
Wolfgang Huß
733f5c4d44 Rename db manipulation script file 2019-11-15 18:25:10 +01:00
Wolfgang Huß
5c4eb36b12 Get db manipulation script running 2019-11-15 17:18:12 +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
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
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
Wolfgang Huß
d2442b73c9 Refactor report mutation 2019-11-15 10:49:55 +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
Marco Bomfim
2951c3b526 Merge branch 'fix-1936' of https://github.com/MarcoBomfim/Human-Connection into fix-1936 2019-11-14 16:10:23 -03:00
Wolfgang Huß
bcd60c364d Refactor script for db change 2019-11-14 18:21:26 +01:00
mattwr18
aad6234be4 Add script to debug neo4j-graphl-js 
@roschaefer, I needed to push a commit to trigger the build again,
do you like this?
 2019-11-14 14:22:20 +01:00
roschaefer
c6e4c38de8 build(deps): remove deprecated debug flags 
I deprecated the debug flags myself here:
https://github.com/neo4j-graphql/neo4j-graphql-js/pull/288

You can now debug the queries run by `neo4j-graphql-js` by starting
the backend like this:

```bash
DEBUG=neo4j-graphql-js yarn run backend
```
 2019-11-14 14:22:20 +01:00
dependabot-preview[bot]
8ec91f46e7
build(deps-dev): bump prettier from 1.18.2 to 1.19.1 in /webapp 
Bumps [prettier](https://github.com/prettier/prettier) from 1.18.2 to 1.19.1.
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prettier/prettier/compare/1.18.2...1.19.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-14 09:55:41 +00:00
mattwr18
56f0c1a8e8
Merge pull request #2235 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-plugin-vue-6.0.1 
build(deps-dev): bump eslint-plugin-vue from 6.0.0 to 6.0.1 in /webapp
 2019-11-14 10:53:14 +01:00
mattwr18
5305577b69
Merge pull request #2205 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-6.6.0 
build(deps-dev): bump eslint from 5.16.0 to 6.6.0 in /webapp
 2019-11-14 10:26:05 +01:00
Wolfgang Huß
913fcc2cdb Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1710-list-and-protocol-moderation 
# Conflicts:
#	backend/src/schema/index.js
#	webapp/locales/pt.json
 2019-11-14 09:41:00 +01:00
dependabot-preview[bot]
45d60b233d
build(deps-dev): bump eslint-plugin-vue from 6.0.0 to 6.0.1 in /webapp 
Bumps [eslint-plugin-vue](https://github.com/vuejs/eslint-plugin-vue) from 6.0.0 to 6.0.1.
- [Release notes](https://github.com/vuejs/eslint-plugin-vue/releases)
- [Commits](https://github.com/vuejs/eslint-plugin-vue/compare/v6.0.0...v6.0.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-14 04:21:13 +00:00
mattwr18
ead0c5462d
Merge pull request #2233 from Human-Connection/add-locale-to-undefinedToNull 
Add locale to undefined to null
 2019-11-13 18:48:40 +01:00
mattwr18
b38fde0fd0 Fix production error "User.locale" returned undefined 2019-11-13 18:00:35 +01:00
mattwr18
3bfb6977b7 Update VERSION file 2019-11-13 15:46:02 +01:00