5044 Commits

Author SHA1 Message Date
Lucas Bartholemy
95ec30c8c3 Added Richtext compatibility layer 2018-04-23 15:21:53 +02:00
Carlos Ferreira
c0c0ed1d46
Clean Invite model 2018-04-21 00:13:09 +02:00
Lucas Bartholemy
6b4b1e7e43 Fix typo in email rule 2018-04-20 17:35:55 +02:00
Lucas Bartholemy
87a770d6d4 Removed duplicate FileHelper use 2018-04-20 17:33:14 +02:00
Lucas Bartholemy
f8f951e4d6 Fixed mentioning on deleted users/spaces 2018-04-20 17:26:04 +02:00
Lucas Bartholemy
6b122228af Merge branch 'v1.3-dev' of github.com:humhub/humhub into v1.3-dev 2018-04-20 17:21:35 +02:00
Lucas Bartholemy
31b6fe678c Chg: Reduced email length to 150 chars to support utf8mb4 charset 2018-04-20 17:21:21 +02:00
Lucas Bartholemy
22a8bbf4e2 Merge branch 'master' into v1.3-dev
# Conflicts:
#	composer.json
#	protected/humhub/config/common.php
#	protected/humhub/modules/admin/models/UserSearch.php
#	protected/humhub/modules/admin/views/approval/index.php
#	protected/humhub/modules/space/behaviors/SpaceModelModules.php
#	protected/humhub/modules/space/models/Module.php
#	protected/humhub/modules/user/components/UrlRule.php
#	protected/humhub/tests/codeception/_support/HumHubDbTestCase.php
2018-04-18 15:37:22 +02:00
Lucas Bartholemy
db09824779
Merge pull request #3127 from acs-ferreira/patch-7
Clean AccountRecoverPassword
2018-04-18 14:02:38 +02:00
Lucas Bartholemy
6f3b2bc3c9 Merge branch 'master' of github.com:humhub/humhub 2018-04-17 17:25:19 +02:00
buddh4
207f9cea49 Merge branch 'master' of https://github.com/humhub/humhub 2018-04-17 17:14:52 +02:00
buddh4
04b60dd69a Added FunctionalTester::follow()
Added `HumHubDbTestCase::setProfileField()` and `HumHubDbTestCase::becomeFriendWith()` and `HumHubDbTestCase::follow()`  and`HumHubDbTestCase::enableFriendships()`
2018-04-17 17:14:27 +02:00
HumHub Translations
6b31d27015 Enh: Updated Translations (translate.humhub.org) 2018-04-17 11:26:58 +02:00
Lucas Bartholemy
c357d8002d Merge branch 'master' of github.com:humhub/humhub 2018-04-17 10:44:43 +02:00
Lucas Bartholemy
d433dcd073 Fix #3108: Fixed cronjob examples with leading zero (acs-ferreira) 2018-04-17 10:44:27 +02:00
HumHub Translations
d6cdc792f0 Enh: Updated Translations (translate.humhub.org) 2018-04-12 18:00:53 +02:00
Lucas Bartholemy
6db08fb3e0
Merge pull request #3128 from acs-ferreira/patch-8
Format Button widget
2018-04-12 13:30:47 +02:00
Carlos Ferreira
da77cac514
Format Button widget 2018-04-11 16:41:14 +02:00
Lucas Bartholemy
762d4994ca Merge branch 'master' of github.com:humhub/humhub v1.2.5 2018-04-11 14:56:23 +02:00
Lucas Bartholemy
ed9efd94ed Release 1.2.5 2018-04-11 14:55:45 +02:00
buddh4
61f1ccc002 Build production assets 2018-04-11 14:54:24 +02:00
Lucas Bartholemy
d9a7244e90 Merge branch 'master' of github.com:humhub/humhub 2018-04-11 14:46:54 +02:00
Lucas Bartholemy
f8f1627e52 Fix #3009: Change the Space URL raises 404 2018-04-11 14:46:30 +02:00
HumHub Translations
d828ff11b7 Enh: Updated Translations (translate.humhub.org) 2018-04-11 14:32:08 +02:00
HumHub Translations
85025bdeec Enh: Updated Translations (translate.humhub.org) 2018-04-11 14:31:03 +02:00
Lucas Bartholemy
b2d2730c76 Enh: Added Norwegian Nynorsk language 2018-04-11 14:29:55 +02:00
Carlos Ferreira
3a0b3b7dc2
Clean AccountRecoverPassword 2018-04-11 10:47:04 +02:00
buddh4
a0dd590b57 Fixed phpt 7.1 test issue. 2018-04-06 18:02:24 +02:00
buddh4
ad68cfaf67 Add restart = true option to acceptance test suite 2018-04-06 16:59:58 +02:00
buddh4
ab8008922a Fixes #3110 Yii 2.0.14 BaseActiveRecord reset relation incompatibility 2018-04-06 15:00:37 +02:00
buddh4
f722adf240 Merge branch 'master' of https://github.com/humhub/humhub
# Conflicts:
#	protected/humhub/docs/CHANGELOG.md
2018-04-04 11:42:43 +02:00
buddh4
99f7d5eca4 Enh: Added further FunctionalTester utilities 2018-04-04 11:40:23 +02:00
buddh4
75e1520e87 Enh: Added humhub/modules/space/models/Module::flushCache() and humhub/modules/space/behaviours/SpaceModelModules::flushCache() in order to flush the space module cache 2018-04-04 11:37:26 +02:00
buddh4
c264477fcc Fix: User model namespace issue in humhub/modules/user/components/UrlRule
Enh: Raised notification over view pagination size to 20
2018-04-04 11:27:38 +02:00
Sarah Tsumayoi
5263fa9996
Merge branch 'master' into patch-5 2018-04-01 16:44:25 +09:00
Lucas Bartholemy
73a044ec2f
Merge pull request #3112 from Felli/patch-4
Fix: Install in Sub-directory
2018-03-29 18:05:49 +02:00
Lucas Bartholemy
838b167ed6 Fix: User approval, lastname field is shown twice to admins 2018-03-29 13:02:32 +02:00
Sarah Tsumayoi
224cf1785f
Update login_modal.php 2018-03-28 17:09:47 +09:00
Sarah Tsumayoi
727e911641
Revert back to double quotes 2018-03-28 17:05:24 +09:00
Sarah Tsumayoi
899b13dcf8
Update login.php 2018-03-28 16:55:02 +09:00
Sarah Tsumayoi
81e7dac199
Update CHANGELOG.md 2018-03-28 16:46:20 +09:00
Sarah Tsumayoi
7b89b7f15e
Update views_auth_login.php 2018-03-28 16:35:52 +09:00
Sarah Tsumayoi
6e1770fd0f
Update views_auth_login.php 2018-03-28 16:35:32 +09:00
Sarah Tsumayoi
ffc1fd93d1
Update views_auth_login.php 2018-03-28 16:35:12 +09:00
Sarah Tsumayoi
94c2db78f7
Update views_auth_login.php 2018-03-28 16:34:41 +09:00
Sarah Tsumayoi
71032bd847
Update views_auth_login.php 2018-03-28 16:34:19 +09:00
Sarah Tsumayoi
901277a8a6
Update views_auth_login.php 2018-03-28 16:33:58 +09:00
Sarah Tsumayoi
2cbcecd68f
Update views_auth_login.php 2018-03-28 16:33:40 +09:00
Sarah Tsumayoi
1452e057e1
Update views_auth_login.php 2018-03-28 16:33:20 +09:00
Sarah Tsumayoi
efe0b32cb0
Update views_auth_login.php 2018-03-28 16:32:52 +09:00