3202 Commits

Author SHA1 Message Date
Carlos Ferreira
8e4847290c Typo (closing tag) 2017-04-04 00:45:16 +02:00
Lucas Bartholemy
77dfed64de Merge branch 'master' into master 2017-04-03 22:31:42 +02:00
Lucas Bartholemy
965e5e1566 Fixed: Test queue driver config 2017-04-03 22:20:42 +02:00
Lucas Bartholemy
3b4efda3a6 Merge pull request #2441 from githubjeka/cc
To improving for code of ContentContainerController
2017-04-03 22:06:25 +02:00
Lucas Bartholemy
8db5b8cef2 Merge pull request #2443 from tomtomsen/patch-1
typo in ShowMorePager
2017-04-03 22:02:52 +02:00
Lucas Bartholemy
9e047bfb71 Merge branch 'master' of github.com:humhub/humhub 2017-04-03 19:39:55 +02:00
Lucas Bartholemy
ac3ef62056 Enh: Upgraded zhuravljov\yii\queue to version 0.11, fixed download issue 2017-04-03 19:39:47 +02:00
tom tomsen
8e6503d1eb typo in ShowMorePager
a minor typo.
2017-04-03 18:30:10 +02:00
Lucas Bartholemy
04b2ade0b4 Merge pull request #2438 from githubjeka/mentioning
phpDoc to user/models/Mentioning
2017-04-03 17:08:28 +02:00
Lucas Bartholemy
7ab45b139c Merge pull request #2439 from githubjeka/url
phpDoc to models/UrlOembed
2017-04-03 17:08:10 +02:00
githubjeka
d296ea14cf To improving for code of ContentContainerController 2017-04-03 16:16:11 +03:00
githubjeka
48b23ed0b0 phpDoc to models/UrlOembed 2017-04-03 15:39:04 +03:00
githubjeka
a2511a1ff5 phpDoc to user/models/Mentioning 2017-04-03 15:33:53 +03:00
Lucas Bartholemy
e30ae11a3e Merge branch 'master' of github.com:humhub/humhub 2017-04-03 14:05:42 +02:00
Lucas Bartholemy
dd07515768 Optimized user search result view 2017-04-03 14:05:30 +02:00
Lucas Bartholemy
de330a7f6d Merge pull request #2435 from githubjeka/post-controller
optimization to PostController
2017-04-03 14:05:05 +02:00
githubjeka
7050cb2ee2 optimization to PostController 2017-04-03 12:29:17 +03:00
buddh4
71979d2b29 Changelog update. 2017-03-29 16:41:56 +02:00
buddh4
99dfe39ad2 Fix: Public badge missing after create post
Fix: Mentioned Notification in User-Profile not working
Fix: Handle yii\db\Expression error for updated_at in wallentry
Enh: Added 'client.back' js action
2017-03-29 16:35:06 +02:00
Lucas Bartholemy
0b08cd2325 Fix: SVG file uploads broken (mime type: image/svg+xml) 2017-03-29 09:02:40 +02:00
Carlos Ferreira
72bfd8549d Fix and update whole French language pack 2017-03-28 22:24:23 +02:00
Lucas Bartholemy
76ca0e522d Release 1.2.0-beta.4 2017-03-28 19:39:48 +02:00
buddh4
25b30efe94 Asset Rebuild 2017-03-28 19:10:29 +02:00
buddh4
a18d0c2515 Update Changelog 2017-03-28 19:07:03 +02:00
buddh4
59d63e4814 Fix: #2297 failed to open stream: No such file or directory when attaching files in UploadAction 2017-03-28 19:06:44 +02:00
buddh4
f448b7b0d1 Fix: hide image file info setting 2017-03-28 18:32:27 +02:00
HumHub Translations
956e90bf92 Enh: Updated Translations (translate.humhub.org) 2017-03-28 17:50:35 +02:00
Lucas Bartholemy
43d2469d3b Merge branch 'master' of github.com:humhub/humhub
# Conflicts:
#	protected/humhub/docs/CHANGELOG.md
2017-03-28 17:48:12 +02:00
Lucas Bartholemy
003d02165f Enh #2392: Added Latvian language 2017-03-28 17:47:35 +02:00
buddh4
7671b74b66 Merge branch 'master' of https://github.com/humhub/humhub
# Conflicts:
#	protected/humhub/docs/CHANGELOG.md
2017-03-28 17:37:47 +02:00
buddh4
b6d74b39a3 Enh: Added Make Private/ Make Public link to wall entry controls
Fix: Wallentry loader + badge render issue
2017-03-28 17:36:06 +02:00
Lucas Bartholemy
2a53bdb9a2 Improved comment "update" time indicator 2017-03-28 17:13:00 +02:00
Lucas Bartholemy
22b09b6e85 Fix: Also allow comment editing by admins if content 'adminCanEditAllContent' is enabled 2017-03-28 16:38:42 +02:00
buddh4
844dfa9a65 Merge branch 'master' of https://github.com/humhub/humhub 2017-03-28 15:33:52 +02:00
buddh4
b0fb7fc1d1 Fix: update comment count.
Fix: remove popover when deleting post file.
2017-03-28 15:33:36 +02:00
githubjeka
145b8ea40d remove reinitialize 2017-03-28 12:06:20 +03:00
Lucas Bartholemy
352956e54b Fix: Norwegian translation code for Yii messages 2017-03-27 23:49:14 +02:00
Lucas Bartholemy
b55bcaa514 Cleanup fixes 2017-03-27 22:47:43 +02:00
Lucas Bartholemy
ac5de195a3 Fixed cleanup error 2017-03-27 22:40:20 +02:00
Lucas Bartholemy
a4886f62f7 Merge branch 'master' of https://github.com/acs-ferreira/humhub into acs-ferreira-master
# Conflicts:
#	protected/humhub/modules/admin/notifications/AdminNotificationCategory.php
#	protected/humhub/modules/admin/notifications/NewVersionAvailable.php
#	protected/humhub/modules/comment/controllers/CommentController.php
#	protected/humhub/modules/comment/views/comment/showPopup.php
#	protected/humhub/modules/comment/widgets/views/link.php
#	protected/humhub/modules/comment/widgets/views/showMore.php
2017-03-27 22:26:21 +02:00
Lucas Bartholemy
c90320bc19 Enh: Show different login message, when registration is disabled 2017-03-27 22:07:17 +02:00
HumHub Translations
00bd5a2722 Enh: Updated Translations (translate.humhub.org) 2017-03-27 19:50:16 +02:00
HumHub Translations
604bceebf5 Enh: Updated Translations (translate.humhub.org) 2017-03-27 19:48:37 +02:00
Lucas Bartholemy
049afad237 Merge branch 'master' of github.com:humhub/humhub 2017-03-27 19:11:45 +02:00
Lucas Bartholemy
57afe18048 Notification, renamed BaseNotification getTitle() method to getMailSubject() 2017-03-27 19:11:31 +02:00
buddh4
18584565e1 Merge pull request #2411 from githubjeka/stream-php-doc
phpDoc \humhub\modules\stream\actions\Stream
2017-03-27 18:33:08 +02:00
buddh4
3a51f96c6b Fix: Default stream sort setting not applied 2017-03-27 18:31:48 +02:00
Lucas Bartholemy
eef2efddf0 Enh: Added "weekly" mail summary interval 2017-03-27 17:51:01 +02:00
buddh4
9bfd40cea2 - Enh: Added global copyToClipboard 2017-03-27 16:30:31 +02:00
githubjeka
84d75afdd1 phpDoc \humhub\modules\stream\actions\Stream 2017-03-27 16:27:34 +03:00