IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2025-12-13 07:45:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,382 Commits 5 Branches 2 Tags
Commit Graph

3724 Commits

Author SHA1 Message Date
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
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
906ab2d790 Parameterize page titles 2020-06-16 14:31:29 +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
d78e181dd3 fix image path 2020-06-16 13:31:36 +02:00
roschaefer
1d98f580a1 Install raw-loader node module 2020-06-16 12:11:51 +02:00
roschaefer
a20aebc027 Remove obsolete env var 2020-06-15 15:18:25 +02:00
roschaefer
68c5f0dd85 Fix lint 2020-06-15 15:15:55 +02:00
roschaefer
dd09dfa721 Replace welcome image in email templates 2020-06-15 14:54:03 +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
Wolfgang Huß
a4e4575f19 Fix lint 2020-06-10 15:11:40 +02:00
roschaefer
0d5cf7a8cd Replace name Human Connection from locales 2020-06-09 14:25:51 +02:00
roschaefer
d171d783cd Run lint --fix 2020-06-08 21:57:50 +02:00
roschaefer
3fa0723eac Fix Italian translation 2020-06-08 17:07:13 +02:00
adarsh-av13
2d66348c1b corrected code-of-conduct mail link 2020-06-08 00:32:21 +05:30
Wolfgang Huß
e33a190ffe Fix syntax 
- My conflict resolved on GitHub missed a bracket.
 2020-06-06 10:04:51 +02:00
Wolfgang Huß
cf3f9fa210
Merge branch 'master' into 3013-set-the-teaser-image-to-the-appropriate-size-ratio-from-the-beginning 2020-06-06 09:50:49 +02:00
DriesCruyskens
a245fd2d50
Merge pull request #3589 from Human-Connection/2244-order-tags-in-cloud-alphabetically 
feat: 🍰 Alphabetically sorting tags using compute functions on index and more…
 2020-06-05 22:34:36 +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
37b3014ac7 Parameterize manifest 2020-06-05 17:37:16 +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