4288 Commits

Author SHA1 Message Date
Daniel Kesselberg
65ac5eb382 Fix button 2018-01-15 23:11:15 +01:00
Daniel Kesselberg
a4de4574ee Fix phpdoc 2018-01-15 23:09:22 +01:00
Daniel Kesselberg
2a82d6c642 Doc update 2018-01-15 23:08:06 +01:00
Daniel Kesselberg
56ff3d9954 Add controller 2018-01-15 23:04:39 +01:00
Daniel Kesselberg
6eefd92997 Update packages 2018-01-15 22:48:13 +01:00
Daniel Kesselberg
67aedec114 Add first draft 2018-01-15 22:44:56 +01:00
Daniel Kesselberg
ae352c395d Merge branch 'master' into export-users-csv
# Conflicts:
#	protected/humhub/modules/user/components/PermissionManager.php
2018-01-15 15:14:59 +01:00
Lucas Bartholemy
ca4556e5bd
Merge pull request #2934 from acs-ferreira/patch-28
Fix NotificationCategory component
2018-01-15 11:50:57 +01:00
Lucas Bartholemy
0682391b10
Merge pull request #2928 from acs-ferreira/patch-22
Fix ActionAccessValidator component
2018-01-15 11:50:42 +01:00
Lucas Bartholemy
c895d9d149
Merge pull request #2926 from acs-ferreira/patch-18
Fix ContentTagDropDown widget
2018-01-15 11:50:21 +01:00
Lucas Bartholemy
f998b336c8
Merge pull request #2925 from acs-ferreira/patch-17
Fix AccessController behavior
2018-01-15 11:48:38 +01:00
Lucas Bartholemy
f9f87197c5
Merge pull request #2927 from acs-ferreira/patch-21
Fix AccessValidator component
2018-01-15 11:47:39 +01:00
Lucas Bartholemy
8a8a386de2
Merge pull request #2924 from acs-ferreira/patch-16
Fix #2921
2018-01-15 11:47:08 +01:00
Lucas Bartholemy
49e0b8fb92
Merge pull request #2931 from acs-ferreira/patch-25
Fix BasePermission lib
2018-01-15 11:46:33 +01:00
Lucas Bartholemy
5c4ca9aad7
Merge pull request #2929 from acs-ferreira/patch-23
Fix PermissionAccessValidator component
2018-01-15 11:46:08 +01:00
Lucas Bartholemy
709e441813 Fix: Profile posts of friends not appears on dashboard 2018-01-15 11:05:38 +01:00
Carlos Ferreira
0e6a2595f1
Update AccessValidator.php 2018-01-14 23:42:35 +01:00
Lucas Bartholemy
68a62c726c
Merge pull request #2933 from acs-ferreira/patch-27
Fix BootstrapComponent widget
2018-01-14 21:01:15 +01:00
Lucas Bartholemy
5fce7acae5
Merge pull request #2932 from acs-ferreira/patch-26
Clean Error view
2018-01-14 21:00:00 +01:00
Carlos Ferreira
7c18919953
Fix NotificationCategory component 2018-01-14 16:06:12 +01:00
Carlos Ferreira
49c5561341
Fix BootstrapComponent widget 2018-01-14 16:00:25 +01:00
Carlos Ferreira
c5ddba2973
Clean Error view 2018-01-14 15:53:56 +01:00
Carlos Ferreira
fc0b34a6de
Fix BasePermission lib 2018-01-14 15:30:33 +01:00
Carlos Ferreira
14db111539
Update PermissionManager.php 2018-01-14 12:41:25 +01:00
Carlos Ferreira
9b7ad28347
Update ActionAccessValidator.php 2018-01-14 12:19:39 +01:00
Carlos Ferreira
6373a9de50
Fix PermissionAccessValidator component 2018-01-14 12:18:41 +01:00
Carlos Ferreira
db831cd5ba
Fix ActionAccessValidator component 2018-01-14 12:14:57 +01:00
Carlos Ferreira
9774c79f6a
Fix AccessValidator component 2018-01-14 12:10:14 +01:00
Carlos Ferreira
752a94467e
Update ContentTagDropDown.php 2018-01-14 11:51:19 +01:00
Carlos Ferreira
2649ced6d0
Fix ContentTagDropDown widget 2018-01-14 11:47:57 +01:00
Carlos Ferreira
06af3246be
Fix AccessController behavior 2018-01-14 11:27:46 +01:00
Carlos Ferreira
ad432ef1f1
Fix #2921
`Declaration of humhub\modules\content\components\ContentContainerPermissionManager::getModulePermissions(yii\base\Module $module) should be compatible with humhub\modules\user\components\PermissionManager::getModulePermissions(humhub\components\Module $module)`
2018-01-13 23:44:20 +01:00
Lucas Bartholemy
e7e56ff20a
Merge pull request #2915 from acs-ferreira/patch-13
Clean DirectoryController
2018-01-13 20:52:29 +01:00
Lucas Bartholemy
e911f575fa
Merge pull request #2921 from danielkesselberg/phpdoc-permmanager
Phpdoc permmanager
2018-01-13 20:50:48 +01:00
Lucas Bartholemy
cd8cea49b8
Merge pull request #2922 from danielkesselberg/ignore-static-assets
Exclude folder static/assets for codeclimate.
2018-01-13 20:50:16 +01:00
Daniel Kesselberg
e67ad3c52e Exclude folder static/assets for codeclimate. 2018-01-13 20:02:10 +01:00
Daniel Kesselberg
a2054ba0a7 Merge branch 'master' into export-users-csv 2018-01-13 19:49:04 +01:00
Daniel Kesselberg
2edc531e82 Code Style & PHPDoc 2018-01-13 19:48:03 +01:00
Daniel Kesselberg
ccfab55763 Code Style & PHPDoc 2018-01-13 19:47:44 +01:00
Daniel Kesselberg
16d4fff3f8 Code Style & PHPDoc 2018-01-13 19:46:04 +01:00
Daniel Kesselberg
6e2c253a79 Code Style & PHPDoc 2018-01-13 19:45:02 +01:00
Carlos Ferreira
5a050ddbcb
Re-fix codeclimate 2018-01-13 09:16:18 +01:00
Lucas Bartholemy
850d1673be
Merge pull request #2902 from danielkesselberg/fix-unittest-approve
Fix ApprovalTest
2018-01-12 23:58:53 +01:00
Lucas Bartholemy
f22ff33306
Merge pull request #2903 from danielkesselberg/fix-unittest-follow
Fix FollowTest
2018-01-12 23:58:38 +01:00
Lucas Bartholemy
9596199d44
Merge pull request #2905 from danielkesselberg/fix-unittest-permission
Fix PermissionManagerTest
2018-01-12 23:58:21 +01:00
Lucas Bartholemy
3f9258f3a4
Merge pull request #2904 from danielkesselberg/fix-unittest-mention
Fix MentionTest
2018-01-12 23:57:28 +01:00
Lucas Bartholemy
cadc039d2e
Merge pull request #2906 from acs-ferreira/patch-10
Clean LoggingController
2018-01-12 23:56:53 +01:00
Lucas Bartholemy
1dd6c4864e
Merge pull request #2910 from danielkesselberg/update-phpdoc-permissionmngr
Fix phpdoc for PermissionManager->can
2018-01-12 23:56:27 +01:00
Lucas Bartholemy
dcfe271542
Merge pull request #2911 from acs-ferreira/patch-11
Clean space DefaultController
2018-01-12 23:56:08 +01:00
Lucas Bartholemy
30e49e5a6a
Merge pull request #2914 from acs-ferreira/patch-12
Clean DashboardController
2018-01-12 23:55:01 +01:00