3432 Commits

Author SHA1 Message Date
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
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
Lucas Bartholemy
6dfd5c8658 Fix: Added missing file download http caching 2017-03-18 16:41:52 +01:00
Lucas Bartholemy
a0d14ae7a8 Fix #2255: Added missing Social Account Settings menu 2017-03-18 02:09:19 +01:00
Lucas Bartholemy
7d8a4a17ce Removed deprecated notification action 2017-03-18 02:05:12 +01:00
Lucas Bartholemy
e96facb9ad Merge branch 'master' of github.com:humhub/humhub 2017-03-18 01:55:03 +01:00
Lucas Bartholemy
16bfea0d50 Enh: Allow any url route as homepage 2017-03-18 01:54:43 +01:00
Lucas Bartholemy
11e4259f86 Merge pull request #2370 from Felli/patch-1
Fix: APCu Testing
2017-03-18 00:54:20 +01:00
Lucas Bartholemy
7f43a506a3 Enh: Added option to show/hide deactivated user content in stream 2017-03-18 00:51:53 +01:00
Lucas Bartholemy
1e6a2c5056 Do not log too old poll requests 2017-03-18 00:46:34 +01:00
Lucas Bartholemy
6018d8f98a Fix #2312: Pinned post appears twice on stream 2017-03-18 00:41:46 +01:00
Sarah Tsumayoi
c305f8794d Merge branch 'master' into patch-1 2017-03-17 19:22:46 -04:00
Lucas Bartholemy
6b830008f4 Fix: Better notification compatiblity - mail views and enabled WebNotificationTarget 2017-03-18 00:20:54 +01:00
Sarah Tsumayoi
588f2b7c4f Merge pull request #1 from Felli/patch-2
Update CHANGELOG.md
2017-03-17 19:04:07 -04:00
Sarah Tsumayoi
81f6f2747f Update CHANGELOG.md 2017-03-17 19:03:08 -04:00
Sarah Tsumayoi
d450284210 Update CacheSettingsForm.php
Should fix #2369
2017-03-17 19:00:52 -04:00
Lucas Bartholemy
c2c0843d72 Merge pull request #2367 from githubjeka/fix-2366
Code of ImageConverter::allocateMemory uses different units of memory
2017-03-17 16:31:45 +01:00
buddh4
9d01d7ddad Fixed Test
Added Missing production asset
Enh: Added Grunt tasks `build-assets`, `build-theme`, `build-search`
2017-03-17 13:48:08 +01:00
Evgeniy Tkachenko
522865c85a Update CHANGELOG.md 2017-03-17 15:11:32 +03:00
githubjeka
b6c7bdbbe5 update changelog 2017-03-17 15:02:43 +03:00
githubjeka
30d783d6ff Fix to allocate memory for operations with images 2017-03-17 14:54:42 +03:00
buddh4
807ee57255 Merge branch 'master' of https://github.com/humhub/humhub 2017-03-17 01:20:37 +01:00
buddh4
ee0034fe5f Built assets. 2017-03-17 01:20:15 +01:00
buddh4
c6b0b6cb49 Fixed tests
Fix: Error when saving account setting permission.
Fix: #2296 stream scroll issue for mobile webkit browsers (martinbeek)
Fix: Stream load more button not working
Fix: Added unknown upload error if server cancels upload (e.g in case of a post_max_size violation issue)
2017-03-17 01:18:17 +01:00