5044 Commits

Author SHA1 Message Date
Carlos Ferreira
822b6453cb
Clean Actions Stream 2018-02-26 18:25:04 +01:00
Carlos Ferreira
9f7773df2e
Typo (double quotes needed) 2018-02-26 13:50:54 +01:00
Lucas Bartholemy
13af5bbfa6
Update .travis.yml 2018-02-26 12:43:35 +01:00
Lucas Bartholemy
8d98ac89be
Merge pull request #3037 from danielkesselberg/update-userexport
Update userexport
2018-02-26 09:57:01 +01:00
Lucas Bartholemy
3b1119da9b Updated composer.lock 2018-02-26 09:55:39 +01:00
Lucas Bartholemy
ed259476aa Fixed comment model import 2018-02-25 22:49:58 +01:00
Lucas Bartholemy
ef7fb0a1ef Merge branch 'v1.3-dev' of github.com:humhub/humhub into v1.3-dev 2018-02-25 22:42:38 +01:00
Lucas Bartholemy
c086edf7fd Merge branch 'master' into v1.3-dev
# Conflicts:
#	protected/humhub/modules/comment/models/Comment.php
#	protected/humhub/modules/notification/targets/BaseTarget.php
2018-02-25 22:42:08 +01:00
Lucas Bartholemy
619c1660fa
Merge pull request #3030 from acs-ferreira/patch-16
Declare visibility after abstraction
2018-02-25 21:24:04 +01:00
Lucas Bartholemy
37587135d9
Merge pull request #3024 from githubjeka/patch-4
fix Invalid 200 OK when comment is empty
2018-02-25 20:52:56 +01:00
Lucas Bartholemy
055dc466c6
Merge pull request #3041 from acs-ferreira/patch-23
Switch from mkdir() to FileHelper::createDirectory
2018-02-25 20:51:15 +01:00
Lucas Bartholemy
2478709d7d
Merge pull request #3033 from acs-ferreira/patch-17
Clean Comment Model
2018-02-25 20:42:06 +01:00
Lucas Bartholemy
e6666df78a
Merge pull request #3035 from acs-ferreira/patch-19
Clean Setting model
2018-02-25 20:16:56 +01:00
Lucas Bartholemy
c8210d409a
Merge pull request #3034 from acs-ferreira/patch-18
Clean
2018-02-25 20:16:19 +01:00
Lucas Bartholemy
a6340c4bd6
Merge pull request #3036 from acs-ferreira/patch-20
Clean and format
2018-02-25 20:16:00 +01:00
buddh4
f51863a6da Enh: Added ContentTypePicker
Fix: Fixed Pickerfield image
Enhanced Stream filter style
2018-02-25 19:57:48 +01:00
Lucas Bartholemy
fd8b60698b
Merge pull request #3039 from acs-ferreira/patch-21
Format
2018-02-25 19:32:13 +01:00
Lucas Bartholemy
99beefc2d0
Merge pull request #3040 from acs-ferreira/patch-22
Clean
2018-02-25 19:31:55 +01:00
Lucas Bartholemy
260c21b6a6
Merge pull request #3045 from githubjeka/v1.3-dev-humhub-testcase
Enhancement HumHubDbTestCase
2018-02-25 19:31:20 +01:00
Lucas Bartholemy
b7ef77161c
Merge pull request #3042 from Felli/patch-1
Enh: MD docs
2018-02-25 19:30:46 +01:00
Lucas Bartholemy
efbaee2338
Merge pull request #3043 from githubjeka/v1.3-dev-mixin
autocomplete PHPStorm for behaviors for Content's models [skip ci]
2018-02-25 19:30:18 +01:00
Lucas Bartholemy
fe173cda3f
Merge pull request #3046 from acs-ferreira/patch-4
Clean
2018-02-25 19:29:42 +01:00
Lucas Bartholemy
37eb7cb811
Merge pull request #3047 from acs-ferreira/patch-7
Clean
2018-02-25 19:29:13 +01:00
buddh4
7c88e1fc41 Enh: Refactored Stream Filters 2018-02-24 18:24:57 +01:00
githubjeka
6f238d02db phpDoc for HumHubDbTestCase::allowGuestAccess 2018-02-21 14:05:27 +03:00
githubjeka
4c8c574451 refactoring for HumHubDbTestCase::allowGuestAccess 2018-02-21 13:56:03 +03:00
Carlos Ferreira
9901c62590
Ommit defaults 2018-02-21 11:27:18 +01:00
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
Carlos Ferreira
fdd113327b
Clean 2018-02-21 10:28:30 +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
Carlos Ferreira
97036870c9
Clean 2018-02-21 10:22:16 +01:00
Carlos Ferreira
ce399d5532
Update UploadProfileImage.php 2018-02-21 09:25:23 +01:00
githubjeka
e24c2ad9f6 Merge remote-tracking branch 'origin/v1.3-dev' into v1.3-dev-humhub-testcase
# Conflicts:
#	protected/humhub/tests/codeception/_support/HumHubDbTestCase.php
2018-02-21 09:45:24 +03:00
githubjeka
88fadab6fe Enhancement HumHubDbTestCase
- deprecated `Codeception\TestCase\Test` replaced to `Codeception\Test\Unit`
Note: now you can mark file as text `protected\vendor\codeception\codeception\shim.php`

