mirror_php/humhub
1
0
Fork 0
mirror of https://github.com/humhub/humhub.git synced 2025-02-25 03:34:10 +01:00
Code Issues Projects Releases Wiki Activity
4,529 Commits 118 Branches 157 Tags
Commit Graph

4529 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lucas Bartholemy
104743c73d
Merge pull request #3038 from githubjeka/v1.3-dev-fix-unit-tests 
Fix unit tests
 2018-02-21 10:36:10 +01:00
Lucas Bartholemy
2fd5236740
Merge pull request #3032 from humhub/master 
Update 1.3 with latest changes from 1.2.*
 2018-02-21 10:28:10 +01:00
githubjeka
0e12a2f6dd fix unit tests 
revert some code from commit 130c4aa6de88daa42189f7cafec6669baaaa4bbd
 2018-02-20 14:16:19 +03:00
Daniel Kesselberg
5930532e9f
Merge pull request #3031 from danielkesselberg/master 
Rename MIME_* into ICON_* to make purpose more clear
 2018-02-19 14:31:17 +01:00
Daniel Kesselberg
e155dc617e Rename MIME_* into ICON_* to make purpose more clear 2018-02-18 22:58:27 +01:00
Lucas Bartholemy
58bd1c4026
Merge pull request #3029 from danielkesselberg/refactor-mimehelper 
Refactor mimehelper
 2018-02-18 00:07:12 +01:00
Daniel Kesselberg
93e6f21e6b Merge branch 'master' into refactor-mimehelper 
# Conflicts:
#	protected/humhub/libs/MimeHelper.php
 2018-02-17 22:57:54 +01:00
Daniel Kesselberg
af4038b85b - Add unit test for MimeHelper 
- Migrate if/elseif to map
 2018-02-17 22:53:27 +01:00
Lucas Bartholemy
9214b31bf6
Merge pull request #3027 from acs-ferreira/patch-18 
Fix powerpoint mime and add some other extensions
 2018-02-17 20:30:36 +01:00
Carlos Ferreira
d80c6740bc
Fix powerpoint mime and add some other extensions 2018-02-16 20:05:25 +01:00
Lucas Bartholemy
55805ad3f0
Merge pull request #3025 from githubjeka/patch-5 
fix assertEqualsLastEmailSubject in tests
 2018-02-16 17:45:07 +01:00
Evgeniy Tkachenko
655a8efed5
fix assertEqualsLastEmailSubject in tests 2018-02-16 15:20:35 +03:00
Lucas Bartholemy
9f032a8e7e
Merge pull request #2892 from acs-ferreira/patch-7 
Update versions constraints
 2018-02-15 15:51:20 +01:00
Lucas Bartholemy
ad2779752c
Merge pull request #3014 from Felli/patch-1 
Twitter Oauth2 update
 2018-02-14 18:37:06 +01:00
Lucas Bartholemy
85745e15d8
Merge pull request #3015 from acs-ferreira/patch-17 
Clean and fix
 2018-02-14 18:36:34 +01:00
Lucas Bartholemy
c83331b72d
Merge pull request #3016 from githubjeka/v1.3-dev-7.2 
PHP 7.2 and Yii 2.0.13 compatibility
 2018-02-14 18:10:39 +01:00
Lucas Bartholemy
4345a8d811
Merge pull request #3019 from githubjeka/v1.3-dev-contentainer_modules 
remove User_Module & Space_Module in tests [skip ci]
 2018-02-14 13:28:35 +01:00
Lucas Bartholemy
3c0f46aca7
Merge pull request #3018 from githubjeka/patch-1 
PHP Fatal error:  Access level to Instant::status() must be public
 2018-02-14 13:28:17 +01:00
githubjeka
9455530227 remove User_Module & Space_Module in tests [skip ci] 2018-02-14 13:46:26 +03:00
Evgeniy Tkachenko
f831341461
Fix test error 
see https://travis-ci.org/humhub/humhub/jobs/341313158#L859
 2018-02-14 12:22:26 +03:00
githubjeka
957c6a5c6d fix Object for PHP7.2 2018-02-14 10:10:38 +03:00
Carlos Ferreira
b9e42197b3
Clean and fix 
No echo for endContent
 2018-02-13 23:16:47 +01:00
Sarah Tsumayoi
4d934c6f20
Update Twitter.php 2018-02-14 06:08:14 +09:00
Sarah Tsumayoi
0e5d47f659
Twitter Oauth2 update 2018-02-14 05:47:22 +09:00
Lucas Bartholemy
49bd69c6e7
Merge pull request #2896 from acs-ferreira/patch-8 
Min length password on user invitation
 2018-02-13 19:41:03 +01:00
Lucas Bartholemy
a030a033d5
Merge pull request #2959 from acs-ferreira/patch-39 
Upgrade Modernizr library from 2.6.1 to 3.5.0
 2018-02-13 19:37:30 +01:00
