mirror_php/humhub
1
0
Fork 0
mirror of https://github.com/humhub/humhub.git synced 2025-02-23 18:56:00 +01:00
Code Issues Projects Releases Wiki Activity
5,044 Commits 117 Branches 157 Tags
Commit Graph

5044 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
buddh4
c422756a87 Merge branch 'master' of https://github.com/humhub/humhub 2018-07-05 12:25:18 +02:00
buddh4
de9f253cdf Fixed: Stream wall scroll event not detached on pjax call 2018-07-05 12:25:00 +02:00
Daniel Kesselberg
f62bb20fc0
Merge pull request #3199 from danielkesselberg/master 
Replace array with []
 2018-07-05 11:52:32 +02:00
Daniel Kesselberg
82544e4c0c 🔧 Add configuration for php-cs-fixer [skip-ci] 2018-07-05 11:50:20 +02:00
Daniel Kesselberg
21aa8ee59f 🎨 Short-Array 2018-07-05 11:48:19 +02:00
Daniel Kesselberg
171a22f69c 🎨 Short-Array 2018-07-05 11:47:53 +02:00
Daniel Kesselberg
edcfb5acd2 🎨 Short-Array 2018-07-05 11:35:18 +02:00
Daniel Kesselberg
d51300303c 🎨 Short-Array 2018-07-05 11:34:18 +02:00
Daniel Kesselberg
e4750829e5
Merge pull request #3198 from danielkesselberg/master 
CodeClimate does not pickup phpcs.xml.dist
 2018-07-05 11:22:24 +02:00
Daniel Kesselberg
a0808f4b63 🔧 Update codeclimate.yml to latest standard 2018-07-05 11:14:44 +02:00
Daniel Kesselberg
a221243254 🔧 CodeClimate does not pickup phpcs.xml.dist 2018-07-05 11:09:30 +02:00
Lucas Bartholemy
bea8d5a785
Merge pull request #3197 from danielkesselberg/master 
Code Style #2
 2018-07-05 10:38:20 +02:00
Daniel Kesselberg
ca7f720968 🎨 The closing brace for the class must go on the next line after the body 2018-07-04 22:50:34 +02:00
Daniel Kesselberg
ceed66350f 🎨 The closing brace for the class must go on the next line after the body 2018-07-04 22:46:56 +02:00
Daniel Kesselberg
3db20459fd
Merge pull request #3196 from danielkesselberg/master 
Code Style
 2018-07-04 22:14:29 +02:00
Daniel Kesselberg
cb18f55240 🎨 TRUE, FALSE and NULL must be lowercase 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2018-07-04 21:17:52 +02:00
Daniel Kesselberg
b75a4f3db5 🎨 Expected 1 blank line at end of file 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2018-07-04 21:09:30 +02:00
Daniel Kesselberg
f4b83e5600 Merge remote-tracking branch 'upstream/master' 2018-07-04 21:05:01 +02:00
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
Daniel Kesselberg
0e2060dd15 🎨 Fix indention 2018-07-04 18:08:10 +02:00
Daniel Kesselberg
ea2c5de468 🎨 Replace "else if" with "elseif" 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2018-07-04 17:53:01 +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 v1.3.0-beta.1 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 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