3714 Commits

Author SHA1 Message Date
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
buddh4
9d529881ca Merge pull request #2414 from acs-ferreira/patch-1
Cursor should be pointer
2017-03-28 11:41:17 +02:00
Lucas Bartholemy
8fecb8ff73 Merge pull request #2417 from githubjeka/stream-second-init
remove reinitialize stream
2017-03-28 11:31:22 +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
Carlos Ferreira
ca73cb190a Cursor should be pointer 2017-03-27 22:47:47 +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
5a2d08de1f Merge branch 'acs-ferreira-master' 2017-03-27 22:29:45 +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
buddh4
f75ea2a803 Fix: #2381 Comment input not focused on comment link click
Enh: Toggle comment box
2017-03-27 12:45:19 +02:00
Lucas Bartholemy
7f59424d2d Added missing import 2017-03-27 11:56:59 +02:00
Lucas Bartholemy
1f137deb64 Added missing imports 2017-03-27 11:41:44 +02:00
Lucas Bartholemy
bde082897a Notification namespace changes 2017-03-27 11:25:33 +02:00
Carlos Ferreira
4d71ce6d6f Comment Module Clean 2017-03-27 11:23:15 +02:00
Carlos Ferreira
90470a4f22 Admin Module Clean 2017-03-27 10:23:48 +02:00
buddh4
295b708fc6 Changelog update. 2017-03-26 21:24:27 +02:00
buddh4
840a236da3 - Fix: Show comments in modal not working 2017-03-26 21:23:58 +02:00
buddh4
4f6a3098ce Respect pinned post when inserting a a new stream entry 2017-03-26 17:46:48 +02:00
buddh4
13a5cd5368 Travis test fixes. 2017-03-26 17:18:03 +02:00
buddh4
83aa1ae09a Travis test alignments. 2017-03-26 16:40:37 +02:00
Lucas Bartholemy
5dc6fe6e20 Added missing PHP tag 2017-03-26 15:35:49 +02:00
Lucas Bartholemy
83dd63f498 Plain text activity mail fixes 2017-03-26 15:34:04 +02:00
Lucas Bartholemy
dc6ad90fb5 Merge pull request #2407 from acs-ferreira/master
Activity Module Clean
2017-03-26 15:29:59 +02:00
Carlos Ferreira
e4f8f84159 Activity Module Clean 2017-03-26 03:20:10 +01:00
Lucas Bartholemy
9a34a1a815 Merge pull request #2406 from acs-ferreira/master
Code Clean
2017-03-26 03:56:49 +02:00
Carlos Ferreira
692c02fe89 Models Clean 2017-03-26 02:55:31 +01:00
Carlos Ferreira
b58ecbc135 Libs Clean 2017-03-26 02:45:44 +01:00
Carlos Ferreira
2b2dfc2d26 Controllers Clean 2017-03-26 02:10:16 +01:00
Carlos Ferreira
caaa4de878 Config Clean 2017-03-26 02:08:16 +01:00