7401 Commits

Author SHA1 Message Date
buddh4
ff87329b47 Fixed TimeAgoWidgetTest.php 2020-10-13 13:54:25 +02:00
buddh4
da20fbbcb9 Merge branch 'enh/timeagoRework' of github.com:humhub/humhub into enh/timeagoRework 2020-10-12 18:50:43 +02:00
buddh4
3f5721d89c Updated php docs in TimeAgo 2020-10-12 18:50:10 +02:00
buddh4
e2293c58e5
Merge branch 'develop' into enh/timeagoRework 2020-10-12 18:49:00 +02:00
buddh4
d5776dfd5d Updated CHANGELOG_DEV.md# 2020-10-12 18:48:17 +02:00
buddh4
9bbf13f837 Enh #4407: Reworked TimeAgo widget 2020-10-12 18:46:21 +02:00
Lucas Bartholemy
d78404cc43
Merge pull request #4467 from humhub/enh/injectStreamEntries
Enh: Inject stream entries by event
2020-10-12 17:55:02 +02:00
Lucas Bartholemy
65ee911f37
Merge branch 'develop' into enh/injectStreamEntries 2020-10-12 17:54:52 +02:00
Lucas Bartholemy
136d5bf596
Merge pull request #4473 from humhub/fix/catchModuleConfigLoadError
Fix: Catch all Throwables when loading module config
2020-10-12 17:25:30 +02:00
Lucas Bartholemy
565946f0da
Merge branch 'develop' into fix/catchModuleConfigLoadError 2020-10-12 17:25:09 +02:00
Lucas Bartholemy
f3c8d2d24d
Merge pull request #4474 from humhub/fix/removeLoaderFromEventTarget
Fix: Loader not removed from event trigger
2020-10-12 17:21:58 +02:00
buddh4
56f18e1ebd Updated CHANGELOG_DEV.md 2020-10-12 16:42:54 +02:00
buddh4
e8dd91cf94 Fix: Loader not removed from event trigger 2020-10-12 16:40:37 +02:00
buddh4
1a6a13e308 Updated CHANGELOG_DEV.md 2020-10-12 16:37:29 +02:00
buddh4
349d931252 Fix: Catch all Throwables when loading module config 2020-10-12 16:34:12 +02:00
buddh4
5b218e84aa
Merge branch 'develop' into enh/injectStreamEntries 2020-10-12 16:27:13 +02:00
buddh4
eeec4d8f34 Updated CHANGELOG_DEV.md 2020-10-12 16:26:39 +02:00
buddh4
b98ec73986 Simplified injected stream logic. 2020-10-12 16:16:11 +02:00
Lucas Bartholemy
4793578308
Merge pull request #4442 from humhub/feature/spaceAboutPage
Feature/space about page
2020-10-12 16:15:37 +02:00
Lucas Bartholemy
b0e0325992
Merge pull request #4469 from humhub/enh/file-module
File module converter improvements
2020-10-12 16:14:37 +02:00
Lucas Bartholemy
06da2d4945
Merge branch 'develop' into enh/file-module 2020-10-12 16:03:39 +02:00
Lucas Bartholemy
77ff1e7b85 Merge branch 'enh/file-module' of github.com:humhub/humhub into enh/file-module 2020-10-12 16:00:20 +02:00
Lucas Bartholemy
50ecc62332 Batch processing file records 2020-10-12 15:53:11 +02:00
Lucas Bartholemy
67ec4a427d
Merge branch 'develop' into feature/spaceAboutPage 2020-10-12 15:13:56 +02:00
Lucas Bartholemy
0da1b0c8a9
Update Module.php 2020-10-12 15:11:41 +02:00
buddh4
6df2daf2d1 - Added flag for injected stream entries in StreamEntryOptions
- Make viewContext configurable by request parameter
2020-10-12 15:05:19 +02:00
Lucas Bartholemy
40e0e143df
Merge pull request #4470 from humhub/enh/3889
Prevent resized site icons by manually uploaded files
2020-10-12 14:57:09 +02:00
Lucas Bartholemy
701e11731b
Merge branch 'develop' into enh/3889 2020-10-12 14:56:51 +02:00
Lucas Bartholemy
2d4888862e
Update CHANGELOG_DEV.md 2020-10-12 14:56:27 +02:00
Lucas Bartholemy
4410c47480
Merge pull request #4471 from humhub/enh/4458
Remove cacert.pem to avoid curl error on CentOS
2020-10-12 14:53:40 +02:00
Lucas Bartholemy
eafb06e8e5 Merge branch 'enh/file-module' of github.com:humhub/humhub into enh/file-module 2020-10-12 14:47:57 +02:00
Lucas Bartholemy
54ae3f05cf Enh #3978 Image scale/resize options; Added FileController for console 2020-10-12 14:47:28 +02:00
Lucas Bartholemy
2af59fa766 Updated changelog 2020-10-12 14:47:23 +02:00
Lucas Bartholemy
26c54c5f28 Added file converter id;Added text converter max. length 2020-10-12 14:44:55 +02:00
Lucas Bartholemy
2a12ab9c98 Enh #3978 Image scale/resize options; Added FileController for console 2020-10-12 14:44:23 +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
887a30c62e Updated changelog 2020-10-11 18:38:31 +02:00
Lucas Bartholemy
67efa4324e Added file converter id;Added text converter max. length 2020-10-11 18:32:07 +02:00
Lucas Bartholemy
ca96f997d0
Update CHANGELOG_DEV.md 2020-10-11 09:46:43 +02: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
buddh4
4c04c82e13 Minor refactoring of Stream action class. 2020-10-10 16:06:59 +02:00
Lucas Bartholemy
ce0ab1ed29
Merge pull request #4460 from humhub/fix/4456
Fixed #4456 PHP8 deprecated warning for LessHelper::updateVariables()
2020-10-10 15:42:18 +02:00
Lucas Bartholemy
a627d7ccd2
Merge branch 'develop' into fix/4456 2020-10-10 15:42:02 +02:00
Lucas Bartholemy
9815f0706d
Update CHANGELOG_DEV.md 2020-10-10 15:41:33 +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