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

7796 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wolfgang Huß
4a2f8edb9e
Merge pull request #1926 from Human-Connection/1924-moderators-reports-list-sort-desc 
🍰 Add Cypher statement for ordering
 2019-10-17 14:28:47 +02:00
mattwr18
5505deee79
Follow @alina-beck and @Tirokk PR suggestions 2019-10-17 12:44:30 +02:00
Robert Schäfer
56b7aa6d0a
Merge pull request #1925 from Human-Connection/better-truncate-comments 
Improved comment truncation
 2019-10-17 12:21:43 +02:00
Robert Schäfer
ea1b9d6e1e
Merge pull request #1911 from Human-Connection/typo 
fix: typo in German translation
 2019-10-17 12:18:01 +02:00
Wolfgang Huß
72290e1c8a Add ascendant ordering as enum to ReportOrdering 2019-10-17 10:16:27 +02:00
Wolfgang Huß
681733bb0f Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1924-moderators-reports-list-sort-desc 2019-10-17 10:05:13 +02:00
dependabot-preview[bot]
5b25240aed
build(deps-dev): bump dotenv from 8.1.0 to 8.2.0 
Bumps [dotenv](https://github.com/motdotla/dotenv) from 8.1.0 to 8.2.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.1.0...v8.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-17 08:04:54 +00:00
ppelegrin
3d88e532f9
Merge pull request #1923 from Human-Connection/dependabot/submodules/styleguide-d46fc15 
build(deps): bump styleguide from `808b3c5` to `d46fc15`
 2019-10-17 10:04:28 +02:00
ppelegrin
48cfc017ea
Merge pull request #1921 from Human-Connection/dependabot/npm_and_yarn/webapp/date-fns-2.5.0 
build(deps): bump date-fns from 2.4.1 to 2.5.0 in /webapp
 2019-10-17 10:03:38 +02:00
ppelegrin
76a22af46d
Merge pull request #1915 from Human-Connection/dependabot/npm_and_yarn/backend/date-fns-2.5.0 
build(deps): bump date-fns from 2.4.1 to 2.5.0 in /backend
 2019-10-17 10:02:58 +02:00
Alexander Friedland
cca1e2c04a
remove change 2019-10-17 09:44:26 +02:00
Alexander Friedland
8fd1bb28ef
Merge pull request #1935 from Human-Connection/1932-use-filename-for-cropped-images 
Maintain filename for cropped images
 2019-10-17 09:40:03 +02:00
ogerly
54465c04a3 Fix Jest tests 2019-10-17 08:26:15 +02:00
Kapil Jain
6b72772bbb Added tests for SHOUT and FOLLOW relationships to make sure they have "createdAt" date. 2019-10-16 22:47:02 -04:00
Youri Seichter
967273a1af remove error logging as it results in linting errors 2019-10-16 19:38:51 +02:00
Martin Neumann
6c8ccea448 Fix: Import all languages in storybook 2019-10-16 18:34:13 +02:00
Youri Seichter
b89ef8987e Change login.failure translations, log login.failure error 2019-10-16 17:57:03 +02:00
mattwr18
d62ee23f2a Create new File with blob 
- maintain filename
- reduce image size
 2019-10-16 17:20:35 +02:00
Youri Seichter
b72f3da489 Make login failure translateable, translate 'login.failure' to german and english 2019-10-16 17:06:44 +02:00
ogerly
dd2efad937 fix lint 2019-10-16 15:02:17 +02:00
ogerly
97dad41b27 Set language will be saved in the database of the user during registration 2019-10-16 15:01:07 +02:00
Wolfgang Huß
30f268525f Add Cypher statement for ordering 
- minor db manipulation text change
 2019-10-16 13:32:45 +02:00
Alina Beck
a306b9cf4b use constants, truncate only comments with more than 300 characters 2019-10-16 13:56:57 +03:00
dependabot-preview[bot]
a815d92eb2
build(deps): bump date-fns from 2.4.1 to 2.5.0 in /webapp 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.4.1 to 2.5.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.4.1...v2.5.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-16 10:19:18 +00:00
dependabot-preview[bot]
8d5e0b0e2c
build(deps): bump date-fns from 2.4.1 to 2.5.0 in /backend 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.4.1 to 2.5.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.4.1...v2.5.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-16 10:18:30 +00:00
dependabot-preview[bot]
58cbd07e1b
build(deps): bump styleguide from 808b3c5 to d46fc15 
Bumps [styleguide](https://github.com/Human-Connection/Nitro-Styleguide) from `808b3c5` to `d46fc15`.
- [Release notes](https://github.com/Human-Connection/Nitro-Styleguide/releases)
- [Commits](808b3c5a95...d46fc1570c)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-16 10:17:55 +00:00
roschaefer
72bbadd852 dosc: add comment list story 2019-10-16 12:16:38 +02:00
roschaefer
42d0ffe6ff docs: use setTimeout to show spinner 2019-10-16 12:16:38 +02:00
roschaefer
48943d0ec8 fix: inject $toast into storybook components 2019-10-16 12:16:38 +02:00
roschaefer
1549ff6c53 docs: add storybook story for LoginForm 2019-10-16 12:16:38 +02:00
roschaefer
fced9ce435 refactor: remove ready quickfix in LoginForm 
According to the code comments this is a quick fix to avoid a visible
re-arrangement of elements in the browser. To be honest: I would rather
have the visible re-arrangement than this obscure quickfix. Everything
that's visible and annoying will be fixed. Everything we just hide, we
will forget.
 2019-10-16 12:16:38 +02:00
roschaefer
8dff7496c0 refactor: create LoginForm component 
I moved most code in pages/login.vue to a separate LoginForm component.
The intention is to have a separate vue storybook for the LoginForm
component.
 2019-10-16 12:16:38 +02:00
Robert Schäfer
452bf4127c
Merge pull request #1919 from Human-Connection/dependabot/npm_and_yarn/date-fns-2.5.0 
build(deps-dev): bump date-fns from 2.4.1 to 2.5.0
 2019-10-16 12:16:32 +02:00
Robert Schäfer
84af40e0df
Merge pull request #1916 from Human-Connection/dependabot/npm_and_yarn/backend/nodemon-1.19.4 
build(deps-dev): bump nodemon from 1.19.3 to 1.19.4 in /backend
 2019-10-16 12:16:03 +02:00
Robert Schäfer
d10efbb5a8
Merge pull request #1918 from Human-Connection/dependabot/npm_and_yarn/neode-0.3.6 
build(deps-dev): bump neode from 0.3.3 to 0.3.6
 2019-10-16 12:15:22 +02:00
Robert Schäfer
0a0690aabd
Merge pull request #1903 from Human-Connection/highlight-linked-comment 
Highlight and expand linked comment
 2019-10-16 12:13:16 +02:00
Robert Schäfer
0792e06a24
Merge pull request #1910 from Human-Connection/add-missing-translations-contribution-form 
Add missing translations for Title placeholder
 2019-10-16 12:10:19 +02:00
Robert Schäfer
d18017e248
Update webapp/locales/de.json 2019-10-16 12:09:03 +02:00
Wolfgang Huß
a705f6a017
Merge pull request #1797 from Human-Connection/1707-reporting-with-specific-information 
🍰 Reporting with specific information
 2019-10-16 11:54:29 +02:00
dependabot-preview[bot]
3c9627ea07
build(deps-dev): bump date-fns from 2.4.1 to 2.5.0 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.4.1 to 2.5.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.4.1...v2.5.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-16 07:32:31 +00:00
mattwr18
4592ec6340
Merge pull request #1912 from Human-Connection/dependabot/npm_and_yarn/backend/dotenv-8.2.0 
build(deps): bump dotenv from 8.1.0 to 8.2.0 in /backend
 2019-10-16 09:30:36 +02:00
Wolfgang Huß
6dff10b236 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1707-reporting-with-specific-information 2019-10-16 09:27:13 +02:00
Wolfgang Huß
7067867f76 Changed mentioned file in comment 2019-10-16 09:25:50 +02:00
dependabot-preview[bot]
47fac15032
build(deps-dev): bump neode from 0.3.3 to 0.3.6 
Bumps [neode](https://github.com/adam-cowley/neode) from 0.3.3 to 0.3.6.
- [Release notes](https://github.com/adam-cowley/neode/releases)
- [Commits](https://github.com/adam-cowley/neode/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-16 07:05:18 +00:00
dependabot-preview[bot]
51ef7a7c8c
build(deps-dev): bump nodemon from 1.19.3 to 1.19.4 in /backend 
Bumps [nodemon](https://github.com/remy/nodemon) from 1.19.3 to 1.19.4.
- [Release notes](https://github.com/remy/nodemon/releases)
- [Commits](https://github.com/remy/nodemon/compare/v1.19.3...v1.19.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-16 07:00:48 +00:00
dependabot-preview[bot]
5e5f6ec1cc
build(deps): bump dotenv from 8.1.0 to 8.2.0 in /backend 
Bumps [dotenv](https://github.com/motdotla/dotenv) from 8.1.0 to 8.2.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.1.0...v8.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-16 06:58:30 +00:00
roschaefer
6a50ef6134 fix: storybook story of Comment.vue 
This is the best solution that I can think of right now. Sure, it's not
so great to pass a property down from the page component. But at least
it fixes the storybook story, which is something.
 2019-10-16 01:14:32 +02:00
roschaefer
72016452e2 fix: typo in German translation 2019-10-16 00:20:43 +02:00
mattwr18
17ead96450 Add missing translations for Title placeholder 2019-10-15 23:50:34 +02:00
Robert Schäfer
ade9aa209a
Merge pull request #1907 from Human-Connection/Confirm_privacy_policy_minimum_age_at_registration 
Confirm privacy policy minimum age at registration
 2019-10-15 23:41:00 +02:00