- optimize imports for default fixture. All fixtures with fullpath you can see in
 `HumHubDbTestCase::getDefaultFixtures()`

 - fix for `HumHubDbTestCase::assertHasNotification()`.
 Method `Notification::find($conditions)` hasn't any arguments. Replaced to
 `Notification::find()->where($conditions)`

 - To autocomplete IDE added new `HumHubDbTestCase:getYiiModule()`
  instead `HumHubDbTestCase::getModule('Yii2')`

 - `HumHubDbTestCase::assertMailSent` becomes deprecated.
 Use `HumHubDbTestCase::assertSentEmail` instead
2018-02-21 09:40:17 +03:00
githubjeka
63b8631f7e autocomplete for behaviors for Content's models [skip ci] 2018-02-21 08:44:25 +03:00
Sarah Tsumayoi
bf09592ac4
Enh: MD docs
Added some missing Markdown syntax.
2018-02-21 10:14:12 +09:00
Carlos Ferreira
b9e11ec6bc
Update travis to require sudo
See https://docs.travis-ci.com/user/chrome#Selecting-a-Chrome-version and https://github.com/travis-ci/travis-ci/issues/8836
2018-02-20 19:04:57 +01:00
Carlos Ferreira
92153cd719
Typo 2018-02-20 18:41:43 +01:00
Carlos Ferreira
3db38c90c8
Update LogoImage.php 2018-02-20 18:21:03 +01:00
Carlos Ferreira
f7fa34459c
Typo 2018-02-20 18:16:19 +01:00
Carlos Ferreira
4fa3b24b7b
Update StorageManager.php 2018-02-20 17:49:40 +01:00
Carlos Ferreira
4e0419a690
Massive Clean of ZendLuceneSearch 2018-02-20 17:46:54 +01:00
Carlos Ferreira
62864e5254
Update ModuleManager.php 2018-02-20 17:31:30 +01:00
Carlos Ferreira
d84cab46f6
Update OnlineModuleManager.php 2018-02-20 17:25:41 +01:00
Carlos Ferreira
62a5215de7
Update LogoImage.php 2018-02-20 17:18:30 +01:00
Carlos Ferreira
5085511b54
Update MessageController.php 2018-02-20 17:16:21 +01:00
Carlos Ferreira
544e56a20d
Switch from mkdir() to FileHelper::createDirectory 2018-02-20 15:51:22 +01:00
Carlos Ferreira
9cb510ef2b
Allow GIF on profile image 2018-02-20 15:22:20 +01:00
Carlos Ferreira
89c2690b21
Format 2018-02-20 15:19:46 +01:00
githubjeka
0e12a2f6dd fix unit tests
revert some code from commit 130c4aa6de88daa42189f7cafec6669baaaa4bbd
2018-02-20 14:16:19 +03:00