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

6932 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
mattwr18
d1d7bf64fd
Merge pull request #2231 from Human-Connection/update-to-version-0.1.10 
Update to version 0.1.10
 2019-11-13 15:13:55 +01:00
mattwr18
4f68f79594 Update to version 0.1.10 2019-11-13 12:47:47 +01:00
mattwr18
804cd07444 v0.1.10 2019-11-13 12:47:02 +01:00
mattwr18
5446785f9e
Merge pull request #2127 from Human-Connection/update-contribution-guidelines 
Update contribution guidelines
 2019-11-13 10:10:07 +01:00
mattwr18
a0fe9cb94c
Merge pull request #2218 from Human-Connection/fix_locations_resolver 
fix: return `null` for missig translations
 2019-11-12 22:38:59 +01:00
mattwr18
25adced793
Merge pull request #2194 from Human-Connection/donation-info 
Add donation status and button
 2019-11-12 21:46:49 +01:00
mattwr18
4ee42e1371 Update time to reflect new earlier start 2019-11-12 21:16:28 +01:00
mattwr18
ecf0e5948b Commit to trigger build 
- prefer variables on one line
 2019-11-12 21:09:02 +01:00
mattwr18
e971aef3e8 Merge branch 'donation-info' of github.com:Human-Connection/Human-Connection into donation-info 2019-11-12 21:05:09 +01:00
mattwr18
7ce3e25110 Merge branch 'master' of github.com:Human-Connection/Human-Connection into donation-info 2019-11-12 21:04:54 +01:00
roschaefer
deb4b4f698 fix: return null for missig translations 
A query such as `{ notifications }` would return `null` for Locations
with a missing translation, e.g. `nameRU`. This would not happen for
queries implemented by `neo4j-graphql-js` because they nullify all
missing attributes automatically.
 2019-11-12 19:14:34 +01:00
Alina Beck
1b16dab554 make font size smaller on tiny screens 2019-11-12 19:26:23 +03:00
Alina Beck
63d223e368
Apply suggestions from code review 
Co-Authored-By: Robert Schäfer <git@roschaefer.de>
 2019-11-12 18:52:38 +03:00
Alina Beck
f8b16b35aa change times to german time 2019-11-12 18:12:25 +03:00
mattwr18
797b8338be
Merge pull request #2197 from Human-Connection/2195-define-missing-getters 
Added Empty Definitions For Missing Getters And Mutations
 2019-11-12 15:54:45 +01:00
mattwr18
8b5cd48d3c Translate success message, guard clause for no Donations 2019-11-12 15:33:21 +01:00
mattwr18
3b5e40efaa Merge branch 'master' of github.com:Human-Connection/Human-Connection into donation-info 2019-11-12 15:18:10 +01:00
dependabot-preview[bot]
2b2aaa04e1
build(deps-dev): bump eslint from 5.16.0 to 6.6.0 in /webapp 
Bumps [eslint](https://github.com/eslint/eslint) from 5.16.0 to 6.6.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v5.16.0...v6.6.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-12 13:06:14 +00:00
mattwr18
444630aeb0
Merge pull request #2209 from Human-Connection/dependabot/npm_and_yarn/backend/sentry/node-5.8.0 
build(deps): bump @sentry/node from 5.7.1 to 5.8.0 in /backend
 2019-11-12 14:05:02 +01:00