492 Commits

Author SHA1 Message Date
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
4a910664eb Parameterize entire html of terms+conditions 2020-06-14 17:57:40 +02:00
roschaefer
0d5cf7a8cd Replace name Human Connection from locales 2020-06-09 14:25:51 +02:00
roschaefer
3fa0723eac Fix Italian translation 2020-06-08 17:07:13 +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
e400a10c45 chore: rename/refactor filter, make responsive
- Make the emotions filter similar in style to CategoriesFilter
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
Moriz Wahl
07fbe92fa8 fixed locales after mistakes in rebase 2020-03-19 13:26:08 +01:00
Moriz Wahl
014be6e7f8 partially working, index page does not update when route is changed 2020-03-19 12:59:15 +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
Alina Beck
701564c708 Merge branch 'master' into migrate-styleguide-card 2020-02-20 00:37:07 +01:00
lokalise-bot
c4c6c7e711 Lokalise: update of webapp/locales/ru.json 2020-02-19 20:54:02 +01:00
lokalise-bot
e1c8b7a666 Lokalise: update of webapp/locales/pt.json 2020-02-19 20:54:00 +01:00
lokalise-bot
28e2967119 Lokalise: update of webapp/locales/fr.json 2020-02-19 20:53:58 +01:00
lokalise-bot
ef2af3c8bb Lokalise: update of webapp/locales/es.json 2020-02-19 20:53:56 +01:00
lokalise-bot
d21881e8eb Lokalise: update of webapp/locales/de.json 2020-02-19 10:27:52 +01:00
Alina Beck
6aecbd6c6d Merge branch 'master' into migrate-styleguide-card 2020-02-19 10:25:37 +01:00
Moriz Wahl
05424f49b4 locales are normalized 2020-02-18 19:16:30 +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
e68b53eda2 add title to counter icons on PostTeaser 2020-02-18 10:25:42 +01:00
Alina Beck
509892b6ca refactor DeleteData template and CSS 2020-02-10 12:40:38 +01:00
Robert Schäfer
a9b7318874
Merge pull request #2826 from Human-Connection/error-pages
fix: Error pages can be translated
2020-02-07 11:59:33 +01:00
mattwr18
c8c71a52c6 Follow @Tirokk PR review suggestions
- Favor lowercase for words in a sentence after the first
- Use exclamation marks for successful actions that use a toastr
- place events at the end of the list on components
- place class above events
- it would be nice to come to a consensus based on best practices, like
  I had a doubt and places the class definition below the props, is that
what others do?
2020-01-31 13:09:37 +01:00
mattwr18
701411e270 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1680-Direct_answer_on_Comment 2020-01-31 13:08:31 +01:00
mattwr18
60cd593826 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1724-block-users 2020-01-30 10:47:50 +01:00
Moriz Wahl
d20c94b453 Image size reduced 2020-01-28 22:26:54 +01:00
Moriz Wahl
d4e496b9e6 error image rendered 2020-01-28 21:48:22 +01:00
Moriz Wahl
7315cacb5a Text for 403 error is localized
I hacked the error.vue to catch the default 404 error message and to display a localized message instead. I found no better way to do it. Any ideas?
2020-01-28 10:18:15 +01:00
Moriz Wahl
a4907f2bcb localised error message for cannot edit post 2020-01-28 10:18:15 +01:00
Moriz Wahl
9948f4ef20 improved layout, key-name changed 2020-01-28 10:18:15 +01:00
Moriz Wahl
7cfd61ecf2 Error page added 2020-01-28 10:18:15 +01:00
mattwr18
d6a2f2d9e3 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1680-Direct_answer_on_Comment 2020-01-27 20:08:37 +01:00
Mike Aono
d49afc25cf test(cypress): Cover "Pinned post" feature
* Implement cypress tests

- Start implementation of cypress tests for pinned posts

* Test that Admin can pin a post

- Tests the process of an admin pinning a post

* Resolve failing tests

- Fix ordering of posts immediately after pinning posts by reloading page
- Check that tests are pinned posts are displayed first for role user

* Refactor to seperate the initialization

- Of the post data created in the database during setup

* Fix toaster test

* test(cypress): Add missing parts for pin feature

* docs(cucumber): Link to admin 🥒 folder

* Follow @mattwr18's suggestions

* test(backend): Order pinned posts like frontend

@mattwr18 I think this was a false negative.

Co-authored-by: Robert Schäfer <git@roschaefer.de>
2020-01-23 20:30:12 +01:00
mattwr18
bbb4dd56cd Follow review suggestions/add button to unblock
- @roschaefer gave several suggestions
- we have a button to unblock/unmute users on profile page
2020-01-23 19:18:12 +01:00
Alexander Friedland
9776efe760
Merge branch 'master' into 1680-Direct_answer_on_Comment 2020-01-22 11:46:04 +01:00
ogerly
21fa211e0c test: specs not ok, lint is ok 2020-01-22 11:31:23 +01:00
mattwr18
e639358557 Test drive to get the functionality how we'd like 2020-01-21 21:16:42 +01:00
mattwr18
704b8c2d57 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1724-block-users 2020-01-21 21:15:03 +01:00
mattwr18
2df4e463f8 Update/Add translations for placeholder message
- @alina-beck, I had a look at the Placeholder component and it's quite
  simple, but I guess migrating that is a separate PR, but I don't know
aobut adding more ds-placeholders, do you have some design ideas on what
could look better?
2020-01-21 19:28:19 +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
Mogge
bdb729b461 removed obsolete German keys (#2845) 2020-01-21 13:15:19 +01:00
ogerly
73b005a900 test: added some test 2020-01-20 11:18:35 +01:00