ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-12 23:35:58 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,605 Commits 113 Branches 1,511 Tags
Commit Graph

1477 Commits

Author SHA1 Message Date
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
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
ogerly
fde69a3b21 fix: review from wolle, fix lint 2020-08-27 09:49:54 +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
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
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
Wolfgang Huß
9ff1fc5b62 Fix linting 2020-08-04 14:21:35 +02:00
ogerly
1c1a0030f7 fix: i have taken over and implemented the proposals from tirrok 2020-08-04 13:08:11 +02:00
ogerly
9b14a5327a tests: reviews works 2020-08-04 11:42:12 +02:00
Hannes Heine
084a5172e9 Linter on webapp 2020-08-03 18:53:20 +02:00
Hannes Heine
fe999776c0 Filter out the deleted comments of the comment counter 2020-08-03 15:09:33 +02:00
Hannes Heine
9be480add2 Added a deleted comment to the Test case 2020-08-03 15:08:57 +02:00
ogerly
d2e6280059 Merge branch '17-Admin-Remove-user-profile' of https://github.com/Human-Connection/Human-Connection into 17-Admin-Remove-user-profile 2020-07-31 07:36:21 +02:00
roschaefer
650b3cef43 Remove "Human Connection" from translations 2020-06-16 14:19:07 +02:00
roschaefer
c2d92880c6 refactor: Move Logo out of styleguide 2020-06-16 13:35:01 +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
d171d783cd Run lint --fix 2020-06-08 21:57:50 +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
387ea64faa Parameterize links 2020-06-05 17:15:12 +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
roschaefer
92fba41286 Replace example link 2020-06-05 14:18:08 +02:00
roschaefer
3a216226bc Paramterize all emails 2020-06-05 14:15:42 +02:00
roschaefer
bc70e8b3b0 refactor: Image paths 
* removed obsolete images
* moved all overwritable images to a location webapp/static/img/custom/
* better names
 2020-06-05 11:49:18 +02:00
Dries Cruyskens
38d7ab9661 Moved the sorting function to helper file to prevent duplicate code. 2020-06-04 00:18:51 +02:00
Wolfgang Huß
c517c0fd45 Fix lint 2020-05-28 12:04:26 +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
ogerly
7b48339e18 fix: admin can delete himself 2020-04-30 15:59:22 +02:00
ogerly
fcc46d7f61 fix: DeleteData.spec.js 2020-04-30 12:56:03 +02:00
ogerly
3de96a2eaa fix: lint 2020-04-30 12:36:12 +02:00
ogerly
b2326c710e git pull conflicts fixed 2020-04-29 10:10:14 +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
4210727ddf bug: fix - contributionCount, commentCount remove from code 2020-04-27 13:55:29 +02:00
Wolfgang Huß
9aacb22a58
Merge pull request #3293 from Human-Connection/1741-follow-lists 
feat: FollowerList [1741]
 2020-04-20 13:01:29 +02:00