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

43 Commits

Author SHA1 Message Date
Wolfgang Huß
fbbc9c9325
Merge pull request #4316 from Ocelot-Social-Community/4260-remove-more-info-on-post 
feat: 🍰 Remove More-Info Of Post
 2021-04-07 09:24:49 +02:00
Wolfgang Huß
3398d3b373
Cleanup locales 2021-03-30 04:51:45 +02:00
Wolfgang Huß
e00de176e2
Cleanup in general 2021-03-30 04:51:45 +02:00
Wolfgang Huß
3fa7e04d48
Delete unnecessary code 2021-03-30 04:51:44 +02:00
Wolfgang Huß
3d8fe39cbe
Fix non standard locales 2021-03-30 04:51:44 +02:00
Wolfgang Huß
02fa718fae Remove more-info of post 
- Additionally remove take-action.
 2021-03-29 15:16:05 +02:00
Wolfgang Huß
8a2f80e619 Fix locales json 2021-03-03 15:01:53 +01:00
Wolfgang Huß
f7710be95c Remove mutation 'SignupByInvitation' 2021-03-03 13:54:47 +01:00
Moriz Wahl
f1346b595a
Merge pull request #3928 from Ocelot-Social-Community/allow-only-supported-file-formats 
feat: 🍰 Allow Only Supported Image File Formats
 2021-02-04 15:22:02 +01:00
Moriz Wahl
bd962bbfcc merging rebranding branch from / 2020-11-10 10:28:20 +01:00
Wolfgang Huß
66f1758c2d Add German language 
- Correct some spacing and punctuation.
 2020-11-03 15:10:20 +01:00
dasari810
df4347f07c added translations for text 2020-10-26 19:13:51 +05:30
roschaefer
650b3cef43 Remove "Human Connection" from translations 2020-06-16 14:19:07 +02:00
roschaefer
77b031083e Make four static pages 
* imprint
* data privacy
* terms of service
* code of conduct
 2020-06-15 14:08:45 +02:00
roschaefer
36679da84d refactor: Avoid html in translation files 
I removed it. We cannot parameterize localizations with absolute urls
properly.
 2020-06-05 18:13:07 +02:00
roschaefer
193f977863 fix: Remove broken moreInfoURL 
The links specified in the locales were pointing to the English site and
were mostly broken anyways.
 2020-06-05 17:19:58 +02:00
roschaefer
4ea0d653c4 Remove inappropriate picture help link 
This link is helpful but points to Human Connection, so unfortunately I
have to remove it.
 2020-06-05 17:00:15 +02: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
lokalise-bot
2eb4f088e9 Lokalise: update of webapp/locales/ru.json 2020-03-03 00:01:11 +01:00
Mogge
f17cf9db14
Merge branch 'master' into lokalise-2020-02-19_20-53-55 2020-03-02 23:14:57 +01:00
ogerly
6472cec0c6 terms-and-condition: the point -no political use - added 2020-02-22 14:38:32 +01:00
lokalise-bot
c4c6c7e711 Lokalise: update of webapp/locales/ru.json 2020-02-19 20:54:02 +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
lokalise-bot
b70ff73bba Lokalise: update of webapp/locales/ru.json 2019-12-18 10:06:18 +01:00
lokalise-bot
f672abfaa9 Lokalise: update of webapp/locales/ru.json 2019-12-10 21:55:16 +01:00
lokalise-bot
3e52ee090c Lokalise: update of webapp/locales/ru.json 2019-11-22 12:55:34 +01:00
lokalise-bot
906e8518bf Lokalise: update of webapp/locales/ru.json 2019-11-18 23:21:52 +01:00
Ewald Arnold
26c0d4d83e add current file 2019-11-06 09:11:52 +01:00
Alexander Friedland
60c2bba271
fix missing bracket 
fix missing bracket
 2019-11-03 19:14:44 +01:00
Alexander Friedland
97bd1b4816
in ru.json i started this once 
in ru.json i started this once. as a template you can use german or english. both languages are complete. you can copy and paste the ru.json. what is not translated. default will be shown in english.
 2019-11-03 19:12:20 +01:00
Ewald Arnold
5fbe0da2ae add empty russian template 2019-11-03 17:31:10 +01:00