4523 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
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
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
Carlos Ferreira	d3f3cc1574	Update modalConfirm.php	2018-02-07 10:00:10 +01:00
Lucas Bartholemy	14fe54632f	Merge pull request #2966 from acs-ferreira/patch-42 ... Remove check for is_dir	2018-02-07 09:46:32 +01:00
Lucas Bartholemy	5ea83a1430	Merge pull request #2969 from danielkesselberg/basetype-doc-cs-yii1 ... Update phpdoc, Remove Yii methods, Codestyle	2018-02-07 09:45:09 +01:00
Lucas Bartholemy	ebb9d22de8	Merge pull request #2971 from Felli/patch-2 ... Clean up arrays	2018-02-07 09:43:43 +01:00
Lucas Bartholemy	8103f53ac3	Merge pull request #2985 from acs-ferreira/patch-1 ... Format and clean	2018-02-07 09:42:48 +01:00
Lucas Bartholemy	c59c7702fa	Merge pull request #2986 from acs-ferreira/patch-2 ... Fix and format	2018-02-07 09:42:20 +01:00