7317 Commits

Author SHA1 Message Date
buddh4
0e3126566a Merge branch 'develop' into enh/wallStreamEntryWidgetlayouts
# Conflicts:
#	static/less/stream.less
#	themes/HumHub/css/theme.css
2020-09-16 15:58:59 +02:00
buddh4
62e724a6d0
Merge pull request #4387 from humhub/fix/contentEditTest
Fixed ContentEditTest
2020-09-16 15:41:14 +02:00
buddh4
c2fd5d23c0 Fixed ContentEditTest 2020-09-16 15:40:23 +02:00
buddh4
4f5b59d25b
Merge pull request #4380 from humhub/enh/ContentIsEdited
Enh: Implementation of Content::isEdited()
2020-09-16 15:35:37 +02:00
buddh4
dabec6a6aa Changed isEdited to isUpdated
Added Comment::isUpdated()
2020-09-16 14:47:45 +02:00
Lucas Bartholemy
6fa5d19770
Merge pull request #4384 from humhub/fix/yii2upgrade
Upgrade to Yii 2.0.38
2020-09-16 14:14:08 +02:00
Lucas Bartholemy
5c141386cb
Update CHANGELOG.md 2020-09-16 14:13:32 +02:00
buddh4
8e0431aa28
Merge pull request #4378 from humhub/enh/contentIsComparison
Enh: Implemented generic ContentContainerActiveRecord::is() function
2020-09-16 13:58:46 +02:00
Lucas Bartholemy
ade7234bff
Update ContentContainerActiveRecordTest.php 2020-09-16 13:37:57 +02:00
buddh4
51a2985257 Added one second sleep to ContentEditTest.php 2020-09-16 12:44:12 +02:00
Lucas Bartholemy
1d93b4b536 Upgrade to Yii 2.0.38 2020-09-16 10:33:01 +02:00
buddh4
7c570fa7a1 Fix ContentTest name duplication 2020-09-15 19:10:03 +02:00
buddh4
e67fb959a9 Added comment to ContentTest.php 2020-09-15 17:47:48 +02:00
buddh4
6122cb5fd1 Added ContentTest.php 2020-09-15 17:46:44 +02:00
buddh4
3c987fd50d Enhanced documentation of Content::isEdited 2020-09-15 17:28:20 +02:00
buddh4
f11f54ce72 Enh: Implemented Content::isEdited() to determine if a content has already been edited 2020-09-15 17:25:10 +02:00
buddh4
c7893e88ec Enh: Added test layout and fixtures for live module. 2020-09-15 17:18:45 +02:00
buddh4
f2cb11c057
Merge branch 'develop' into enh/contentIsComparison 2020-09-15 17:13:49 +02:00
buddh4
b2490d7a4e Added CHANGELOG_DEV.md 2020-09-15 17:12:33 +02:00
buddh4
dbb1aa94a1 Enh: Initial implementation of new WallStreamEntryWidget 2020-09-15 16:57:19 +02:00
buddh4
3387242179 Enh: Implemented generic ContentContainerActiveRecord::is() function 2020-09-15 16:47:39 +02:00
Lucas Bartholemy
8c1bed8280 Added another id attribute check 2020-09-15 15:49:38 +02:00
buddh4
19bf1159b6
Merge branch 'master' into fix/undefinedindex 2020-09-14 18:36:08 +02:00
Lucas Bartholemy
c1765aaff6
Merge pull request #4372 from humhub/fix/4371
Fix #4371: Word break issue in notification dropdown
2020-09-14 14:49:48 +02:00
buddh4
ad4197783b Fix #4371: Word break issue in notification dropdown 2020-09-14 14:03:24 +02:00
MasterMindNET
4f4e278b1d Merge branch 'develop' into canLikePremission 2020-09-11 21:47:06 +03:00
MasterMindNET
7eb0213e14 fix: USERGROUP_SELF, USERGROUP_FRIEND, USERGROUP_USER added to default groups 2020-09-11 21:44:55 +03:00
Lucas Bartholemy
5923d8aa3f
Update CHANGELOG.md 2020-09-11 18:21:46 +02:00
Lucas Bartholemy
840582cc11 Fix: Open file modal throws permission denied for unauthenticated users in guest mode 2020-09-11 18:20:23 +02:00
HumHub Translations
0144f0ecee Enh: Updated Translations (translate.humhub.org) 2020-09-11 18:01:02 +02:00
Lucas Bartholemy
923c71474a
Merge pull request #4362 from humhub/fix/missing-nonce
Fixed wrong import
2020-09-11 17:39:50 +02:00
Lucas Bartholemy
1ce894b15a Fixed wrong import 2020-09-11 17:38:44 +02:00
Lucas Bartholemy
1f1c8ae606
Merge pull request #4361 from humhub/fix/missing-nonce
Added missing script nonce
2020-09-11 17:31:14 +02:00
Lucas Bartholemy
243a7e47d0 Fix #4361: Added missing nonce attribute in inline marketplace script 2020-09-11 17:23:54 +02:00
Lucas Bartholemy
1bfad1c764 Added missing script nonce 2020-09-11 17:22:01 +02:00
Lucas Bartholemy
56356f1332 Updated CHANGELOG_DEV.md 2020-09-11 16:09:49 +02:00
Lucas Bartholemy
689e13ae6b
Merge pull request #4321 from MasterMindNET/wallEntryStyleFix
style: added break-all to wall-entry class in case words would be w/o…
2020-09-11 15:53:57 +02:00
Lucas Bartholemy
ae2ba215df
Merge branch 'develop' into wallEntryStyleFix 2020-09-11 15:53:34 +02:00
Lucas Bartholemy
cfe31dbfe5
Merge pull request #4179 from tomofu74/patch-1
May CHARACTER SET be utf8mb4?
2020-09-11 15:51:44 +02:00
Lucas Bartholemy
8b0968467c
Update m141106_185632_log_init.php 2020-09-11 15:50:45 +02:00
Lucas Bartholemy
b9f755229d
Merge pull request #4324 from MasterMindNET/styleFixForLeftMenusWordWrap
text is wraped to a new line if it is long enough in left menus
2020-09-11 15:49:30 +02:00
Lucas Bartholemy
fe500521b0
Merge branch 'develop' into styleFixForLeftMenusWordWrap 2020-09-11 15:48:33 +02:00
Lucas Bartholemy
e2da6a9466
Merge pull request #4330 from humhub/fix/admin-profile-image
Allow users with permission ManageUsers to modify profile images
2020-09-11 14:31:05 +02:00
Lucas Bartholemy
70d9bf03cd Merge branch 'develop' into fix/admin-profile-image 2020-09-11 14:30:07 +02:00
Lucas Bartholemy
9c240b2f0b Merge branch 'develop' of github.com:humhub/humhub into develop 2020-09-11 14:27:56 +02:00
Lucas Bartholemy
22e7526740
Merge pull request #4341 from humhub/feature/improvedCliCommandMap
Simplified console controller map
2020-09-11 14:22:59 +02:00
Lucas Bartholemy
1090fc4805
Merge branch 'develop' into feature/improvedCliCommandMap 2020-09-11 14:22:48 +02:00
Lucas Bartholemy
d624897ebf
Merge pull request #4350 from sahartak2025/fix/4272
Guess timezone for new accounts #4272
2020-09-11 13:38:48 +02:00
Lucas Bartholemy
6518fdd4db
Merge branch 'develop' into fix/4272 2020-09-11 13:38:40 +02:00
Lucas Bartholemy
69e1cd17ca
Merge pull request #4353 from sahartak2025/fix/4230
Auto enable "Hide file info (name, size) for images on wall" option
2020-09-11 13:37:27 +02:00