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

1740 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
roschaefer
56ce95a6fd refactor: follow review of @alina-beck + @mattwr18 2019-10-02 15:50:35 +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
dependabot-preview[bot]
02537b37f4
build(deps): bump cross-env from 6.0.0 to 6.0.2 in /webapp 
Bumps [cross-env](https://github.com/kentcdodds/cross-env) from 6.0.0 to 6.0.2.
- [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.0...v6.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-02 05:37:48 +00:00
dependabot-preview[bot]
4648080a74
build(deps): bump @nuxtjs/apollo in /webapp 
Bumps [@nuxtjs/apollo](https://github.com/nuxt-community/apollo-module) from 4.0.0-rc13.1 to 4.0.0-rc14.
- [Release notes](https://github.com/nuxt-community/apollo-module/releases)
- [Commits](https://github.com/nuxt-community/apollo-module/compare/v4.0.0-rc.13.1...v4.0.0-rc.14)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-02 05:36:47 +00:00
roschaefer
7bec48904e refactor: improve language of validation message 2019-10-02 01:14:57 +02:00
roschaefer
4ac80b0d58 refactor: align submit buttons consistently 
@alina-beck said we have most buttons left-aligned, so I went with that:
https://github.com/Human-Connection/Human-Connection/pull/1711#discussion_r329505767

Also this uses icon `envelope` for emails. This makes sense, because we
could use icon `at` for slugs.
 2019-10-02 01:10:28 +02:00
roschaefer
15e3a5690c refactor: change all hyphenated spellings to email 2019-10-02 00:58:23 +02:00
roschaefer
01e583b45e Translate backend error and avoid $toast 2019-10-02 00:54:01 +02:00
roschaefer
76841d27f1 Styling 2019-10-02 00:54:01 +02:00
roschaefer
573edce788 Show at least the error message in SSR 2019-10-02 00:54:01 +02:00
roschaefer
3e3452c7bc Better help messages, styling 2019-10-02 00:54:01 +02:00
roschaefer
69cd41d3eb Test email verification page 2019-10-02 00:54:01 +02:00
roschaefer
6a212fb668 Test verify-nonce page 2019-10-02 00:54:01 +02:00
roschaefer
f61441d3e6 Test my-email-address settings page 2019-10-02 00:54:01 +02:00
roschaefer
89cc6da5f1 Don't redirect if email change was not successful 2019-10-02 00:54:01 +02:00
roschaefer
9808e1c4f8 Validate different email address 2019-10-02 00:54:01 +02:00
roschaefer
69542617ac Split routes in two 
So, to get a direct link it's better to have one route that calls a
mutation as soon as it is visited.
 2019-10-02 00:54:01 +02:00
roschaefer
0592f685f6 Basic email change works 2019-10-02 00:54:01 +02:00
roschaefer
80ce079920 Implement first page to change email address 2019-10-02 00:54:01 +02:00
roschaefer
8c13234af9 Handle edge case 
It might be that people try to register email addresses that they don't own. Then if the actual owner tries to add this email address, she should not get a unique constraint violation. Instead the email will be re-used.

Is this a security issue? Because we re-use the nonce? 🤔
 2019-10-02 00:54:01 +02:00
Robert Schäfer
b31126c391
Merge pull request #1701 from Human-Connection/1273-fix-post-page-nav 
fix the bug with scrolling post comments into view
 2019-10-01 23:17:53 +02:00
roschaefer
24b2cab473 fix: handle edge case noticed by @vbelolapotkov 2019-10-01 17:51:16 +02:00
roschaefer
08e73747bd refactor: set global defaults of vue-scrollto 2019-10-01 17:51:16 +02:00
roschaefer
db1bcdd3d2 refactor: register vue-scrollto in nuxt.config.js 
This will allow us to use this.$scrollTo in components. I'm now also
using this in the mixin. With so many `this`s it gets horribly
difficult to properly test the mixin in isolation. So I decided to test
the mixin on the component directly.
 2019-10-01 17:25:28 +02:00
roschaefer
9da40c4895 fix: avoid many scrollTo calls for n components 
Thank you @vbelolapotkov for pointing out the flaws here:
https://github.com/Human-Connection/Human-Connection/pull/1756#discussion_r329361572

So here is my attempt to fix it:
* Install `vue-scrollto` which relies on `requestAnimationFrame`
  - apparently this is better on Safari and IE? 🤔
  - Mocking out entire modules is easier in jest:
    https://jestjs.io/docs/en/bypassing-module-mocks
* Require `checkAnchor` to be implemented on the component
 2019-10-01 11:55:18 +02:00
dependabot-preview[bot]
6f32da4de5
Bump eslint-loader from 3.0.1 to 3.0.2 in /webapp 
Bumps [eslint-loader](https://github.com/webpack-contrib/eslint-loader) from 3.0.1 to 3.0.2.
- [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.1...v3.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-30 22:30:36 +00:00
Robert Schäfer
10c50a912f
Merge pull request #1765 from Human-Connection/dependabot/npm_and_yarn/webapp/tiptap-1.26.0 
Bump tiptap from 1.25.0 to 1.26.0 in /webapp
 2019-10-01 00:27:44 +02:00
Robert Schäfer
e6d6ce0fcd
Merge pull request #1768 from Human-Connection/dependabot/npm_and_yarn/webapp/date-fns-2.4.1 
Bump date-fns from 2.4.0 to 2.4.1 in /webapp
 2019-10-01 00:27:12 +02:00
Robert Schäfer
1fed79a674
Merge pull request #1658 from Human-Connection/1637-notifications-self-update 
🍰 Notifications self update and refactoring
 2019-09-30 17:52:41 +02:00
dependabot-preview[bot]
f6091aefb8
Bump date-fns from 2.4.0 to 2.4.1 in /webapp 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.4.0 to 2.4.1.
- [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.0...v2.4.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-30 15:49:00 +00:00
dependabot-preview[bot]
3877d559e0
Bump tiptap from 1.25.0 to 1.26.0 in /webapp 
Bumps [tiptap](https://github.com/scrumpy/tiptap) from 1.25.0 to 1.26.0.
- [Release notes](https://github.com/scrumpy/tiptap/releases)
- [Commits](https://github.com/scrumpy/tiptap/compare/tiptap@1.25.0...tiptap@1.26.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-30 15:48:42 +00:00
roschaefer
0e2a0af7bf feat: no primary button for unread notifications 
@Tirokk if find this better, because a primary button always wants to be
clicked.
 2019-09-30 17:24:57 +02:00