7300 Commits

Author SHA1 Message Date
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
9cca88607e
Merge pull request #4444 from humhub/fix/4440
Fix #4440: WallEntry Compatibility issue in WallEntryControls
2020-10-07 12:49:50 +02:00
buddh4
d8a3a2d36e Fix #4440: WallEntry Compatibility issue in WallEntryControls 2020-10-07 12:46:26 +02:00
Lucas Bartholemy
4340389a51
Merge pull request #4429 from humhub/ref_4283
New User Profile Virtual Field Types (Member Since, Last Login) - Ref 4283
2020-10-07 11:28:37 +02:00
Lucas Bartholemy
bd5d92ee27
Merge branch 'develop' into ref_4283 2020-10-07 11:26:45 +02:00
Lucas Bartholemy
72b9a6b79f
Merge pull request #4443 from humhub/fix/4428
Replace db Expression time now with func date()
2020-10-07 10:46:56 +02:00
Master_Hans
b68bbbe10d #4283 corrected "Missing return statement" 2020-10-07 11:41:40 +03:00
yurabakhtin
a1f5ecb07a
Update CHANGELOG_DEV.md 2020-10-07 10:34:03 +03:00
yurabakhtin
522700124b Replace db Expression time now with func date() 2020-10-07 10:26:17 +03:00
Master_Hans
7720eeb838 #4283 add changes to the CHANGELOG_DEV.md 2020-10-07 09:06:45 +03:00
Master_Hans
d91530ff1f remove CHANGELOG_DEV.md 2020-10-07 09:04:30 +03:00
Master_Hans
b8814d2dc4 Merge branch 'ref_4283' of github.com:humhub/humhub into ref_4283 2020-10-07 08:45:28 +03:00
Lucas Bartholemy
1683d0f531
Merge pull request #4439 from humhub/fix/4434
Fix title quoting for space icons in widget “Member in these spaces”
2020-10-06 18:02:08 +02:00
yurabakhtin
830c27a47b
Update CHANGELOG_DEV.md 2020-10-06 18:21:40 +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
Lucas Bartholemy
e86a9d95af
Merge pull request #4438 from funkycram/patch-9
Update ContentAddonActiveRecord.php
2020-10-06 15:42:22 +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
b9033afe0d
Update CHANGELOG_DEV.md 2020-10-06 12:00:56 +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
f80667ad66
Merge pull request #4397 from humhub/enh/wallStreamEntryWidgetlayouts
Enh/wall stream entry widgetlayouts
2020-10-05 18:12:55 +02:00
Lucas Bartholemy
d0dafeb764
Merge branch 'develop' into enh/wallStreamEntryWidgetlayouts 2020-10-05 18:12:22 +02:00
Master_Hans
9b9e7dbe94 #4283: changed CHANGLOG_DEV.md 2020-10-05 15:24:27 +03:00
Lucas Bartholemy
ff4a504b2e
Merge pull request #4433 from sahartak2025/fix/3566
Bug in models/filetype/CheckboxList.php #3566
2020-10-05 11:40:28 +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
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
2515488e42
Merge pull request #4355 from humhub/fix/undefinedindex
Fixed error when authclient is not providing an id
2020-10-02 15:43:17 +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
d9f67aa7d4
Merge pull request #4363 from humhub/fix/guest-action
Fix: Open file modal throws permission denied for unauthenticated use…
2020-10-02 15:41:29 +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
buddh4
c3f1adcdd4 Merge branch 'enh/wallStreamEntryWidgetlayouts' of github.com:humhub/humhub into enh/wallStreamEntryWidgetlayouts 2020-10-02 15:23:56 +02:00
buddh4
d39c81f488 Prevent dropdown divider to be rendered if no further menu entries are following. 2020-10-02 15:23:45 +02:00
buddh4
676d723c39 Added additional inline docs 2020-10-02 15:22:58 +02:00
Lucas Bartholemy
b245a3cba4
Added phpdoc 2020-10-02 14:49:46 +02:00
Lucas Bartholemy
17d953a0ae Merge branch 'master' of github.com:humhub/humhub into master 2020-10-02 14:34:34 +02:00
Lucas Bartholemy
ac034abe7f Updated CHANGELOG.md 2020-10-02 14:32:42 +02:00
sahartak2025
169a130214 change "Guide: User profile" Url 2020-10-02 14:29:57 +02:00
Lucas Bartholemy
e09e96c3ce
Merge pull request #4398 from sahartak2025/fix/4385
Tour broken when profile start page is changed #4385
2020-10-02 14:27:31 +02:00
buddh4
14ff4efd2c Changed visibility text of private global content in VisibilityIcon 2020-10-02 14:07:18 +02:00
sahartak2025
fbc4c96fcb Merge branch 'develop' into fix/4385
# Conflicts:
#	CHANGELOG_DEV.md
2020-10-02 15:38:10 +04:00
Master_Hans
50c9288a42 #4283 Added UserLastLogin.php class for virtual field. Init UserLastLogin in BaseType.php class 2020-10-02 14:18:23 +03:00
buddh4
e79c1af074 Allow direct deletion of archived content. 2020-10-02 12:31:16 +02:00
buddh4
fcecb165d6 Prevent default controls menu items if content was archived. 2020-10-02 12:21:37 +02:00