6296 Commits

Author SHA1 Message Date
Lucas Bartholemy
701e11731b
Merge branch 'develop' into enh/3889 2020-10-12 14:56:51 +02:00
yurabakhtin
ed50912173 Remove cacert.pem 2020-10-12 11:29:47 +03:00
yurabakhtin
b14decd2d8 Prevent resized site icons by manually uploaded files 2020-10-12 09:25:54 +03:00
Lucas Bartholemy
29c73f3a16
Merge pull request #4195 from olekristensen/olekristensen-patch-highres-logo
Double the logo size for high res displays
2020-10-11 09:45:19 +02:00
Lucas Bartholemy
9c455b7866
Update LogoImage.php 2020-10-11 09:44:24 +02:00
Lucas Bartholemy
a627d7ccd2
Merge branch 'develop' into fix/4456 2020-10-10 15:42:02 +02:00
Lucas Bartholemy
98933e0c15
Merge pull request #4462 from humhub/fix/4461
Fix #4451: PHP Deprecated Warning in ProsemirrorRichText::replaceLink…
2020-10-10 15:40:51 +02:00
Lucas Bartholemy
e4feffdf86
Merge pull request #4463 from humhub/fix/deprSafeMode
Fix: removed deprecated safe_mode ini check in UrlOembedHttpClient
2020-10-10 15:40:12 +02:00
Lucas Bartholemy
e768eb615c
Merge pull request #4464 from humhub/fix/deprCreateFunction
Fixed usage of deprecated create_function in unit tests
2020-10-10 15:39:13 +02:00
Lucas Bartholemy
cdb16fc8b8
Merge pull request #4466 from humhub/enh/deprCleanup
Removed unused files + minor php compatibility fixes
2020-10-10 15:38:27 +02:00
Lucas Bartholemy
5db0b8d27f Merge branch 'develop' of github.com:humhub/humhub into develop 2020-10-09 17:53:49 +02:00
Lucas Bartholemy
172fd0fd0f Merge branch 'master' into develop 2020-10-09 17:53:43 +02:00
buddh4
a0c4fbfcf6 Removed unused files + minor php compatibility fixes 2020-10-09 17:49:03 +02:00
buddh4
288ac2f194 Fixed usage of deprecated create_function in unit tests 2020-10-09 17:26:21 +02:00
buddh4
337c0f0d8c Fix: removed deprecated safe_mode ini check in UrlOembedHttpClient 2020-10-09 17:10:44 +02:00
Lucas Bartholemy
4e1ef6b060 Prepare 1.6.4 release 2020-10-09 17:09:23 +02:00
buddh4
7240f6f080 Fix #4451: PHP Deprecated Warning in ProsemirrorRichText::replaceLinkExtension 2020-10-09 16:25:57 +02:00
buddh4
50d4c567cd Fixed #4456 PHP8 deprecated warning for LessHelper::updateVariables() 2020-10-09 16:05:52 +02:00
Lucas Bartholemy
6cbfddc722
Merge branch 'develop' into enh/addUserFollowsToLive 2020-10-08 20:57:24 +02:00
buddh4
2ad535a1bf
Merge pull request #4452 from humhub/fix/getActiveFilterCountWithExcludeArray
Fix/get active filter count with exclude array
2020-10-08 15:16:53 +02:00
buddh4
d282125224 Fix: Ignore scope filter in filter count and hasActiveFilters 2020-10-08 15:12:15 +02:00
buddh4
93268cec48 Fix: humhub.ui.filter.getActiveFilterCount with exclude array option 2020-10-08 15:10:42 +02:00
Faeze Moradi
0175ee36ed use cached argument in live 2020-10-08 11:32:43 +02:00
Faeze Moradi
34fa8c7f2d Add UserFollows to live 2020-10-08 11:29:17 +02:00
Lucas Bartholemy
20ed8cbaee
Merge pull request #4447 from humhub/fix/20
Return bool result on add user into group
2020-10-07 16:56:09 +02:00
yurabakhtin
4053d989c3 Return bool result on add user into group 2020-10-07 16:03:08 +03:00
Lucas Bartholemy
8bc3e1db28
Merge pull request #4446 from humhub/fix/4428
Replace db Expression time now with func date()
2020-10-07 14:11:31 +02:00
yurabakhtin
364e5c2299 Replace db Expression time now with func date() 2020-10-07 14:53:40 +03:00
buddh4
d8a3a2d36e Fix #4440: WallEntry Compatibility issue in WallEntryControls 2020-10-07 12:46:26 +02:00
Lucas Bartholemy
bd5d92ee27
Merge branch 'develop' into ref_4283 2020-10-07 11:26:45 +02:00
Master_Hans
b68bbbe10d #4283 corrected "Missing return statement" 2020-10-07 11:41:40 +03:00
yurabakhtin
522700124b Replace db Expression time now with func date() 2020-10-07 10:26:17 +03:00
yurabakhtin
7226932c86 Remove unnecessary title quoting for space icons in widget “Member in these spaces” 2020-10-06 17:58:16 +03:00
Lucas Bartholemy
2926df9e17
Merge pull request #4437 from humhub/enh/4401
#4401 Variables in the theme variables.less file cannot have an other variable as value
2020-10-06 15:42:57 +02:00
Marc Farré
2a04b46a75
Update ContentAddonActiveRecord.php 2020-10-06 15:37:59 +02:00
yurabakhtin
813ce5b506 Unit test for LessHelper to parse linked less variables 2020-10-06 14:07:07 +03:00
yurabakhtin
54b37ee66a Allow to use less variable name in value of another less variable 2020-10-06 11:17:37 +03:00
Lucas Bartholemy
d0dafeb764
Merge branch 'develop' into enh/wallStreamEntryWidgetlayouts 2020-10-05 18:12:22 +02:00
Lucas Bartholemy
efe709ace3
Update BaseType.php 2020-10-05 11:25:02 +02:00
sahartak2025
dc919e6f82 Bug in models/filetype/CheckboxList.php #3566 2020-10-05 11:27:42 +04:00
Lucas Bartholemy
598bc2d0b0
Update notificationOverviewList.php 2020-10-04 18:47:46 +02:00
buddh4
aa977dcc0d Updated CHANGELOG.md 2020-10-02 18:05:36 +02:00
buddh4
156f3758b2 Fix #4430: Invalid notifications breaks notification overview 2020-10-02 18:04:29 +02:00
Lucas Bartholemy
e9931649bb Merge branch 'develop' of github.com:humhub/humhub into develop 2020-10-02 15:57:08 +02:00
Lucas Bartholemy
699d970926 Merge branch 'master' into develop 2020-10-02 15:56:56 +02:00
Lucas Bartholemy
3f5b7294ce
Update CHANGELOG.md 2020-10-02 15:42:50 +02:00
Lucas Bartholemy
85510be593
Merge branch 'master' into fix/undefinedindex 2020-10-02 15:42:18 +02:00
Lucas Bartholemy
2604756276
Merge branch 'master' into fix/guest-action 2020-10-02 15:40:51 +02:00
Lucas Bartholemy
c9630a67b2
Merge pull request #4379 from humhub/enh/liveModuleTest
Enh: Added test layout and fixtures for live module.
2020-10-02 15:40:19 +02:00
buddh4
fd61bfc15e
Merge branch 'develop' into enh/wallStreamEntryWidgetlayouts 2020-10-02 15:30:08 +02:00