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

3734 Commits

Author SHA1 Message Date
mattwr18
271cacb8fe Merge branch 'master' of github.com:Human-Connection/Human-Connection into Allow_embedded_code_in_posts_permanent_memory 2019-10-08 13:01:07 +02:00
dependabot-preview[bot]
390e073acd
build(deps): bump node from 12.11.0-alpine to 12.11.1-alpine in /webapp 
Bumps node from 12.11.0-alpine to 12.11.1-alpine.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-08 05:03:33 +00:00
dependabot-preview[bot]
85b233cd87
build(deps-dev): bump @storybook/vue from 5.2.1 to 5.2.3 in /webapp 
Bumps [@storybook/vue](https://github.com/storybookjs/storybook/tree/HEAD/app/vue) from 5.2.1 to 5.2.3.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v5.2.3/app/vue)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-08 05:02:24 +00:00
mattwr18
da1df27799 Extract logic to EmbedComponent to separate concerns 
- Co-authored-by: senderfm <dev@sender.fm>
 2019-10-07 19:15:39 +02:00
ogerly
18cfa0b8c8 tests 2 ok 2019-10-07 13:01:21 +02:00
mattwr18
23841b95bb
Merge pull request #1808 from Human-Connection/1704_display-user-email-to-moderators 
Display user email for administrators
 2019-10-07 12:33:33 +02:00
Wolfgang Huß
ab8e30df30 Translations 2019-10-07 11:13:42 +02:00
Alina Beck
9350994cca use translations for data privacy warning 2019-10-07 11:12:48 +02:00
dependabot-preview[bot]
02281044f0
build(deps): bump tiptap-extensions from 1.28.0 to 1.28.3 in /webapp 
Bumps [tiptap-extensions](https://github.com/scrumpy/tiptap) from 1.28.0 to 1.28.3.
- [Release notes](https://github.com/scrumpy/tiptap/releases)
- [Commits](https://github.com/scrumpy/tiptap/compare/tiptap-extensions@1.28.0...tiptap-extensions@1.28.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-07 08:57:55 +00:00
Robert Schäfer
30cd345249
Merge pull request #1821 from Human-Connection/dependabot/npm_and_yarn/webapp/tiptap-1.26.3 
build(deps): bump tiptap from 1.26.0 to 1.26.3 in /webapp
 2019-10-07 10:54:43 +02:00
Alina Beck
1ecfee09db hide embed remove button when viewing post 2019-10-07 10:37:52 +02:00
Alexander Friedland
39b3d71be4
Merge branch 'master' into Allow_embedded_code_in_posts_permanent_memory 2019-10-07 10:35:04 +02:00
ogerly
574fbcf8b1 tests ok, lint ok 2019-10-07 10:32:11 +02:00
Wolfgang Huß
555159e171 Refactor moderation page 2019-10-07 09:31:24 +02:00
mattwr18
d54c0eb212
Merge pull request #1824 from Human-Connection/dependabot/docker/webapp/node-12.11.0-alpine 
build(deps): bump node from 12.10.0-alpine to 12.11.0-alpine in /webapp
 2019-10-07 09:22:47 +02:00
Wolfgang Huß
43e401293d Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1707-reporting-with-specific-information 2019-10-07 08:45:34 +02:00
dependabot-preview[bot]
1d5f4f2868
build(deps): bump node from 12.10.0-alpine to 12.11.0-alpine in /webapp 
Bumps node from 12.10.0-alpine to 12.11.0-alpine.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-07 04:30:07 +00:00
dependabot-preview[bot]
a02133ce0a
build(deps): bump tiptap from 1.26.0 to 1.26.3 in /webapp 
Bumps [tiptap](https://github.com/scrumpy/tiptap) from 1.26.0 to 1.26.3.
- [Release notes](https://github.com/scrumpy/tiptap/releases)
- [Commits](https://github.com/scrumpy/tiptap/compare/tiptap@1.26.0...tiptap@1.26.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-07 04:29:24 +00:00
dependabot-preview[bot]
6f7eccd7d5
build(deps-dev): bump eslint-config-prettier in /webapp 
Bumps [eslint-config-prettier](https://github.com/prettier/eslint-config-prettier) from 6.3.0 to 6.4.0.
- [Release notes](https://github.com/prettier/eslint-config-prettier/releases)
- [Changelog](https://github.com/prettier/eslint-config-prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prettier/eslint-config-prettier/compare/v6.3.0...v6.4.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-07 04:28:41 +00:00
aonomike
64b9ca7f43 Implement dislplay email for admins 2019-10-04 16:55:53 +03:00
Wolfgang Huß
935252a16e Rename variables, parameters and properties 2019-10-04 15:21:07 +02:00
mattwr18
908bc2a8c9
Merge pull request #1807 from Human-Connection/1669-show-edited-for-posts-comments 
Show that a Post/Comment has been edited
 2019-10-04 14:18:44 +02:00
Robert Schäfer
b881641f19
Merge pull request #1796 from Human-Connection/consisten-image-cropping 
Max aspect ratio of 1:1 for Post index page
 2019-10-04 14:00:12 +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
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ß
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
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
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
aonomike
eae19ca33d Display user email for administrators 2019-10-03 14:31:39 +03:00
mattwr18
a5e3c52e1d Show that a Post/Comment has been edited 2019-10-03 12:01:04 +02: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
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
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
Alina Beck
ec12171e80 style embed overlay 2019-10-02 15:11:43 +02:00
mattwr18
263b7d0aea Fix lint 2019-10-02 10:11:39 +02:00
mattwr18
3297461ab8
Merge pull request #1791 from Human-Connection/dependabot/npm_and_yarn/webapp/cross-env-6.0.2 
build(deps): bump cross-env from 6.0.0 to 6.0.2 in /webapp
 2019-10-02 09:24:52 +02:00