mirror_php/humhub
1
0
Fork 0
mirror of https://github.com/humhub/humhub.git synced 2025-01-18 06:38:14 +01:00
Code Issues Projects Releases Wiki Activity
5,024 Commits 102 Branches 157 Tags
Commit Graph

4404 Commits

Author SHA1 Message Date
Daniel Kesselberg
2ca60b6047
🎨 Replace "else if" with "elseif" (#3195) 
* 🎨 Replace "else if" with "elseif"

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>

* 🎨 Fix indention
 2018-07-04 18:12:26 +02:00
buddh4
a5a24b2ee6 Merge branch 'master' of https://github.com/humhub/humhub 2018-07-04 17:37:36 +02:00
buddh4
26386ad709 Added deprecation section to 1.3 dev migration guide 2018-07-04 17:37:20 +02:00
Lucas Bartholemy
831e9960d8 Fixed migration link 2018-07-04 17:25:16 +02:00
Lucas Bartholemy
28b5aaac6b Merge branch 'master' of github.com:humhub/humhub 2018-07-04 16:54:34 +02:00
Lucas Bartholemy
b69cd998b8 Fixed theme loading during the installation 2018-07-04 16:54:20 +02:00
buddh4
7643b04878 Fixed #3156 members and space list modal does not close after item click 2018-07-04 16:11:39 +02:00
buddh4
e5afb19ccf Merge branch 'master' of https://github.com/humhub/humhub 2018-07-04 15:52:16 +02:00
buddh4
ef288a2f2c Fixed PHP Warning non-compound name 'Yii' has no effect in memberAdded.php 2018-07-04 15:52:00 +02:00
Lucas Bartholemy
0b7e34e97b Update doc update 2018-07-04 15:14:06 +02:00
Lucas Bartholemy
dd11d106cd Prepare 1.3.0-beta.1 release 2018-07-04 15:13:03 +02:00
buddh4
27fef3c825 Fixed module test space module activation not working 2018-07-04 13:42:01 +02:00
buddh4
12603d83f0 Fixed spanish translation 2018-07-04 12:48:46 +02:00
HumHub Translations
58f718d56d Enh: Updated Translations (translate.humhub.org) 2018-07-04 11:11:48 +02:00
buddh4
3c3fef6791 Assure backend richtext encoding 2018-07-04 04:04:18 +02:00
Lucas Bartholemy
9c195ef484 Removed test output 2018-07-03 23:52:48 +02:00
Lucas Bartholemy
2c45543037 Merge branch 'master' of github.com:humhub/humhub 2018-07-03 16:39:33 +02:00
Lucas Bartholemy
393b89ba87 Fixed migration path lookup 2018-07-03 16:39:20 +02:00
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 2018-07-03 13:07:48 +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
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
76b0c44c79 Fix invalid RichTextField case used in post edit.php 2018-07-02 17:14:44 +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
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