buddh4
|
ab81ed8ca2
|
Reactivated AccountCest
|
2018-07-03 15:28:45 +02:00 |
|
Lucas Bartholemy
|
1ee06c88eb
|
Merge branch 'master' into v1.3-dev
# Conflicts:
# protected/humhub/config/common.php
|
2018-07-03 14:32:38 +02:00 |
|
buddh4
|
703c25763a
|
Production asset build
|
2018-07-03 14:15:53 +02:00 |
|
buddh4
|
2c4faf7df0
|
Merge branch 'v1.3-dev' of https://github.com/humhub/humhub into v1.3-dev
|
2018-07-03 14:12:34 +02:00 |
|
buddh4
|
c96dc2f0e1
|
- Change humhub.ui.picker encode handling
|
2018-07-03 14:12:17 +02:00 |
|
buddh4
|
3957a13305
|
Travis debugging
|
2018-07-03 13:43:04 +02:00 |
|
Lucas Bartholemy
|
550357481b
|
Merge branch 'master' of github.com:humhub/humhub
v1.2.8
|
2018-07-03 13:07:48 +02:00 |
|
buddh4
|
2737446698
|
Added php 7.2 to travis.yml
|
2018-07-03 13:07:14 +02:00 |
|
buddh4
|
b5046011fb
|
Travis test debugging
|
2018-07-03 13:06:42 +02:00 |
|
Lucas Bartholemy
|
98f0855f9c
|
Merge branch 'master' into v1.3-dev
# Conflicts:
# protected/humhub/modules/space/Events.php
# protected/humhub/modules/user/Events.php
# protected/humhub/modules/user/messages/ja/views_auth_login.php
|
2018-07-03 12:44:42 +02:00 |
|
buddh4
|
b38dd50c06
|
- Enh: Added humhub\widgets\BootstrapComponent::encode and default label encoding.
|
2018-07-03 12:28:45 +02:00 |
|
Lucas Bartholemy
|
7af2c03c46
|
Merge branch 'master' of github.com:humhub/humhub
|
2018-07-03 12:08:06 +02:00 |
|
Lucas Bartholemy
|
98501157d4
|
Prepare 1.2.8 release
|
2018-07-03 12:07:50 +02:00 |
|
HumHub Translations
|
93b3195b2a
|
Enh: Updated Translations (translate.humhub.org)
|
2018-07-03 11:57:21 +02:00 |
|
Lucas Bartholemy
|
5a185059b4
|
Updated composer dependencies
|
2018-07-03 11:46:27 +02:00 |
|
Lucas Bartholemy
|
decb5f5e6f
|
Fixed missing import
|
2018-07-03 00:12:51 +02:00 |
|
buddh4
|
1187ae29b4
|
Build production assets
|
2018-07-02 17:37:51 +02:00 |
|
buddh4
|
9c4e8f3671
|
Travis debug output
|
2018-07-02 17:35:00 +02:00 |
|
buddh4
|
76b0c44c79
|
Fix invalid RichTextField case used in post edit.php
|
2018-07-02 17:14:44 +02:00 |
|
buddh4
|
fb43ec4fe8
|
Added travis log output
|
2018-07-02 16:14:18 +02:00 |
|
buddh4
|
cb4cd106b6
|
- Enh: Added humhub\modules\content\widgets\richtext\AbstractRichText::record for beeing able to set related record
- Fix: Added missing `humhub\modules\content\widgets\richtext\AbstractRichText::EVENT_BEFORE_OUTPUT`
|
2018-07-02 16:07:20 +02:00 |
|
buddh4
|
fdc87e0c91
|
Added travis debug upload
|
2018-07-02 14:39:12 +02:00 |
|
Lucas Bartholemy
|
36014e0412
|
Footer position in profile layout
|
2018-07-02 13:57:47 +02:00 |
|
Lucas Bartholemy
|
0e70e03c9b
|
Fixed profile footer nav
|
2018-07-02 13:52:09 +02:00 |
|
Lucas Bartholemy
|
57faa2f606
|
Merge branch 'v1.3-dev' of github.com:humhub/humhub into v1.3-dev
|
2018-07-02 13:47:10 +02:00 |
|
Lucas Bartholemy
|
ff4547c903
|
Fixed open space link
|
2018-07-02 13:46:54 +02:00 |
|
buddh4
|
7255bfa919
|
Merge branch 'v1.3-dev' of https://github.com/humhub/humhub into v1.3-dev
|
2018-07-02 13:45:33 +02:00 |
|
buddh4
|
6d16fcc7fa
|
- Added ActivityStream compatibility for older themes e.g. enterprise
|
2018-07-02 13:45:01 +02:00 |
|
Lucas Bartholemy
|
9c70268134
|
Merge branch 'v1.3-dev' of github.com:humhub/humhub into v1.3-dev
|
2018-07-02 13:30:31 +02:00 |
|
Lucas Bartholemy
|
2af6ca11d0
|
New cronjob handling
|
2018-07-02 13:30:17 +02:00 |
|
buddh4
|
5b7b459438
|
StreamCest acceptance test alignments
|
2018-07-02 13:29:06 +02:00 |
|
Lucas Bartholemy
|
6902909730
|
Fix #3176: Integrity checker removes modules default state
|
2018-07-02 13:20:28 +02:00 |
|
buddh4
|
117d727ab0
|
- Enh: Added error alert to moveModal in case content type is not movable.
|
2018-07-02 13:20:09 +02:00 |
|
buddh4
|
09ec260792
|
Added travis error output for debugging
|
2018-07-02 12:50:45 +02:00 |
|
buddh4
|
dcbacff6d6
|
Updated chrome driver version in travis config
|
2018-07-02 12:35:38 +02:00 |
|
buddh4
|
1a6f067a91
|
Production asset build
|
2018-07-02 12:10:06 +02:00 |
|
buddh4
|
dbc90d2c75
|
Fix: direct topicId filter not working in wallstream.
|
2018-07-02 12:06:45 +02:00 |
|
Lucas Bartholemy
|
359b85fdc9
|
Merge branch 'master' into v1.3-dev
# Conflicts:
# protected/humhub/components/Theme.php
# protected/humhub/modules/admin/models/forms/DesignSettingsForm.php
# protected/humhub/modules/content/resources/js/humhub.content.js
# protected/humhub/modules/space/modules/manage/views/member/pending-invitations.php
# protected/humhub/modules/stream/resources/js/humhub.stream.js
# static/js/humhub/humhub.ui.richtext.js
|
2018-07-02 11:12:55 +02:00 |
|
buddh4
|
ef5e0fdad9
|
Merge pull request #3178 from haykhakobyan94/add-activities-when-space-is-achieved-or-unachieved
Add activities when space is achieved or unachieved
|
2018-07-02 10:53:20 +02:00 |
|
buddh4
|
540e3013d7
|
- Moved Move logic to humhub\modules\content\controllers\MoveController.php
- Enh: Added disable behaviour for non movable target spaces
- Fix: Invalid message source error in space permissions
|
2018-07-01 15:46:44 +02:00 |
|
buddh4
|
ffc1fb9011
|
- Enh: Added Pin/Archived/Public wallentry icons
- Enh: Smaller stream style fixes
- Enh: Added movable behavior to content type post
- Fix: Invalid use of global permission for new force invite
|
2018-07-01 14:51:28 +02:00 |
|
buddh4
|
1097859d1e
|
Merge pull request #3159 from danielkesselberg/adjust-phpcs
Update configuration for phpcs
|
2018-07-01 14:41:06 +02:00 |
|
buddh4
|
5d9fbb1c43
|
Merge pull request #3189 from githubjeka/v1.3-dev-members-manager
1.3 Added MembersManagePermission to Space Module
|
2018-07-01 13:13:25 +02:00 |
|
buddh4
|
acaaa514d3
|
- Fixed hide topic picker after post submit
- Force strip_tags for contenttags
|
2018-07-01 12:21:46 +02:00 |
|
buddh4
|
b7971e94c9
|
Fixed picker value comparison check
|
2018-07-01 11:14:41 +02:00 |
|
buddh4
|
bb24d8e93d
|
- Added Topic Picker to post form
- Fix double topic selection
|
2018-07-01 09:17:59 +02:00 |
|
buddh4
|
104ce26391
|
- Added MoveContent controller logic
- Enabled MoveContent for content type Post
- Fixed: Wrong page title displayed
|
2018-07-01 02:38:46 +02:00 |
|
buddh4
|
f7ed7021bf
|
Updated npm packages
|
2018-07-01 02:32:20 +02:00 |
|
buddh4
|
b1e1143025
|
Merge branch 'v1.3-dev' of https://github.com/humhub/humhub into v1.3-dev
# Conflicts:
# protected/humhub/modules/content/components/ContentActiveRecord.php
# protected/humhub/modules/content/widgets/WallEntryControlLink.php
|
2018-06-30 22:22:54 +02:00 |
|
buddh4
|
151b24ccfc
|
Added Movable ContentActiveRecord
|
2018-06-30 22:04:42 +02:00 |
|