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

4872 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
dependabot-preview[bot]
96007bb42e
Bump dotenv from 8.0.0 to 8.1.0 in /backend 
Bumps [dotenv](https://github.com/motdotla/dotenv) from 8.0.0 to 8.1.0.
- [Release notes](https://github.com/motdotla/dotenv/releases)
- [Changelog](https://github.com/motdotla/dotenv/blob/master/CHANGELOG.md)
- [Commits](https://github.com/motdotla/dotenv/compare/v8.0.0...v8.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-19 04:35:23 +00:00
mattwr18
90e5579cab
Merge pull request #1278 from Human-Connection/fix_hashtag_db_import 
Fix hashtag db import
 2019-08-16 14:37:09 +02:00
mattwr18
d0dab6fdf8
Merge pull request #1277 from Human-Connection/fix_bug_on_admin_dashboard 
Fix `Cannot read property countUser of null`
 2019-08-16 14:34:11 +02:00
Robert Schäfer
cd80981130
Merge pull request #1279 from Human-Connection/dependabot/npm_and_yarn/backend/hapi/joi-15.1.1 
Bump @hapi/joi from 15.1.0 to 15.1.1 in /backend
 2019-08-16 10:27:06 +02:00
mattwr18
50fc7b8580
Merge pull request #1271 from Human-Connection/fix_missing_slug 
Fix user mention menu on production data
 2019-08-16 09:22:46 +02:00
dependabot-preview[bot]
ba1052d337
Bump @hapi/joi from 15.1.0 to 15.1.1 in /backend 
Bumps [@hapi/joi](https://github.com/hapijs/joi) from 15.1.0 to 15.1.1.
- [Release notes](https://github.com/hapijs/joi/releases)
- [Changelog](https://github.com/hapijs/joi/blob/master/CHANGELOG.md)
- [Commits](https://github.com/hapijs/joi/compare/v15.1.0...v15.1.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-16 04:19:32 +00:00
roschaefer
51b734275a The name of the hashtag is now it's ID 
`name` was just a redundant attribute
 2019-08-16 01:49:29 +02:00
roschaefer
bb4b3196a7 Fix various issues in legacy db import 
Most important: Remove `#` symbol from Tags and snakeCase them.
 2019-08-16 00:29:42 +02:00
roschaefer
3d4724e314 Fix Cannot read property countUser of null 
This commit message is a great example of why you should explain
**the reason** of your commit.

When I came across this bug I had a quick look into the code where it
came from. I could see that the bug only happened after a timer and
apparently reverting the biggest part of d84892930295dcfd3f6687fc33c7234446127099
would fix the bug. However I have no idea what the following commit
message means:

```
commit d84892930295dcfd3f6687fc33c7234446127099
Author: Grzegorz Leoniec <greg@app-interactive.de>
Date:   Wed Mar 6 18:45:57 2019 +0100

    Improved countTo component
```

I just don't know why the code is there - like what is it's purpose
@appinteractive? I can only guess: I believe that it's supposed to
update the counters in-place (without starting from 0 everytime).
Because apollo was set to poll the data every second.

Taking that into account I would rather remove this polling feature
completely and have less code and less complexity. Admins can still
refresh the page.
 2019-08-16 00:28:13 +02:00
Robert Schäfer
1c1d74e30d
Merge pull request #1274 from Human-Connection/dependabot/npm_and_yarn/webapp/human-connection/styleguide-0.5.19 
Bump @human-connection/styleguide from 0.5.18 to 0.5.19 in /webapp
 2019-08-15 22:36:19 +02:00
Robert Schäfer
9ccfa2f0da
Merge pull request #1176 from Human-Connection/845-load-more 
845 load more
 2019-08-15 22:03:32 +02:00
dependabot-preview[bot]
22f79d6e0b
Bump @human-connection/styleguide from 0.5.18 to 0.5.19 in /webapp 
Bumps @human-connection/styleguide from 0.5.18 to 0.5.19.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-15 20:00:09 +00:00
roschaefer
d3b256e99e Fix user mention menu on production data 
Apparently some of our users in production have no slug, this will
assign an (hopefully unique) random slug to them.
 2019-08-15 21:07:23 +02:00
Robert Schäfer
2cb8719d5f
Merge pull request #1269 from Human-Connection/dependabot/npm_and_yarn/webapp/human-connection/styleguide-0.5.18 
Bump @human-connection/styleguide from 0.5.17 to 0.5.18 in /webapp
 2019-08-15 20:35:20 +02:00
dependabot-preview[bot]
8305c69def
Bump @human-connection/styleguide from 0.5.17 to 0.5.18 in /webapp 
Bumps @human-connection/styleguide from 0.5.17 to 0.5.18.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-15 15:43:57 +00:00
roschaefer
67bd1184aa Fine tune throttle delay 2019-08-15 17:09:08 +02:00
roschaefer
a052743e8b Bind infinite-scroll-* correctly 2019-08-15 11:39:09 +02:00
Robert Schäfer
f5c939472b Fix console.errors in frontend tests 
@MoldaB here's how you can register plugins in a frontend test. Pro tip:
You can run `yarn run test --run-in-band` to find out where the
console.errors come from. Jest, by default, runs in parallel which makes
it a little difficult to debug errors that don't fail the test.
 2019-08-15 11:08:42 +02:00
molda
7cd3b0d524 implemented infinite-scroll in profile page 2019-08-15 11:08:42 +02:00
molda
2edf26ac0a implemented infinite-scroll to index page 2019-08-15 11:08:42 +02:00
molda
8f7ec2efe6 added vue-infinite-scroll plugin 2019-08-15 11:08:42 +02:00
Robert Schäfer
544fd0d84c
Merge pull request #1265 from Human-Connection/dependabot/npm_and_yarn/backend/graphql-middleware-3.0.5 
Bump graphql-middleware from 3.0.3 to 3.0.5 in /backend
 2019-08-15 11:02:07 +02:00
dependabot-preview[bot]
31fa930ee2
Bump graphql-middleware from 3.0.3 to 3.0.5 in /backend 
Bumps [graphql-middleware](https://github.com/prisma/graphql-middleware) from 3.0.3 to 3.0.5.
- [Release notes](https://github.com/prisma/graphql-middleware/releases)
- [Commits](https://github.com/prisma/graphql-middleware/compare/v3.0.3...v3.0.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-15 04:21:52 +00:00
Robert Schäfer
dac417f0a5
Merge pull request #1258 from Human-Connection/dependabot/npm_and_yarn/webapp/tiptap-extensions-1.26.2 
Bump tiptap-extensions from 1.26.1 to 1.26.2 in /webapp
 2019-08-15 00:33:37 +02:00
Robert Schäfer
4249ba7334
Merge pull request #1260 from Human-Connection/dependabot/npm_and_yarn/webapp/vue-izitoast-ba6b03e 
Bump vue-izitoast from `c246fd7` to `ba6b03e` in /webapp
 2019-08-14 23:53:42 +02:00
Robert Schäfer
244a23a3dd
Merge pull request #1257 from Human-Connection/dependabot/npm_and_yarn/backend/neo4j-graphql-js-2.7.0 
Bump neo4j-graphql-js from 2.6.3 to 2.7.0 in /backend
 2019-08-14 23:52:51 +02:00
dependabot-preview[bot]
a163fe17e9
Bump tiptap-extensions from 1.26.1 to 1.26.2 in /webapp 
Bumps [tiptap-extensions](https://github.com/scrumpy/tiptap) from 1.26.1 to 1.26.2.
- [Release notes](https://github.com/scrumpy/tiptap/releases)
- [Commits](https://github.com/scrumpy/tiptap/compare/tiptap-extensions@1.26.1...tiptap-extensions@1.26.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-14 21:43:20 +00:00
Robert Schäfer
09e89b19e9
Merge pull request #1259 from Human-Connection/dependabot/npm_and_yarn/webapp/tiptap-1.24.2 
Bump tiptap from 1.24.1 to 1.24.2 in /webapp
 2019-08-14 23:40:59 +02:00
Alexander Friedland
048c4a2502
Merge pull request #1224 from Human-Connection/A-1208-Registration-without-user-condition-confirmation 
🍰 Registration confirmation of terms of use added II
 2019-08-14 18:09:07 +02:00
Robert Schäfer
b6c96b7a57
Merge pull request #1261 from Human-Connection/1201-localise-categories 
Localise categories
 2019-08-14 17:44:21 +02:00
roschaefer
58a7e1ce2d Simplifycomponent, improve texts 
@ogerly there is a difference between read and confirm: You can read but
don't have to confirm the terms and conditions. Therefore it's quite
important that the user also confirms the terms and conditions.
 2019-08-14 16:38:35 +02:00
mattwr18
ab6cd501fe
Merge pull request #1209 from Human-Connection/1054-blocked-users 
🍰 1054 blocked users
 2019-08-14 16:36:41 +02:00
Matt Rider
a21cf5aef6 Fix cypress test 2019-08-14 15:19:27 +02:00
Matt Rider
f2dcd99ac5 Fix lint, remove console.log 2019-08-14 14:33:55 +02:00
ogerly
397b41377a delete console.log 2019-08-14 14:31:47 +02:00
Matt Rider
6099a986c9 Improve English, update case for English translations 2019-08-14 14:29:35 +02:00
ogerly
8307c4f48f Merge branch 'A-1208-Registration-without-user-condition-confirmation' of https://github.com/Human-Connection/Human-Connection into A-1208-Registration-without-user-condition-confirmation 2019-08-14 14:29:12 +02:00
ogerly
a5f448036c Suggestions implemented II 2019-08-14 14:27:44 +02:00
Robert Schäfer
34e3f7efd7
Delete package-lock.json 
This file is generated by `npm` but we use `yarn`. It is not recommended to use multiple package managers.
 2019-08-14 14:24:43 +02:00
ogerly
b3ab6e1b43 Suggestions implemented II 2019-08-14 14:12:55 +02:00
Matt Rider
ee93efd6d9 Localise categories 2019-08-14 13:57:39 +02:00
mattwr18
0213eec4e2
Merge pull request #1244 from Human-Connection/451-lokalise-unlocalised-texts-20190812 
🍰 454 Lokalise / translate all unlocalised Texts / Translations / Languages
 2019-08-14 12:01:56 +02:00
Wolfgang Huß
25981e0f35 Corrected Cypress test 2019-08-14 08:55:44 +02:00
Wolfgang Huß
ab7d158b26 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 451-lokalise-unlocalised-texts-20190812 2019-08-14 08:24:29 +02:00
Wolfgang Huß
bcb66b0cb3 Corrected English translations to @mattwr18 suggestions 2019-08-14 08:23:54 +02:00
dependabot-preview[bot]
801ef5316a
Bump vue-izitoast from c246fd7 to ba6b03e in /webapp 
Bumps [vue-izitoast](https://github.com/roschaefer/vue-izitoast) from `c246fd7` to `ba6b03e`.
- [Release notes](https://github.com/roschaefer/vue-izitoast/releases)
- [Commits](c246fd78b1...ba6b03eb24)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-14 04:28:55 +00:00
dependabot-preview[bot]
831c9b7c5f
Bump tiptap from 1.24.1 to 1.24.2 in /webapp 
Bumps [tiptap](https://github.com/scrumpy/tiptap) from 1.24.1 to 1.24.2.
- [Release notes](https://github.com/scrumpy/tiptap/releases)
- [Commits](https://github.com/scrumpy/tiptap/compare/tiptap@1.24.1...tiptap@1.24.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-14 04:27:34 +00:00
dependabot-preview[bot]
3eb24a85ea
Bump neo4j-graphql-js from 2.6.3 to 2.7.0 in /backend 
Bumps [neo4j-graphql-js](https://github.com/neo4j-graphql/neo4j-graphql-js) from 2.6.3 to 2.7.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-08-14 04:25:32 +00:00
roschaefer
31299235a3 Better caching policy on the blocked users page 
Read: https://medium.com/@galen.corey/understanding-apollo-fetch-policies-705b5ad71980
for the difference. I think it's exactly what we need to update the
blocked users as soon as we switch to the page.
 2019-08-14 00:11:45 +02:00
roschaefer
6b884d84c1 Add translations 2019-08-13 19:56:01 +02:00