Lucas Bartholemy
b09dd2fce9 fix composer.json merge 2018-02-13 19:31:41 +01:00
Lucas Bartholemy
d4a9deb838 Fixed master merge problems 2018-02-13 19:29:25 +01:00
Lucas Bartholemy
708af2787b Merge branch 'master' into v1.3-dev 
# Conflicts:
#	composer.json
#	protected/humhub/modules/admin/controllers/PendingRegistrationsController.php
#	protected/humhub/modules/admin/controllers/UserController.php
#	protected/humhub/modules/admin/views/pending-registrations/index.php
#	protected/humhub/modules/admin/views/user/index.php
#	protected/humhub/modules/space/behaviors/SpaceController.php
#	protected/humhub/modules/space/behaviors/SpaceModelMembership.php
#	static/less/file.less
#	themes/HumHub/css/theme.css
 2018-02-13 19:21:27 +01:00
Lucas Bartholemy
80421245de
Merge pull request #2988 from acs-ferreira/patch-4 
Fix and format
 2018-02-13 18:22:12 +01:00
Lucas Bartholemy
55b1348ac6
Merge pull request #2992 from acs-ferreira/patch-7 
Update Bundle of CA Root Certificates
 2018-02-13 18:20:08 +01:00
Lucas Bartholemy
b6eff98656
Merge pull request #2994 from acs-ferreira/patch-9 
Clean and format
 2018-02-13 17:47:19 +01:00
Lucas Bartholemy
9571975dea
Merge pull request #3003 from acs-ferreira/patch-14 
Cleanup
 2018-02-13 17:42:05 +01:00
Lucas Bartholemy
f2f66eea2a
Merge pull request #3004 from acs-ferreira/patch-15 
Cleanup
 2018-02-13 17:41:45 +01:00
Lucas Bartholemy
64551f0ea1
Merge pull request #3005 from acs-ferreira/patch-16 
Cleanup
 2018-02-13 17:41:29 +01:00
Lucas Bartholemy
cd1901ecd0
Merge pull request #3011 from githubjeka/patch-1 
fix PHP Deprecated Warning
 2018-02-13 17:12:20 +01:00
Lucas Bartholemy
41b191d4f9
Merge pull request #3012 from githubjeka/patch-3 
Fix Exception 'ReflectionException'
 2018-02-13 17:11:53 +01:00
Lucas Bartholemy
baf46e657c
Merge pull request #3013 from githubjeka/patch-5 
Enhancement to migration [skip ci]
 2018-02-13 17:11:28 +01:00
Lucas Bartholemy
b7d4a4bb74 Removed CSRF client errors from log file 2018-02-13 16:35:57 +01:00
Evgeniy Tkachenko
9d8cf975c6
Enhancement to migration [skip ci] 
To avoid possible errors by `contentcontainer_module` applied (I had)
 2018-02-13 13:29:59 +03:00
Evgeniy Tkachenko
d510f61ba2
Fix Exception 'ReflectionException' 
Exception 'ReflectionException' with message 'Class humhub\components\queue\driver\Instant does not exist'
in travis ci
 2018-02-13 12:48:05 +03:00
Evgeniy Tkachenko
8a76ae1c94
fix PHP Deprecated Warning 
Non-static method humhub\modules\admin\models\UserSearch::getStatusAttributes() should not be called statically
 in /opt/site/protected/humhub/modules/admin/views/user/list.php at line 38
 2018-02-13 12:29:52 +03:00
buddh4
9601bec8bd Theme build. 2018-02-08 14:36:43 +01:00
buddh4
975e715995 Merge branch 'v1.3-dev' of https://github.com/humhub/humhub into v1.3-dev 
# Conflicts:
#	protected/humhub/config/common.php
#	protected/humhub/docs/CHANGELOG_DEV.md
#	protected/humhub/docs/guide/bundled-software.md
#	protected/humhub/modules/content/widgets/richtext/HumHubRichText.php
#	themes/HumHub/css/theme.css
 2018-02-08 14:35:13 +01:00
buddh4
130c4aa6de Added ProseMirror rich text editor. 2018-02-08 14:28:55 +01:00
Carlos Ferreira
16ffc5b175
Cleanup 2018-02-07 19:11:30 +01:00
Carlos Ferreira
456d3a7519
Cleanup 2018-02-07 19:10:21 +01:00
Carlos Ferreira
2decab1800
Cleanup 2018-02-07 19:04:21 +01:00
buddh4
a685924ee0
Merge pull request #2974 from danielkesselberg/fix-acceptance-tests 
Fix acceptance tests
 2018-02-07 18:53:53 +01:00
buddh4
30c16143e6
Merge pull request #2975 from Societec/master 
feature: supply 'submitted' listeners with server response
 2018-02-07 18:50:42 +01:00