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

3337 Commits

Author SHA1 Message Date
Wolfgang Huß
04a53f43b5 Fix locales 2020-11-03 15:36:50 +01:00
Wolfgang Huß
dfb6e0f096 Merge branch '3921-set-up-travis-builds' of https://github.com/Ocelot-Social-Community/Ocelot-Social into allow-only-supported-file-formats 2020-11-03 15:18:01 +01:00
Wolfgang Huß
66f1758c2d Add German language 
- Correct some spacing and punctuation.
 2020-11-03 15:10:20 +01:00
Wolfgang Huß
844da649f0 Fix node version to 'node:12.19.0-alpine3.10' 
- Changed from 'node:lts-alpine' to 'node:12.19.0-alpine3.10'.
 2020-11-03 13:02:24 +01:00
dasari810
cd7e519d4b implemented requested changes 2020-11-03 01:04:28 +05:30
Wolfgang Huß
1a6a2bd8c8 Inserted empty line for nicer formating 2020-11-02 12:53:47 +01:00
Wolfgang Huß
0095a94863 Merge branch 'master' of https://github.com/Ocelot-Social-Community/Ocelot-Social into allow-only-supported-file-formats 2020-11-02 12:41:15 +01:00
Wolfgang Huß
b6c8acab36 Change docker repository to develop-webapp 
- nitro-web  —>  develop-webapp
 2020-10-28 10:52:07 +01:00
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
939466b9bb allow only supported file formats 2020-10-27 12:48:08 +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
dasari810
ae681ccad3 show supported img formats implemented 2020-10-26 16:35:06 +05:30
Moriz Wahl
f7b60f5928 linting 2020-10-26 11:19:03 +01:00
Moriz Wahl
c4b436f6cb spinner added to download button, only the posts written by the user are exported 2020-10-26 10:43:22 +01:00
Wolfgang Huß
c99cb16a6b v0.6.3 2020-10-16 12:42:43 +02:00
Wolfgang Huß
3f453c6888
Merge pull request #3954 from Human-Connection/export-user-data 
feat: Export User Data Update
 2020-10-16 11:31:41 +02:00
Moriz Wahl
14de48ecd7 deleted or disabled post are not available for user data download. 2020-10-16 11:00:58 +02:00
Wolfgang Huß
63207320b4 v0.6.2 2020-10-15 17:00:46 +02:00
Moriz Wahl
f9518619fe id for author added 2020-10-14 16:35:47 +02:00
Moriz Wahl
3ba72526b9 filename of downloaded image changed 2020-10-14 12:19:53 +02:00
Moriz Wahl
6ff02b41c8 name of downloaded image is the same as the url in the exported json 2020-10-14 12:03:35 +02:00
Moriz Wahl
a6f87a394a improved German, download images on click 2020-10-14 11:49:06 +02:00
Moriz Wahl
8e527a83f1 post categories added for data export 2020-10-14 00:14:56 +02:00
Moriz Wahl
4a79fffa5b Removed XML download. Added image download and description 2020-10-13 17:36:53 +02:00
Moriz Wahl
f0354c337f Export of user data as XML 2020-09-29 15:54:21 +02:00
Moriz Wahl
0e678a5559 basic json download of user data 2020-09-29 13:35:47 +02:00
Wolfgang Huß
36d26ebca2 Fix sign up page on safari 
- Added 'width' and 'height' properties in the SVG 'webapp/static/img/sign-up/nicetomeetyou.svg'.
- Have found that this are present on other SVGs. For example 'webapp/static/img/sign-up/humanconnection.svg'.
- Couldn't find an other way …
 2020-09-17 10:37:46 +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
ogerly
b2f3b02422 fix: DeleteDate vue and specs 2020-08-19 10:01:59 +02:00
ogerly
6a68bb8f83 fix: location map box USA 2020-08-18 11:50:32 +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
ogerly
3d69ebbb1c fix: tests ok, lint ok 2020-08-14 11:39:38 +02:00
Mogge
907b3214aa
Merge pull request #3769 from Human-Connection/Elweyn/issue2112 
fix: 🍰 Comment Counters Are Now Equal
 2020-08-11 21:30:59 +02:00
Hannes Heine
823056b59e Added the user that writes the comment to the authentication. Test reply to comment edited. Test update comment added. Test delete comment pending. 2020-08-11 16:01:42 +02:00
Hannes Heine
34ba9d8c0b Lint over the frontend code. 2020-08-07 14:07:53 +02:00
Hannes Heine
def6a9d444 Changed the class to use this.post.comments instead of the computed postComments so that issue are fixed. 2020-08-07 13:17:14 +02:00
Hannes Heine
7f8be5deab fix: #3357 now the comment deletion and comment updates are seen directly after the event is triggered. 2020-08-06 16:18:27 +02:00
Hannes Heine
d513fec7fe Added test comment that is disabled and changes the test name so that we see that the test checks the comment count to ignore disabled and deleted comments. 2020-08-06 16:12:36 +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
Wolfgang Huß
7106fa8ada
Merge pull request #3506 from Human-Connection/3498-Checkboxes_missing_on_delete_user_account_page 
fix: 🍰 Checkboxes Not Missing Anymore On Delete User Account Page
 2020-08-05 15:06:51 +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
ogerly
0b62d76bc1 fix: prework for tests 2020-08-05 13:45:24 +02:00
Ritesh
c3265f53ab Changed top margin to a higher value as compared to margin bottom 2020-08-05 13:55:12 +05:30
ogerly
8b7b1056ac fix: style change in modal deleteUserModal 2020-08-04 16:14:05 +02:00
Ritesh
a8b3da30d6 fix: Increase margin of header and ruler for better legibility 
fix: Margin of H3 H4 HR was set to zero by reset.css. This was causing
problem in readability.
 2020-08-04 18:49:37 +05:30