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

543 Commits

Author SHA1 Message Date
Moriz Wahl
9ef42940ae
change user roles: fixed mutation parameters, added success toast 2021-02-10 13:08:42 +01:00
Moriz Wahl
650e83f4c2 file upload: refactored 2021-02-08 16:10:38 +01:00
Moriz Wahl
ff8cd43165 image cropping is optional setup 2021-02-04 16:10:44 +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
Wolfgang Huß
7dbc833e22 Merge branch '2144-Add_Search_Results_Page' of https://github.com/Human-Connection/Human-Connection into HC-2144-Add_Search_Results_Page 
# Conflicts:
#	webapp/pages/profile/_id/_slug.vue
 2021-01-18 14:12:13 +01:00
Moriz Wahl
c405e008e4 checks that a cookie exists after login. If not, throw an error saying that no cookie can be set 2020-12-18 11:31:16 +01:00
Moriz Wahl
6454e686e9 changes requested implemented 2020-11-23 13:34:07 +01:00
Moriz Wahl
5cfb73572e further rebranding 2020-11-16 09:43:15 +01:00
Moriz Wahl
ecb0bb3766 Starting rebranding to ocelot.social 2020-11-10 12:08:44 +01:00
Moriz Wahl
bd962bbfcc merging rebranding branch from / 2020-11-10 10:28:20 +01:00
Wolfgang Huß
04a53f43b5 Fix locales 2020-11-03 15:36:50 +01:00
Wolfgang Huß
66f1758c2d Add German language 
- Correct some spacing and punctuation.
 2020-11-03 15:10:20 +01:00
dasari810
cd7e519d4b implemented requested changes 2020-11-03 01:04:28 +05:30
Wolfgang Huß
dab21933af
Merge pull request #3925 from Ocelot-Social-Community/supported-img-formats 
feat: 🍰 Show Supported Image Formats Implemented
 2020-10-27 12:12:32 +01:00
dasari810
84f69fe8f8 updated the translation for Deutsch 2020-10-27 13:29:22 +05:30
dasari810
f784f25192 changes made for portugal translation 2020-10-26 23:02:35 +05:30
dasari810
df4347f07c added translations for text 2020-10-26 19:13:51 +05:30
Moriz Wahl
a6f87a394a improved German, download images on click 2020-10-14 11:49:06 +02:00
Moriz Wahl
4a79fffa5b Removed XML download. Added image download and description 2020-10-13 17:36:53 +02:00
Wolfgang Huß
b076fa57ec Improve component for user profile tab and use on search page, refinement needed 2020-09-30 11:01:34 +02:00
Moriz Wahl
f0354c337f Export of user data as XML 2020-09-29 15:54:21 +02:00
Moriz Wahl
d049ad5d3e changes requested by review https://github.com/Human-Connection/Human-Connection/pull/3271 2020-09-24 13:14:35 +02:00
Moriz Wahl
af56c3dd4b Layout improved for Searcg Result page 2020-09-24 12:21:57 +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
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
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
Moriz Wahl
8f44fd6410 use v-if instead of v-show 2020-05-11 21:17:20 +02:00
Moriz Wahl
0892d6aaa3 Pagination is working, pageSize set to 12 2020-05-11 17:53:48 +02:00
ogerly
7b48339e18 fix: admin can delete himself 2020-04-30 15:59:22 +02:00
ogerly
446fd18e3b location: de one and more numbers 2020-04-30 15:54:17 +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
ogerly
c80f7d0518 feature: seach pageination WIP 2020-04-28 11:20:51 +02:00
ogerly
4a60911c9a fix: lint and test for SearchableInput ok 2020-04-22 09:58:53 +02:00
ogerly
9fe882b39b feature: sum search results added, Enter closes the preview search field, language file EN, DE adjusted 2020-04-15 11:18:15 +02:00
mattwr18
db20af2d39 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 2144-Add_Search_Results_Page 2020-04-02 08:19:43 +02:00