IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2026-01-14 00:44:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,170 Commits 5 Branches 2 Tags
Commit Graph

11170 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Schäfer
9318c28b72
Merge pull request #1809 from Human-Connection/1305-update-lastActiveAt 
fixes#1305 lastActiveAt
 2019-10-04 13:49:14 +02:00
mattwr18
fd388fc1ba Fix tests for changed implementation 
- we do not display a load more button when there are clearly no more
posts to load... if there are at least 6, the pageSize, we display it
because there might or might not be posts to load
 2019-10-04 12:34:48 +02:00
mattwr18
c9219f0be3 Fix lint 2019-10-04 12:09:22 +02:00
mattwr18
3b5e39c54d Update orderBy, remove >=, more realistic seed data 2019-10-04 11:42:55 +02:00
Wolfgang Huß
b4f47997b3 Centralized and refactored report mutations and queries 2019-10-04 10:40:18 +02:00
Wolfgang Huß
e7fbd169d9 Get backend test to work with new properties 2019-10-04 10:23:31 +02:00
Wolfgang Huß
5458d6640e Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1707-reporting-with-specific-information 2019-10-04 09:08:15 +02:00
Robert Schäfer
ff9a8cace3
Merge pull request #1798 from Human-Connection/remove-toggle-from-email 
Remove language toggle from email template
 2019-10-04 01:54:00 +02:00
Robert Schäfer
d37b2ec5bb
Merge pull request #1804 from Human-Connection/dependabot/npm_and_yarn/webapp/nuxt-2.10.0 
build(deps): bump nuxt from 2.9.2 to 2.10.0 in /webapp
 2019-10-04 01:47:31 +02:00
Robert Schäfer
bf1af5039f
Merge pull request #1801 from Human-Connection/dependabot/npm_and_yarn/backend/cross-env-6.0.3 
build(deps): bump cross-env from 6.0.2 to 6.0.3 in /backend
 2019-10-04 01:47:02 +02:00
roschaefer
78bf076498 test: add tests for #1809 2019-10-04 01:39:18 +02:00
roschaefer
99db1338c1 docs: add storybook section for edit information 2019-10-04 01:05:39 +02:00
roschaefer
3912b21ea2 refactor: use named slot for additional text 
@mattwr18 I can see odd behaviour of the EDITED marker on mobile: The
text would just overlap.

The current behaviour has its flaws, e.g. if you have a long text it
won't wrap but overflow the comment card. But putting the additional
text into a named slot is certainly better than adding some nodes next
to the `<hc-user>` component.
 2019-10-04 01:00:31 +02:00
Robert Schäfer
48fdf956c7
Merge pull request #1806 from Human-Connection/1633-admin-stats 
fix invites count calculation for admin dashboard
 2019-10-03 23:51:17 +02:00
