505 Commits

Author SHA1 Message Date
Moriz Wahl
7d6800c113 import posts via Json 2020-10-14 00:08:39 +02:00
ogerly
fde69a3b21 fix: review from wolle, fix lint 2020-08-27 09:49:54 +02:00
Alexander Friedland
635b7e0d23
Update webapp/locales/en.json
ok

Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
2020-08-27 09:14:01 +02:00
Alexander Friedland
6d856a3edc
Merge branch 'master' into 17-Admin-Remove-user-profile 2020-08-14 17:23:16 +02:00
ogerly
045500102c fix: translate delete from single to multiple entries 2020-08-14 17:15:37 +02:00
Wolfgang Huß
f0b29d9808
Merge pull request #3780 from Human-Connection/feat-3657-redesign-data-privacy-warning-box
feat: 🍰 Redesign Data Privacy Warning Box
2020-08-06 11:28:18 +02:00
Thiru
270a150db4
Update webapp/locales/en.json
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
2020-08-05 16:57:20 +02:00
Thiru
5a2fdb08be Redesign data-privacy-warning
Updated Buttons Styles.
Changed Order of the button.
Updated i18n.
2020-08-05 14:10:15 +02:00
Wolfgang Huß
dcc5b74038 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 17-Admin-Remove-user-profile 2020-05-28 10:52:24 +02:00
Wolfgang Huß
5e1a538094 Fix locales 2020-05-28 10:52:11 +02:00
ogerly
7b48339e18 fix: admin can delete himself 2020-04-30 15:59:22 +02:00
ogerly
c471f9797f fix: is not sorted by keys 2020-04-30 12:32:53 +02:00
ogerly
7e5a7f5d42 bug: deleteUser on old status, currentUserCounts are retrieved additionally, admin cannot delete himself via his user settings 2020-04-29 10:04:54 +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
roschaefer
bfbbe365ed Improve style of deleteUser modal 2020-03-24 22:43:13 +01:00
roschaefer
6a0b5a22e0 Merge remote-tracking branch 'origin/master' into 17-Admin-Remove-user-profile 2020-03-24 21:48:22 +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
ogerly
b87074b26e change location 2020-03-09 16:29:42 +01:00
ogerly
42e3b273b3 sorting locations fix yarn run locales --fix II 2020-03-09 16:12:38 +01:00
Alexander Friedland
404713a8ad
Merge branch 'master' into 17-Admin-Remove-user-profile 2020-03-09 14:25:37 +01:00
ogerly
3343e1435f sorting locations files yarn run locales --fix 2020-03-09 11:52:11 +01:00
ogerly
a1114a8a83 feat: additional confirm inserted before really deleting 2020-03-06 08:09:38 +01:00
ogerly
9ab2d8395f feat: DeleteUser for Admin added in the profile dropdown menu, deleted from the Admin user overview 2020-03-04 16:23: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
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