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
Daniel Kesselberg
04cfdaee56
Set readonly property for all fields when Settings::IsFixed is true
2018-01-13 18:45:16 +01:00
Daniel Kesselberg
7e6be8616a
Code Style / PHPdoc
2018-01-13 17:18:03 +01:00
Carlos Ferreira
5a050ddbcb
Re-fix codeclimate
2018-01-13 09:16:18 +01:00
Lucas Bartholemy
3223811615
Fixed admin space listing initial view
2018-01-13 00:05:00 +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
Lucas Bartholemy
be7637fec3
Merge pull request #2916 from acs-ferreira/patch-14
...
Fix BaseMenu widget
2018-01-12 23:53:59 +01:00
Lucas Bartholemy
a0c6add9d2
Merge pull request #2917 from acs-ferreira/patch-15
...
Fix Tabs widget
2018-01-12 23:52:41 +01:00
Daniel Kesselberg
17b468bce8
Code
2018-01-12 20:48:32 +01:00
Daniel Kesselberg
9bc4925d0e
Make code climate happy
2018-01-12 20:29:02 +01:00
Carlos Ferreira
fcaed55cd6
Fix Tabs widget
2018-01-12 19:09:56 +01:00
Carlos Ferreira
eb4a827853
Fix Tabs widget
2018-01-12 19:08:29 +01:00
Carlos Ferreira
34c37db4fb
Fix BaseMenu widget
2018-01-12 18:46:51 +01:00
Carlos Ferreira
78d7b3c771
Fix CodeClimate
2018-01-12 16:14:06 +01:00
Carlos Ferreira
162cc2a1d3
Clean DirectoryController
2018-01-12 16:05:42 +01:00
Daniel Kesselberg
94da209f95
Add packages
2018-01-12 15:54:54 +01:00
Carlos Ferreira
f934aefffd
Clean DashboardController
2018-01-12 15:52:40 +01:00
Kristian Lein-Mathisen
e1fcb09fa7
Detect dataType from server response in AJAX requests
...
Previously: if the AJAX query doesn't contain a dataType, we
assume the dataType is "html".
Now: if the AJAX query doesn't contain a dataType, we determine the
dataType from the server's content-type (either "html" or "json").
This is is particularly useful in `modal.load(url)` scenarios and
other places where the response type can be both "html" and "json".
2018-01-12 15:27:46 +01:00
buddh4
5af1df51cb
Merge branch 'master' of https://github.com/humhub/humhub
2018-01-12 14:35:14 +01:00
buddh4
07d6958088
Fixes #2745 removed GroupPermission::instance()
2018-01-12 14:34:43 +01:00
Carlos Ferreira
fab7e58f24
Clean space DefaultController
2018-01-12 12:34:02 +01:00
Daniel Kesselberg
bee0f5ba67
You can pass an array with permissions to PermissionMaanger->can(). But string[] is the wrong annotation.
2018-01-12 11:35:44 +01:00
Carlos Ferreira
d976d0dc7e
Clean LoggingController
2018-01-11 22:59:18 +01:00
Daniel Kesselberg
baca831b40
Code Style
2018-01-11 22:00:00 +01:00
Daniel Kesselberg
97e4f55b5f
Add widget for ExportButton
2018-01-11 21:28:32 +01:00
Daniel Kesselberg
b65acc1a0b
Fix Unit-Test
...
- Remove use Specify (unused & not required in composer.json)
- Code Style
2018-01-11 19:56:54 +01:00
Daniel Kesselberg
bb81d38002
Fix Unit-Test
...
- Remove use Specify (unused & not required in composer.json)
- Code Style
2018-01-11 19:53:13 +01:00
Daniel Kesselberg
033745ea5a
Fix Unit-Test
...
- Remove use Specify (unused & not required in composer.json)
- Code Style
2018-01-11 19:51:16 +01:00
Daniel Kesselberg
515923408b
Fix Unit-Test
...
- Remove use Specify (unused & not required in composer.json)
- Code Style
2018-01-11 19:48:35 +01:00
Daniel Kesselberg
2525ee1581
Fix phpdoc for can
2018-01-11 12:29:56 +01:00
Daniel Kesselberg
5463d832ec
Fix phpdoc for can
2018-01-10 22:19:17 +01:00
Lucas Bartholemy
f490d65f1f
Added more details to pending approval view
2018-01-09 15:40:11 +01:00
Lucas Bartholemy
80058ddf8a
Reverted align of space acronym
2018-01-07 19:23:00 +01:00
Lucas Bartholemy
18e790bdf8
Merge branch 'v1.3-dev' of github.com:humhub/humhub into v1.3-dev
2018-01-07 13:50:23 +01:00
Lucas Bartholemy
36dab5f27f
Fixed Space image acronym position
2018-01-07 13:50:07 +01:00
Lucas Bartholemy
ab6248ed6a
Fixed password recovery typo
2018-01-05 17:16:35 +01:00
HumHub Translations
2b9d8c4cb2
Enh: Updated Translations (translate.humhub.org)
2018-01-05 16:47:06 +01:00
Lucas Bartholemy
157785b6f2
Merge pull request #2890 from acs-ferreira/patch-6
...
Typo and format
2018-01-05 16:45:35 +01:00
Lucas Bartholemy
75aafb224d
Merge pull request #2891 from githubjeka/patch-1
...
corrected ru messages
2018-01-05 13:53:26 +01:00
