29 Commits

Author SHA1 Message Date
Wolfgang Huß
a94d7188be Merge branch 'master' of https://github.com/Ocelot-Social-Community/Ocelot-Social into feature/mark-all-notification-as-read-test 2020-11-12 15:37:38 +01:00
Ademílson F. Tonato
cc99e27fd4 refactor: updating locales in alphabetical order 2020-10-27 19:44:28 +00:00
dasari810
df4347f07c added translations for text 2020-10-26 19:13:51 +05:30
Ademílson F. Tonato
e37fb535dc feat: add translations for notifications label (mark all as read) 2020-10-24 11:54:52 +01:00
mattwr18
771fe49da6 chore: Fix locales sorting 2020-03-25 11:02:28 +01:00
mattwr18
0f03d09723 refactor: Extract FollowingFilter as own component
Co-authored-by: Alina Beck <alina.beck@mail.com>
2020-03-25 11:02:28 +01:00
Alina Beck
1ffde6bf10 refactor: CategoriesFilter to not use ds-flex
Co-authored-by: mattwr18 <mattwr18@gmail.com>

- introduce LabeledButton component
- rename FilterMenu to HashtagsFilter and FilterPosts to FilterMenu
2020-03-25 11:02:00 +01:00
Mogge
f17cf9db14
Merge branch 'master' into lokalise-2020-02-19_20-53-55 2020-03-02 23:14:57 +01:00
lokalise-bot
28e2967119 Lokalise: update of webapp/locales/fr.json 2020-02-19 20:53:58 +01:00
Alina Beck
6aecbd6c6d Merge branch 'master' into migrate-styleguide-card 2020-02-19 10:25:37 +01:00
Moriz Wahl
934c9906cc sorting keys, comparing de and en locales, yarn run locales 2020-02-18 18:07:57 +01:00
Moriz Wahl
fa906efb1f locales sorted. 2020-02-18 18:07:57 +01:00
Alina Beck
509892b6ca refactor DeleteData template and CSS 2020-02-10 12:40:38 +01:00
mattwr18
8fe6ad77e0
Merge pull request #2686 from Human-Connection/279-blacklist-users-content
feat: Convert block/unblock to mute/unmute
2020-01-21 17:05:09 +01:00
Robert Schäfer
d3473050c4
Merge pull request #2725 from Human-Connection/2229_remove_obsolete_translation
fix(translations): Remove duplicate and mistranslated item from code of conduct
2020-01-17 22:28:10 +01:00
roschaefer
c22a6330aa refactor(translations): Fix keys for muting
Provide the correct German translation. Remove "" and use `null` for
Italian. @mattwr18 we really have to make sure not to add empty strings
to our translations because we disable the fallback in that case. Also,
if we want, we could replace the other translations with `null` in order
to make sure that we have the better (though untranslated) explanation.

@mattwr18 I had a look into `notificationsMiddleware.js`. I think that
we can still keep the tests and the behaviour although there is no
`BLOCKED` relationship anymore, right?
2020-01-16 20:56:12 +01:00
roschaefer
4631db0a1b feat(webapp): Display deployed version in footer
Remove VERSION file in favour of version entry in `package.json`. Parse
this version in our build server scripts.

This commit also introduces `standard-version` which we can use to
generate our `CHANGELOG.md` with `yarn run release`.

close #1831
2020-01-16 19:24:55 +01:00
roschaefer
966cdc9574 fix #2229
I have to agree with @vbelolapotkov here. First of all the translation
for German an English does not match and second it does not make an awful
lot of sense to have "Report these actions" twice in the list. The
English translation "Advocacy or encouragement to these behaviors."
probably belongs into the section before.
2020-01-12 17:35:31 +01:00
mattwr18
ba3e9e1025 Rename blacklist/whitelist to mute/unmute
- Follow @roschaefer suggestion in issue
- This can be reverted if we decide otherwise
2020-01-08 18:04:26 +01:00
mattwr18
c297b83f87 Convert block/unblock to blacklist/whitelist
- at the moment, we have implemented blocked like we want the
blacklist/whitelistUserContent to be, with the exception that is should
not be both ways. If I blacklist a user's content, they still see my
content in their news feed.
2020-01-07 18:57:35 +01:00
Erhardt Stiefel
eceae24683
Update fr.json 2019-12-11 13:10:17 +01:00
lokalise-bot
7ab1686caa Lokalise: update of webapp/locales/fr.json 2019-11-22 12:55:29 +01:00
Brent Vardy
227db5f13a refactored tranformImage to remove dupication
- styled confirm button
- added locale translations
- added dropzoneDrop method to handle scenario where users drag and drop an image whilst in the cropper interface.

- co-authored-by: mattwr18 <mattwr18@gmail.com>
2019-10-14 16:42:11 +02:00
Robert Schäfer
a6f5fe8ea3 Rename privacy->data-privacy 2019-08-05 23:19:20 +02:00
senderfm
48454dda56 fix review, page conditions of use in german and english ok 2019-07-09 10:59:21 +02:00
senderfm
f2d0cd1f6a footer created, new pages, imprint, terms and conditions, history, privacy policy, imprint created and languages adapted 2019-07-09 10:00:45 +02:00
senderfm
6c7ee1ef42 das einmalige melden eines User, Beitrags oder Kommentars
ist jetzt möglich
2019-06-25 17:51:14 +02:00
senderfm
f6af85c93c Language Packs Spanish and French current status 2019-06-07 20:33:16 +02:00
Robert Schäfer
c91a61af89 Merging webapp to master 2019-03-20 21:06:17 +01:00