ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-13 07:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,408 Commits 117 Branches 1,511 Tags
Commit Graph

5716 Commits

Author SHA1 Message Date
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
Wolfgang Huß
90fdd24697 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1707-reporting-with-specific-information 2019-10-02 08:59:10 +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