3754 Commits

Author SHA1 Message Date
buddh4
9805f531fe Merge branch 'master' of https://github.com/humhub/humhub
# Conflicts:
#	protected/humhub/docs/CHANGELOG.md
2017-03-24 23:40:03 +01:00
buddh4
e9e9c11918 Fix: Approve user without available registration group
Fix: Activate 'User' navigation in Admin Menu "Administration -> User -> Settings"
2017-03-24 23:38:43 +01:00
Lucas Bartholemy
d5736ed0ba Enh: Improved administration user deletion view 2017-03-24 21:25:07 +01:00
Lucas Bartholemy
297135069d Fix #2400: Space ownership transfer form shows wrong users 2017-03-24 20:41:22 +01:00
Lucas Bartholemy
dd7ae7ae97 Merge pull request #2397 from githubjeka/stream
fix phpDoc
2017-03-24 14:00:12 +01:00
Lucas Bartholemy
33a36dd62a Merge pull request #2391 from githubjeka/space-visibility
Space visibility provided to common description
2017-03-24 13:59:44 +01:00
Lucas Bartholemy
1d34a1c02a Merge pull request #2390 from githubjeka/content-ar
fix phpDoc `humhub\modules\content\components\ContentActiveRecord`
2017-03-24 13:59:10 +01:00
Lucas Bartholemy
a500a0b372 added missing changelog entry 2017-03-24 13:39:10 +01:00
Lucas Bartholemy
9a7c423d5f Merge branch 'githubjeka-settings-files' 2017-03-24 13:37:43 +01:00
Lucas Bartholemy
90dcb18ed0 Merge branch 'settings-files' of https://github.com/githubjeka/humhub into githubjeka-settings-files
# Conflicts:
#	protected/humhub/docs/CHANGELOG.md
2017-03-24 13:37:04 +01:00
Lucas Bartholemy
0a3b028092 Fix: LDAP - Lost authclient ldap class configuration on user update 2017-03-24 13:27:32 +01:00
githubjeka
5a5cf092a4 remove unused import 2017-03-24 09:40:21 +03:00
githubjeka
bdd4932143 fix phpDoc
improve autocomplete
remove unused import
2017-03-24 09:34:02 +03:00
buddh4
f7489ef126 Merge pull request #2394 from Felli/patch-1
Fix: Typo
2017-03-23 22:42:56 +01:00
buddh4
c40eb928c4 Fix: #2393 Markdown h4,h5,h6 broken 2017-03-23 15:32:27 +01:00
Sarah Tsumayoi
2c1137009b Fix: Typo 2017-03-22 16:33:34 -04:00
buddh4
2a7c50d82c Merge branch 'master' of https://github.com/humhub/humhub 2017-03-22 18:14:47 +01:00
buddh4
53aa8e8e30 Fix: Use of $permission->getId() instead of $permission->id in PermissionManager (allow dynamic permission ids) 2017-03-22 18:14:33 +01:00
Sebastian Stumpf
9dea16c52b Fix: Automatically reenable disabled ldap users that are found in ldap.
The hourly cronjobs syncUsers task will now also reenable all disabled 
ldap users. Before, the task only disabled them and they had to be
manually enabled.
2017-03-22 13:41:21 +01:00
buddh4
f337efb3d7 Merge branch 'master' of https://github.com/humhub/humhub 2017-03-22 12:53:14 +01:00
buddh4
537754ec95 Fix: Default space permissions not adopted. 2017-03-22 12:52:49 +01:00
HumHub Translations
2e33069eca Enh: Updated Translations (translate.humhub.org) 2017-03-22 09:55:10 +01:00
githubjeka
438d23940e Space visibility provided to common description 2017-03-22 10:35:06 +03:00
githubjeka
e87b84a117 fix phpDoc humhub\modules\content\components\ContentActiveRecord 2017-03-22 09:27:02 +03:00
githubjeka
10e56b278d fix changelog 2017-03-22 08:43:37 +03:00
githubjeka
e24688ab50 upload changelog 2017-03-22 08:31:06 +03:00
githubjeka
82d5a0dbc7 Improve translation & fix typos to admin module 2017-03-22 08:15:40 +03:00
githubjeka
2629b5200a fixed humhub/humhub/issues/2388 2017-03-22 08:14:06 +03:00
githubjeka
693d8ee978 Added error processed to \humhub\libs\Helpers::getBytesOfIniValue 2017-03-22 08:11:56 +03:00
Lucas Bartholemy
2202b017a5 MessageController, extract module also with dash module id 2017-03-21 10:58:24 +01:00
Lucas Bartholemy
f889ae0661 Merge branch 'master' of github.com:humhub/humhub 2017-03-21 10:47:28 +01:00
Lucas Bartholemy
7920667350 Extract module messages - handle non camelcase message category names 2017-03-21 10:47:11 +01:00
Lucas Bartholemy
ef1129c3a4 Merge pull request #2385 from githubjeka/doc-permission
phpDoc: \humhub\modules\user\components\PermissionManager::can
2017-03-21 09:29:19 +01:00
githubjeka
0dba04df9d phpDoc: \humhub\modules\user\components\PermissionManager::can 2017-03-21 10:53:02 +03:00
buddh4
a4b02b1325 Fix: Notification count '0' visible after click on notification link. 2017-03-20 16:26:06 +01:00
buddh4
732e2644dc Added tracking documentation. 2017-03-20 16:04:04 +01:00
buddh4
5c8071830c Fix: missed afterAddEntries event. 2017-03-20 14:18:39 +01:00
buddh4
2ee407ac9f Fix: Hide entries before append animation. 2017-03-20 13:57:58 +01:00
buddh4
644838b93d Fixed: Stream fade animation failure. 2017-03-20 13:51:59 +01:00
buddh4
0e4c448505 Merge branch 'master' of https://github.com/humhub/humhub 2017-03-20 12:21:58 +01:00
buddh4
96886ed42d Fix: Use humhub application class for functional tests. 2017-03-20 12:19:15 +01:00
Lucas Bartholemy
28f8d21bad Update CHANGELOG.md v1.2.0-beta.3 2017-03-20 11:57:36 +01:00
Lucas Bartholemy
ca3599230c Merge pull request #2376 from githubjeka/ru
RU translation
2017-03-20 10:14:26 +01:00
githubjeka
cd29988a8e update ru translation 2017-03-20 10:26:10 +03:00
Lucas Bartholemy
c08e7b10bd Minor main layout cleanup, NotificationArea now automatically includes Notification Overview 2017-03-18 21:26:23 +01:00
Lucas Bartholemy
91f5cf7efb Enh: Added 'archived' badge to archived spaces in directory 2017-03-18 21:03:27 +01:00
Lucas Bartholemy
38f3548d69 Enh: Added stream module defaultStreamSuppressQueryIgnore to ease overwrites 2017-03-18 20:53:07 +01:00
Lucas Bartholemy
3455f6fc29 Enh: Added console email test command 2017-03-18 20:00:02 +01:00
Lucas Bartholemy
60870f882c Fixed typo in space un/archive message 2017-03-18 18:15:22 +01:00
HumHub Translations
9d03184811 Enh: Updated Translations (translate.humhub.org) 2017-03-18 18:11:42 +01:00