7093 Commits

Author SHA1 Message Date
buddh4
778ee63488 Merge branch 'feature/nested-comments' of github.com:humhub/humhub into feature/nested-comments 2020-07-15 13:48:40 +02:00
buddh4
d654c536bf Fix: Comment edit triggers sub comment edit
Fix: Preference and loader visibility issue with sub comments
Fix: Comment count increment not working for sub comments
2020-07-15 13:48:24 +02:00
Lucas Bartholemy
2a79925de3
Update Helpers.php 2020-07-15 12:48:11 +02:00
buddh4
c634a180d9 Merge branch 'enh/3995' of github.com:humhub/humhub into enh/3995 2020-07-15 11:18:57 +02:00
buddh4
d0662df89e Moved ProfileStreamAction from stream to actions namespace 2020-07-15 11:18:39 +02:00
Lucas Bartholemy
b5e0330468
Merge pull request #4221 from humhub/feature/marketplace-quote
Enh: Added "Request a quote" option for non-free modules
2020-07-15 11:11:55 +02:00
Lucas Bartholemy
8916fc4096
Merge branch 'develop' into feature/marketplace-quote 2020-07-15 11:11:21 +02:00
Lucas Bartholemy
b1ea5428c5 Rename get module get quote link 2020-07-15 11:09:46 +02:00
buddh4
d8bbe06141
Merge branch 'develop' into enh/3995 2020-07-15 11:09:30 +02:00
buddh4
26581c32c9
Merge branch 'develop' into enh/3995 2020-07-15 11:06:33 +02:00
buddh4
0ed0c2a29e
Merge pull request #4235 from humhub/fix/dataTypeErrorOnAjaxError
Fix: Misleading error message 'Unable to determine dataType from resp…
2020-07-15 11:04:07 +02:00
buddh4
5c17b7dfad Updated CHANGELOG_DEV.md 2020-07-15 11:03:08 +02:00
buddh4
5ea6aaf2e4 Fix: Misleading error message 'Unable to determine dataType from response' logged on ajax error 2020-07-15 11:00:55 +02:00
Lucas Bartholemy
8696de33f6 Merge branch 'master' into develop 2020-07-15 10:57:45 +02:00
Lucas Bartholemy
13d274a6e8
Merge pull request #4152 from humhub/fix/4113
Fix #4036: Profile images are not rotated correctly
2020-07-15 10:55:24 +02:00
Lucas Bartholemy
c10798fa0b
Merge branch 'master' into fix/4113 2020-07-15 10:54:59 +02:00
Lucas Bartholemy
0095695b77
Merge pull request #4212 from humhub/feature/sortorder-form-field
Enh #4191: Added SortOrder Form Input Field
2020-07-15 10:53:58 +02:00
Lucas Bartholemy
69a13347d3
Merge branch 'develop' into feature/sortorder-form-field 2020-07-15 10:53:49 +02:00
Lucas Bartholemy
1b3c47e3da
Merge pull request #4206 from humhub/feature/content-visibility-input
Enh: Added `ContentVisibilitySelect` ActiveField widget for content forms
2020-07-15 10:53:03 +02:00
Lucas Bartholemy
792a480ec7
Merge branch 'develop' into feature/content-visibility-input 2020-07-15 10:52:51 +02:00
Lucas Bartholemy
09e870f5ae
Merge pull request #4234 from humhub/enh/advancedTestEnvConfiguration
Enh: Enhanced custom test environment configuration in env.php
2020-07-15 10:51:51 +02:00
Lucas Bartholemy
b9095db6b0
Merge pull request #4218 from humhub/feature/marketplace-online-links
Enh: Show more information about installed module in marketplace when possible. Instead of limited README.md
2020-07-15 10:51:21 +02:00
Lucas Bartholemy
c027cb8886
Merge branch 'develop' into feature/marketplace-online-links 2020-07-15 10:51:12 +02:00
Lucas Bartholemy
e9c3f600d0
Merge pull request #4219 from humhub/feature/3923
Enh #3923: Add ability to disable profile stream
2020-07-15 10:50:14 +02:00
Lucas Bartholemy
338dddde6d
Merge branch 'develop' into feature/3923 2020-07-15 10:50:02 +02:00
Lucas Bartholemy
5f1b01eb79
Merge branch 'develop' into enh/advancedTestEnvConfiguration 2020-07-14 20:40:27 +02:00
buddh4
0c5aefb2b5 Changed CHANGELOG_DEV.md 2020-07-14 20:01:41 +02:00
buddh4
c7608c2d0a Enh: Enhanced custom test environment configuration in @protected/humhub/tests/config/env/env.php file 2020-07-14 19:50:09 +02:00
Lucas Bartholemy
09785bedcd
Merge pull request #4233 from humhub/fix/nullNonceValue
Fix: Security:setNonce() does not remove nonce session value if nonce is null
2020-07-14 19:42:50 +02:00
buddh4
058f39ef8b
Merge branch 'develop' into fix/nullNonceValue 2020-07-14 19:32:25 +02:00
buddh4
e92673668a Updated CHANGELOG_DEV.md 2020-07-14 19:31:41 +02:00
buddh4
917cc2713e Fix: humhub\modules\web\security\helpers\Security:setNonce() does not remove nonce session value if nonce is null 2020-07-14 19:30:01 +02:00
Lucas Bartholemy
24cd1a32ff
Merge pull request #4232 from humhub/fix/cspCreatesSessionOnMetadatarequest
Fix: Metadata request creates new session if CSP nonce is enabled
2020-07-14 19:28:03 +02:00
buddh4
8600c1c094 Explicitly block ManifestController in generateCSPRequestCheck() 2020-07-14 19:23:24 +02:00
buddh4
103460b494 Renamed generateCSP() to generateCSPRequestCheck() 2020-07-14 19:20:15 +02:00
buddh4
e48cf6c45a Updated CHANGELOG_DEV.md 2020-07-14 19:18:04 +02:00
buddh4
4af12a7ab8 Fix: Metadata request creates new session if CSP nonce is enabled 2020-07-14 19:09:53 +02:00
buddh4
ed76d7de9c
Merge pull request #4231 from humhub/fix/4227
Fix #4227: Removed redundant code from `humhub.ui.widget.js`
2020-07-14 18:52:26 +02:00
buddh4
d59205fe54 Fix #4227: Removed redundant code from humhub.ui.widget.js 2020-07-14 18:50:06 +02:00
Lucas Bartholemy
2bee64ea80
Merge pull request #4228 from humhub/enh/removeInitContent
Chg: Removed unnecessary ContentActiveRecord:initContent
2020-07-14 18:37:10 +02:00
Lucas Bartholemy
0d3edb9c9c
Merge branch 'develop' into enh/removeInitContent 2020-07-14 18:36:57 +02:00
buddh4
f8fb902754
Merge pull request #4229 from humhub/fix/canAccessPrivateContentGuestError
Fix: `Space::canAccessPrivateContent()` may throws error for guest user
2020-07-14 18:13:17 +02:00
buddh4
9137fe4f40 Updated CHANGELOG_DEV.md 2020-07-14 18:12:35 +02:00
buddh4
a0fdbfe027 Fix: Space::canAccessPrivateContent() throws error for guest user if globalAdminCanAccessPrivateContent setting is true 2020-07-14 18:11:04 +02:00
buddh4
5107e0b77a Updated CHANGELOG_DEV.md 2020-07-14 18:01:42 +02:00
buddh4
fd59272441 Chg: Removed unnecessary ContentActiveRecord:initContent 2020-07-14 17:55:48 +02:00
buddh4
951a7b5426 Aligned PinnedContentStreamFilter docs 2020-07-14 17:39:49 +02:00
buddh4
00b3e4c888 Enh: Optimized PinnedContentStreamFilter of ContentContainerStreamQuery 2020-07-14 17:08:03 +02:00
Lucas Bartholemy
97f99e9adf Email address hidden by default 2020-07-14 14:56:03 +02:00
Lucas Bartholemy
1d9007b5e5
Update Module.php 2020-07-14 08:34:48 +02:00