dependabot-preview[bot]
9221c54017
build(deps): bump nuxt from 2.9.2 to 2.10.0 in /webapp 
Bumps [nuxt](https://github.com/nuxt/nuxt.js) from 2.9.2 to 2.10.0.
- [Release notes](https://github.com/nuxt/nuxt.js/releases)
- [Changelog](https://github.com/nuxt/nuxt.js/blob/dev/RELEASE_PLAN.md)
- [Commits](https://github.com/nuxt/nuxt.js/compare/v2.9.2...v2.10.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-03 21:33:16 +00:00
dependabot-preview[bot]
c1effbe46c
build(deps): bump cross-env from 6.0.2 to 6.0.3 in /backend 
Bumps [cross-env](https://github.com/kentcdodds/cross-env) from 6.0.2 to 6.0.3.
- [Release notes](https://github.com/kentcdodds/cross-env/releases)
- [Changelog](https://github.com/kentcdodds/cross-env/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kentcdodds/cross-env/compare/v6.0.2...v6.0.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-03 21:32:39 +00:00
Robert Schäfer
8660e82503
Merge pull request #1800 from Human-Connection/dependabot/npm_and_yarn/cross-env-6.0.3 
build(deps-dev): bump cross-env from 6.0.2 to 6.0.3
 2019-10-03 23:32:16 +02:00
Robert Schäfer
6d07054a8d
Merge pull request #1803 from Human-Connection/dependabot/npm_and_yarn/webapp/cross-env-6.0.3 
build(deps): bump cross-env from 6.0.2 to 6.0.3 in /webapp
 2019-10-03 23:30:48 +02:00
Robert Schäfer
3a63fa523d
Merge pull request #1802 from Human-Connection/dependabot/npm_and_yarn/backend/hapi/joi-16.1.5 
build(deps): bump @hapi/joi from 16.1.4 to 16.1.5 in /backend
 2019-10-03 23:30:30 +02:00
Robert Schäfer
bab1ff5a13
Merge pull request #1787 from Human-Connection/update-neo4j-to-enterprise-edition 
Update neo4j to Enterprise edition
 2019-10-03 23:29:35 +02:00
Ivy
57c3d949cf fixes#1305 lastActiveAt 2019-10-03 13:08:06 -07:00
mattwr18
976288d625 Fix lint 2019-10-03 16:39:32 +02:00
mattwr18
a02ad972d4 Add documentation for online backups/restoring after disaster 2019-10-03 16:11:52 +02:00
mattwr18
b1573cc25a Update neo4j to Enterprise edition 
- accept license agreement
 2019-10-03 16:11:29 +02:00
aonomike
eae19ca33d Display user email for administrators 2019-10-03 14:31:39 +03:00
mattwr18
a6d86f78f4 Fix lint 2019-10-03 12:04:07 +02:00
mattwr18
a5e3c52e1d Show that a Post/Comment has been edited 2019-10-03 12:01:04 +02:00
Vasily Belolapotkov
af803ce0e6 fix invites count calculation for admin dashboard 2019-10-03 12:54:04 +03:00
mattwr18
6f1c5e3efa Set hasMore to false when returned Posts are equal to pageSize 
- this was causing bugs on User profile page, and saves a database call
 2019-10-03 11:04:23 +02:00
ogerly
fd697f5f12 Template changed for removeEmbed() function 2019-10-03 10:09:51 +02:00
ogerly
3607bf9551 befor alinas work 2019-10-03 09:20:17 +02:00
dependabot-preview[bot]
7fd4899797
build(deps): bump cross-env from 6.0.2 to 6.0.3 in /webapp 
Bumps [cross-env](https://github.com/kentcdodds/cross-env) from 6.0.2 to 6.0.3.
- [Release notes](https://github.com/kentcdodds/cross-env/releases)
- [Changelog](https://github.com/kentcdodds/cross-env/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kentcdodds/cross-env/compare/v6.0.2...v6.0.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-03 05:21:55 +00:00
dependabot-preview[bot]
a6309aeb70
build(deps): bump @hapi/joi from 16.1.4 to 16.1.5 in /backend 
Bumps [@hapi/joi](https://github.com/hapijs/joi) from 16.1.4 to 16.1.5.
- [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/v16.1.4...v16.1.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-03 05:21:23 +00:00
dependabot-preview[bot]
6b6e031b2c
build(deps-dev): bump cross-env from 6.0.2 to 6.0.3 
Bumps [cross-env](https://github.com/kentcdodds/cross-env) from 6.0.2 to 6.0.3.
- [Release notes](https://github.com/kentcdodds/cross-env/releases)
- [Changelog](https://github.com/kentcdodds/cross-env/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kentcdodds/cross-env/compare/v6.0.2...v6.0.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-03 05:20:23 +00:00
Alina Beck
ad7f5e34f7 remove language toggle from email template 2019-10-02 23:12:34 +02:00
mattwr18
f4e0fc8e01
Merge pull request #1786 from Human-Connection/update-version-to-0.1.2 
Update to 0.1.2
 2019-10-02 18:33:14 +02:00
Alina Beck
4a1ca2610a show overlay only for embedded html 2019-10-02 18:23:30 +02:00
Alina Beck
1f93c690be only display available data 2019-10-02 18:05:29 +02:00
Robert Schäfer
cfdf9dad2c
Merge pull request #1711 from Human-Connection/407-change_your_email_address 
407 change your email address
 2019-10-02 17:43:19 +02:00
Wolfgang Huß
6ad9dc27e9 Write and refactor backend test which are supposed to fail at first 
Implemented the new properties in the GraphQL schema.
 2019-10-02 17:25:36 +02:00
Alina Beck
3a013d0607 update settings on button click instead of checkbox click 2019-10-02 17:10:08 +02:00
Alina Beck
8c78fef457 toggle preview image with showEmbed 2019-10-02 16:55:30 +02:00
mattwr18
4aeaa58eb6 Max aspect ratio of 1:1 for Post index page 
- we are currently enforcing a 1:1 max ratio on the root path and would
like to maintain consistency
 2019-10-02 16:53:24 +02:00
Alina Beck
c46c13dbdf toggle overlay with methods 2019-10-02 16:37:52 +02:00
Robert Schäfer
c1235003c5
Merge pull request #1794 from Human-Connection/dependabot/npm_and_yarn/backend/cross-env-6.0.2 
build(deps): bump cross-env from 6.0.0 to 6.0.2 in /backend
 2019-10-02 15:51:36 +02:00
Robert Schäfer
551eb98150
Merge pull request #1793 from Human-Connection/dependabot/npm_and_yarn/cross-env-6.0.2 
build(deps-dev): bump cross-env from 6.0.0 to 6.0.2
 2019-10-02 15:51:14 +02:00
Robert Schäfer
9a08de347c
Merge pull request #1788 from Human-Connection/1663-moderators-admins-always-see-posts 
Update Post query for blockedByUsers
 2019-10-02 15:50:55 +02:00
roschaefer
56ce95a6fd refactor: follow review of @alina-beck + @mattwr18 2019-10-02 15:50:35 +02:00
Alina Beck
99629991d0 style embed preview 2019-10-02 15:49:23 +02:00
Wolfgang Huß
0517e38873 Implement a form schema that works 
A `ds-form` has not worked for any reason.
 2019-10-02 15:17:53 +02:00