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
6,101 Commits 117 Branches 1,511 Tags
Commit Graph

218 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
aonomike
64b9ca7f43 Implement dislplay email for admins 2019-10-04 16:55:53 +03:00
mattwr18
a5e3c52e1d Show that a Post/Comment has been edited 2019-10-03 12:01:04 +02:00
roschaefer
56ce95a6fd refactor: follow review of @alina-beck + @mattwr18 2019-10-02 15:50:35 +02:00
roschaefer
7bec48904e refactor: improve language of validation message 2019-10-02 01:14:57 +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
3e3452c7bc Better help messages, styling 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
Wolfgang Huß
73cc068469 Fix lost translation 2019-09-27 16:11:24 +02:00
roschaefer
59232cefe7 Remove repeating labels from emote button 
Our dear @Hardy-Peaceglobal mentioned that when he had a look on the app
on my mobile.
 2019-09-24 11:59:44 +02:00
roschaefer
e8f47cb004 Frontend validations for regex 2019-09-20 20:24:04 +02:00
roschaefer
e6d7d1a936 Fix #1650 2019-09-20 20:05:27 +02:00
roschaefer
b761eea700 Point the changelog to Github 
The justification for this change is that the releases page on Github
is more likely to keep up to date than our changelog.

This also means that our changelog is not translated. But I think that's
fine.
 2019-09-19 13:21:51 +02:00
ogerly
b5cc716475 Merge branch 'links_to_imprint_and_privacy_policy_changed_to_human-connection.org' of https://github.com/Human-Connection/Human-Connection into links_to_imprint_and_privacy_policy_changed_to_human-connection.org 2019-09-18 10:12:07 +02:00
ogerly
c23212b306 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into links_to_imprint_and_privacy_policy_changed_to_human-connection.org 2019-09-18 10:10:59 +02:00
Alexander Friedland
4bed7435ec
update add backslash 2019-09-17 16:23:01 +02:00
ogerly
a588a7bc12 links_to_imprint_and_privacy_policy_changed_to_human-connection.org 2019-09-17 16:16:22 +02:00
Wolfgang Huß
92df820323 Rename /admin/tags.vue to /admin/hashtags.vue 2019-09-16 22:06:36 +02:00
mattwr18
33942f6475
Merge pull request #1283 from Human-Connection/fix/header-alignment 
fix(header-alignment): Fix logo and locale position.
 2019-09-12 11:44:52 +02:00
mattwr18
fa3053dca7 Tidy up, follow @roschaefer, @Tirokk PR suggestions 
- Fix tests by stubbing LocaleSwitch/client-only
- Add portuguese translations
- Add back to login link
- Use span over &nbsp following @alina-becks PR review on another PR
 2019-09-11 16:40:39 +02:00
roschaefer
61e583e31b Translatable, mobile-responsive maintenance page 2019-09-11 08:43:26 +02:00
roschaefer
2ca508ba2f Rename code => nonce in webapp/ 2019-09-06 19:31:04 +02:00
roschaefer
c129c3fbae Admin page handles loading and error state 2019-09-05 17:22:04 +02:00
roschaefer
aea9caee80 Remove slow sorting options 
Sadly, I think this the only way for now. As I explained in
https://github.com/Human-Connection/Human-Connection/issues/1272#issuecomment-527864948
I think we cannot do anything about it on our side for now.
 2019-09-04 23:46:18 +02:00
Alexander Friedland
41767cc27e
Merge branch 'master' into C-1187-terms-and-conditions-confirmed-function 2019-09-03 09:51:12 +02:00
ogerly
1b9303ceaf Jest tests for the Terms and Conditions in frontend and backend 2019-09-03 09:46:18 +02:00
roschaefer
cbcba8f08d Follow @Tirokk's suggestion 2019-08-30 16:00:32 +02:00
ogerly
ee03f0e902 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into C-1187-terms-and-conditions-confirmed-function 2019-08-28 14:21:46 +02:00
Wolfgang Huß
7498d88a44 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1062-notification-about-comment-on-post 2019-08-26 15:44:32 +02:00
Wolfgang Huß
a10e2e3a9b Make user profile follow(ed) lists exceeds 5 users and X more better translatable 
Slite adjustment of `more` to `more …`
 2019-08-23 14:37:52 +02:00
Wolfgang Huß
66612801ce Change text of invite form 2019-08-23 13:35:22 +02:00
ogerly
f34cef22f2 Graphical changes 2019-08-23 11:02:24 +02:00
ogerly
54750e39b8 Missing translations added + code checked with Lint 2019-08-23 11:02:24 +02:00
ogerly
c00f281e6c Translations and style adapted 2019-08-23 11:02:24 +02:00
ogerly
36ce6361ec Alle Daten übernommen die für serverseitig rendern nötig sind 2019-08-23 11:02:24 +02:00
Wolfgang Huß
8e893b2c5d Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1062-notification-about-comment-on-post 2019-08-22 15:28:49 +02:00
Wolfgang Huß
793485c0fc Write frontend tests 2019-08-22 15:20:40 +02:00
roschaefer
6e2ef65b99 Visual feedback if filters lead to 0 results 
This is one of the bugs/improvements suggested by @ulfgebhardt.
 2019-08-22 00:26:59 +02:00
Wolfgang Huß
d98ebdd713 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1062-notification-about-comment-on-post 2019-08-21 08:37:43 +02:00
Matt Rider
caff74e58b Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1017-send-out-notifications-on-create-omment 2019-08-19 10:50:46 +02:00
Matt Rider
dbaa8e687f Fix vue warnings, fix tests, refactor 
- was throwing an error when trying to update commentsCount because of new implementation by @roschaefer which uses countResolver, but there was no related for commentsCount, it was r... also commentsCount is no longer needed anywhere in the code base, it is commentedCount now
 2019-08-16 13:28:55 +02:00
Wolfgang Huß
8acccc99d0 Implemented a reason in the Notification 
Used this for displaying in the mentions menu in frontend.
Rewrite backend test.
 2019-08-15 19:29:06 +02:00
Wolfgang Huß
0d66cc4dcf Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1017-send-out-notifications-on-create-omment 
# Conflicts:
#	backend/src/middleware/handleHtmlContent/handleContentData.js
#	backend/src/schema/types/schema.gql
 2019-08-15 10:16:33 +02:00
Matt Rider
569ace137b Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1017-send-out-notifications-on-create-omment 2019-08-15 10:14:47 +02:00
Alexander Friedland
048c4a2502
Merge pull request #1224 from Human-Connection/A-1208-Registration-without-user-condition-confirmation 
🍰 Registration confirmation of terms of use added II
 2019-08-14 18:09:07 +02:00
Robert Schäfer
b6c96b7a57
Merge pull request #1261 from Human-Connection/1201-localise-categories 
Localise categories
 2019-08-14 17:44:21 +02:00