4724 Commits

Author SHA1 Message Date
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
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
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
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
Lucas Bartholemy
fbcff9246e Enh: Added Croatian language 2018-03-26 10:26:04 +02:00
Lucas Bartholemy
38ffe142b2 Merge branch 'master' of github.com:humhub/humhub 2018-03-26 10:24:46 +02:00
HumHub Translations
dd507b3d1a Enh: Updated Translations (translate.humhub.org) 2018-03-25 20:48:10 +02:00
HumHub Translations
0436a4eafa Enh: Updated Translations (translate.humhub.org) 2018-03-25 18:31:57 +02:00
Lucas Bartholemy
2f2db2895b
Merge pull request #3106 from acs-ferreira/patch-2
Apply Yii security patch
2018-03-25 17:43:00 +02:00
Lucas Bartholemy
96fd7d5dc1
Merge pull request #3109 from MarZab/master
Added Slovene language
2018-03-25 17:42:34 +02:00
Sarah Tsumayoi
d791d0084e
Update .htaccess.dist 2018-03-25 12:37:54 +09:00
Sarah Tsumayoi
fc74fd0ede
Fix: Base Subdomains 2018-03-24 18:52:44 +09:00
buddh4
009f1c7777 Fix: Added file_exists() checks for LogoImage + ProfileImage delete()
Fix: Fixed User Model Password imports
2018-03-21 14:26:05 +01:00
Marko Zabreznik
b19bba4a8f Added Slovene language 2018-03-21 13:40:59 +01:00
Carlos Ferreira
f6cb7f0740
Apply Yii security patch
See http://www.yiiframework.com/news/168/releasing-yii-2-0-15-and-database-extensions-with-security-fixes/
2018-03-20 16:20:03 +01:00
Lucas Bartholemy
9606c0c2cb Fixed null pointer exception 2018-03-20 13:07:54 +01:00
Lucas Bartholemy
34cdd35bbe
Merge pull request #3105 from acs-ferreira/patch-3
Use statements
2018-03-19 15:35:27 +01:00
Carlos Ferreira
1a3c635ef5
Use statements 2018-03-19 14:34:24 +01:00
Lucas Bartholemy
9375a96952 Fix: Group member search by firstname/lastname 2018-03-19 12:54:55 +01:00
Lucas Bartholemy
edd58a841e
Merge pull request #3102 from acs-ferreira/patch-2
Clean AuthController
2018-03-19 09:58:44 +01:00
Carlos Ferreira
3542f43119
Clean AuthController 2018-03-18 23:26:31 +01:00
Lucas Bartholemy
de7af7c556
Merge pull request #3101 from acs-ferreira/patch-1
Clean search form
2018-03-17 20:36:59 +01:00
Carlos Ferreira
c7b1f541c4
Try to fix "Headers already sent..." 2018-03-17 12:24:32 +01:00
Carlos Ferreira
5149d268f6
Clean search form 2018-03-17 11:53:06 +01:00
Lucas Bartholemy
d557fe1f25 Allow LDAP field mapping using application configuration file 2018-03-16 20:13:41 +01:00
Daniel Kesselberg
5729a3b6f0
Merge pull request #3099 from acs-ferreira/patch-12
Allow patch versions of Yii 2.0.14
2018-03-16 14:24:34 +01:00