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

5861 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mattwr18
daf06a273a
Merge pull request #1737 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-youtube-5.7.5 
Bump metascraper-youtube from 5.7.4 to 5.7.5 in /backend
 2019-09-27 09:22:49 +02:00
dependabot-preview[bot]
6c2224629e
Bump metascraper-youtube from 5.7.4 to 5.7.5 in /backend 
Bumps [metascraper-youtube](https://github.com/microlinkhq/metascraper-youtube) from 5.7.4 to 5.7.5.
- [Release notes](https://github.com/microlinkhq/metascraper-youtube/releases)
- [Commits](https://github.com/microlinkhq/metascraper-youtube/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-27 04:21:05 +00:00
Robert Schäfer
0869aeb58e
Merge pull request #1719 from Human-Connection/1718-fix-comment-editor-styling-update-bug 
Fix bug UpdateComment, Fix styling on Comment
 2019-09-26 23:14:33 +02:00
mattwr18
d51898e661
Merge pull request #1732 from Human-Connection/1731-update-maintenance-page-email 
Update maintenance page email to support@...
 2019-09-26 17:37:33 +02:00
mattwr18
ef5cf2e629 Update maintenance page email to support@... 2019-09-26 09:27:00 +02:00
mattwr18
88cbc7def1
Merge pull request #1730 from Human-Connection/dependabot/npm_and_yarn/backend/babel/register-7.6.2 
Bump @babel/register from 7.6.0 to 7.6.2 in /backend
 2019-09-26 09:02:28 +02:00
mattwr18
9ac9a1222d
Merge pull request #1727 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-loader-3.0.1 
Bump eslint-loader from 3.0.0 to 3.0.1 in /webapp
 2019-09-26 09:01:00 +02:00
mattwr18
975b4b15a0
Merge pull request #1726 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-express-2.9.4 
Bump apollo-server-express from 2.9.3 to 2.9.4 in /backend
 2019-09-26 09:00:06 +02:00
dependabot-preview[bot]
46da8e2c7b
Bump @babel/register from 7.6.0 to 7.6.2 in /backend 
Bumps [@babel/register](https://github.com/babel/babel) from 7.6.0 to 7.6.2.
- [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.6.0...v7.6.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-26 04:22:55 +00:00
dependabot-preview[bot]
036b948faf
Bump eslint-loader from 3.0.0 to 3.0.1 in /webapp 
Bumps [eslint-loader](https://github.com/webpack-contrib/eslint-loader) from 3.0.0 to 3.0.1.
- [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.0...v3.0.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-26 04:22:10 +00:00
dependabot-preview[bot]
28af0777fc
Bump apollo-server-express from 2.9.3 to 2.9.4 in /backend 
Bumps [apollo-server-express](https://github.com/apollographql/apollo-server) from 2.9.3 to 2.9.4.
- [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-express@2.9.3...apollo-server-express@2.9.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-26 04:22:05 +00:00
mattwr18
e0789a950c
Merge pull request #1715 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-title-5.7.5 
Bump metascraper-title from 5.7.4 to 5.7.5 in /backend
 2019-09-25 22:58:07 +02:00
mattwr18
1d5dcf5324
Merge pull request #1676 from Human-Connection/dependabot/npm_and_yarn/webapp/graphql-14.5.7 
Bump graphql from 14.5.6 to 14.5.7 in /webapp
 2019-09-25 22:57:36 +02:00
mattwr18
0f40df7cb4 Fix bug UpdateComment, Fix styling on Comment 
- There was a bug that updates to comments were not being displayed
because of a v-show... https://vuejs.org/v2/guide/conditional.html#v-if-vs-v-show
Basically, what it says that is important for this bug is
"v-if...ensures that event listeners and child components inside the
conditional block are properly destroyed and re-created during toggles"

- Since we are using the editor to display comments in ContentViewer, we
need to set the min-height to 0px

- Co-authored-by: Alina Beck <alina.beck@mail.com>
- Co-authored-by: Robert Schäfer <git@roschaefer.de>
 2019-09-25 13:39:18 +02:00
Wolfgang Huß
db9810b436
Merge pull request #1685 from Human-Connection/add-comment-story 
Add Comment story, add spacing above user info
 2019-09-25 10:48:20 +02:00
dependabot-preview[bot]
de9abbd444
Bump metascraper-title from 5.7.4 to 5.7.5 in /backend 
Bumps [metascraper-title](https://github.com/microlinkhq/metascraper) from 5.7.4 to 5.7.5.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.7.4...v5.7.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-25 06:32:06 +00:00
mattwr18
5aeb13cf0d
Merge pull request #1714 from Human-Connection/dependabot/npm_and_yarn/backend/date-fns-2.3.0 
Bump date-fns from 2.2.1 to 2.3.0 in /backend
 2019-09-25 08:31:01 +02:00
mattwr18
0bf0da316c
Merge pull request #1698 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-logo-5.7.5 
Bump metascraper-logo from 5.7.4 to 5.7.5 in /backend
 2019-09-25 08:30:05 +02:00
mattwr18
7b22711dfe
Merge pull request #1694 from Human-Connection/dependabot/npm_and_yarn/webapp/babel/preset-env-7.6.2 
Bump @babel/preset-env from 7.6.0 to 7.6.2 in /webapp
 2019-09-25 08:29:43 +02:00
mattwr18
766c670269 Fix import path 2019-09-25 08:26:24 +02:00
mattwr18
ee99673cec Add Comment story, add spacing above user info 2019-09-25 08:26:24 +02:00
dependabot-preview[bot]
7d9953a5a2
Bump graphql from 14.5.6 to 14.5.7 in /webapp 
Bumps [graphql](https://github.com/graphql/graphql-js) from 14.5.6 to 14.5.7.
- [Release notes](https://github.com/graphql/graphql-js/releases)
- [Commits](https://github.com/graphql/graphql-js/compare/v14.5.6...v14.5.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-25 06:22:59 +00:00
mattwr18
a2cd1163dc
Merge pull request #1675 from Human-Connection/dependabot/npm_and_yarn/backend/graphql-14.5.7 
Bump graphql from 14.5.6 to 14.5.7 in /backend
 2019-09-25 08:20:20 +02:00
dependabot-preview[bot]
c50f5b8e2c
Bump date-fns from 2.2.1 to 2.3.0 in /backend 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.2.1 to 2.3.0.
- [Release notes](https://github.com/date-fns/date-fns/releases)
- [Changelog](https://github.com/date-fns/date-fns/blob/master/CHANGELOG.md)
- [Commits](https://github.com/date-fns/date-fns/compare/v2.2.1...v2.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-25 04:21:42 +00:00
mattwr18
4572d29290
Merge pull request #1702 from Human-Connection/remove_unnecessary_labels_from_emote_buttons 
Remove repetitive labels from emote button
 2019-09-24 17:25:02 +02:00
mattwr18
869a93f36d
Merge pull request #1697 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-video-5.7.5 
Bump metascraper-video from 5.7.4 to 5.7.5 in /backend
 2019-09-24 12:19:32 +02:00
roschaefer
59232cefe7 Remove repeating labels from emote button 
Our dear @Hardy-Peaceglobal mentioned that when he had a look on the app
on my mobile.
 2019-09-24 11:59:44 +02:00
dependabot-preview[bot]
14d7695f62
Bump @babel/preset-env from 7.6.0 to 7.6.2 in /webapp 
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.6.0 to 7.6.2.
- [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.6.0...v7.6.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-24 09:04:40 +00:00
dependabot-preview[bot]
f5e2322c3e
Bump metascraper-logo from 5.7.4 to 5.7.5 in /backend 
Bumps [metascraper-logo](https://github.com/microlinkhq/metascraper) from 5.7.4 to 5.7.5.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.7.4...v5.7.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-24 09:03:06 +00:00
dependabot-preview[bot]
ea6785e01a
Bump graphql from 14.5.6 to 14.5.7 in /backend 
Bumps [graphql](https://github.com/graphql/graphql-js) from 14.5.6 to 14.5.7.
- [Release notes](https://github.com/graphql/graphql-js/releases)
- [Commits](https://github.com/graphql/graphql-js/compare/v14.5.6...v14.5.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-24 09:02:38 +00:00
dependabot-preview[bot]
ffa9cee5b8
Bump metascraper-video from 5.7.4 to 5.7.5 in /backend 
Bumps [metascraper-video](https://github.com/microlinkhq/metascraper) from 5.7.4 to 5.7.5.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.7.4...v5.7.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-24 09:02:23 +00:00
mattwr18
718b8b73c8
Merge pull request #1696 from Human-Connection/dependabot/npm_and_yarn/webapp/babel/core-7.6.2 
Bump @babel/core from 7.6.0 to 7.6.2 in /webapp
 2019-09-24 11:01:59 +02:00
mattwr18
addfc08bea
Merge pull request #1695 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-image-5.7.5 
Bump metascraper-image from 5.7.4 to 5.7.5 in /backend
 2019-09-24 11:01:07 +02:00
mattwr18
2c9b2a2d69
Merge pull request #1693 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-audio-5.7.5 
Bump metascraper-audio from 5.7.4 to 5.7.5 in /backend
 2019-09-24 11:00:45 +02:00
mattwr18
7421533525
Merge pull request #1692 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-url-5.7.5 
Bump metascraper-url from 5.7.4 to 5.7.5 in /backend
 2019-09-24 11:00:22 +02:00
mattwr18
5e35fd6546
Merge pull request #1689 from Human-Connection/1659-remove-sleep-icon 
Remove sleep icon from comments list
 2019-09-24 10:59:29 +02:00
dependabot-preview[bot]
4d67b46492
Bump @babel/core from 7.6.0 to 7.6.2 in /webapp 
Bumps [@babel/core](https://github.com/babel/babel) from 7.6.0 to 7.6.2.
- [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.6.0...v7.6.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-24 04:32:06 +00:00
dependabot-preview[bot]
bce0d7b1c5
Bump metascraper-image from 5.7.4 to 5.7.5 in /backend 
Bumps [metascraper-image](https://github.com/microlinkhq/metascraper) from 5.7.4 to 5.7.5.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.7.4...v5.7.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-24 04:31:56 +00:00
dependabot-preview[bot]
995d4573fa
Bump metascraper-audio from 5.7.4 to 5.7.5 in /backend 
Bumps [metascraper-audio](https://github.com/microlinkhq/metascraper) from 5.7.4 to 5.7.5.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.7.4...v5.7.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-24 04:31:07 +00:00
dependabot-preview[bot]
f63067b0e9
Bump metascraper-url from 5.7.4 to 5.7.5 in /backend 
Bumps [metascraper-url](https://github.com/microlinkhq/metascraper) from 5.7.4 to 5.7.5.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.7.4...v5.7.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-24 04:30:37 +00:00
Alina Beck
a85fab04b6 remove failing test because specs have changed 2019-09-23 22:38:13 +01:00
mattwr18
9eb90eea8d
Merge pull request #1690 from Human-Connection/1631-fix_language_chooser_on_create_account 
Bugfix create user page - missing submit buttons
 2019-09-23 23:13:42 +02:00
roschaefer
bafc530366 Bugfix create user page - missing submit buttons 2019-09-23 22:15:53 +02:00
Alina Beck
3026b923e0 use translated title for comment list 2019-09-23 21:08:20 +01:00
Alina Beck
7104896150 remove sleep icon from comment list 2019-09-23 20:46:41 +01:00
mattwr18
b4b9d895a5
Merge pull request #1681 from Human-Connection/1631-fix_language_chooser_on_create_account 
Fix create account page has no logo, localisation
 2019-09-23 20:16:42 +02:00
mattwr18
af7ab74e4d
Merge pull request #1679 from Human-Connection/fix_intermittent_backed_specs 
Fix intermittent backend specs
 2019-09-23 17:38:37 +02:00
roschaefer
353b846124 Fix #1631 
I don't have time to really test this right now, feel free to do that
before merge.
 2019-09-23 15:04:33 +02:00
roschaefer
c24876c922 Add a double-check just to be sure 2019-09-23 13:51:21 +02:00
roschaefer
c669fc08eb Fix intermittent backend specs 
@mattwr18 I still see those false positives. This should fix it.
 2019-09-23 13:47:43 +02:00