4918 Commits

Author SHA1 Message Date
Sarah Tsumayoi
5f90f5e46d
Update views_auth_login.php 2018-03-28 16:19:49 +09:00
Sarah Tsumayoi
502ceb8fd5
Update views_auth_login.php 2018-03-28 16:19:07 +09:00
Sarah Tsumayoi
211e2695ac
Update login.php 2018-03-28 16:15:52 +09: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
githubjeka
61877f09f3 fixed words typos 2018-03-18 20:21:11 +03: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
Sarah Tsumayoi
3453d86a00
Merge branch 'v1.3-dev' into patch-1 2018-03-17 04:45:21 +09: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
Carlos Ferreira
be6ac05637
Allow patch versions of Yii 2.0.14 2018-03-16 13:33:39 +01:00
Lucas Bartholemy
fee860fb2b Enh: Updated to Yii 2.0.14.2 2018-03-16 13:12:42 +01:00
Lucas Bartholemy
5347ed59b7 Enh: Added random default space color on creation 2018-03-16 13:11:58 +01:00
Lucas Bartholemy
a66f62ca85 Updated composer.lock 2018-03-16 12:29:46 +01:00
Lucas Bartholemy
c40d9e21df Merge branch 'master' into v1.3-dev
# Conflicts:
#	.travis.yml
#	protected/humhub/modules/admin/controllers/UserController.php
#	protected/humhub/modules/comment/models/Comment.php
#	protected/humhub/modules/post/controllers/PostController.php
#	protected/humhub/modules/space/Events.php
#	protected/humhub/modules/user/controllers/AccountController.php
#	protected/humhub/modules/user/models/User.php
2018-03-16 10:44:04 +01:00
Sarah Tsumayoi
3c790c81be
Merge branch 'v1.3-dev' into patch-1 2018-03-16 08:08:14 +09:00
Lucas Bartholemy
d59b8c92c2
Merge pull request #3094 from acs-ferreira/patch-8
Clean PostController
2018-03-15 13:17:54 +01:00
Lucas Bartholemy
6755862efb
Merge pull request #3092 from acs-ferreira/patch-6
Clean dashboard Index_guest
2018-03-15 13:17:20 +01:00
Lucas Bartholemy
3bb2ae30c5
Merge pull request #3090 from acs-ferreira/patch-3
Clean module content Events
2018-03-15 13:13:46 +01:00
Lucas Bartholemy
d2443c4a0d
Merge pull request #3086 from Felli/patch-3
Deprecate Instagram OAuthClient & Remove
2018-03-15 13:12:50 +01:00
Lucas Bartholemy
34ef3cbb9b
Merge pull request #3089 from acs-ferreira/patch-2
Clean Space Chooser view
2018-03-15 13:09:54 +01:00
Lucas Bartholemy
8ddd9b68cf
Merge pull request #3088 from acs-ferreira/patch-1
Clean Invite Modal view
2018-03-15 13:09:32 +01:00
Lucas Bartholemy
5a1bea02fb
Merge pull request #3091 from acs-ferreira/patch-5
Clean dashboard Index
2018-03-15 13:09:08 +01:00
Lucas Bartholemy
466bf62e22
Merge pull request #3093 from acs-ferreira/patch-7
Clean dashboard Config
2018-03-15 13:08:48 +01:00
Lucas Bartholemy
da8c37619d Merge branch 'master' of github.com:humhub/humhub 2018-03-15 13:07:10 +01:00
Lucas Bartholemy
470589ec0c Fix: Increased maximum e-mail address length from 45 characters to 25 2018-03-15 13:06:50 +01:00
Lucas Bartholemy
9cdc843e4c
Merge pull request #3095 from acs-ferreira/patch-9
Switch from unlink() to FileHelper::unlink()
2018-03-15 12:12:17 +01:00
Lucas Bartholemy
83a698cba1
Merge pull request #3098 from acs-ferreira/patch-11
Fix #3097
2018-03-15 12:10:54 +01:00
Carlos Ferreira
13c429fbac
<img> tag has no end tag 2018-03-14 21:32:17 +01:00
Carlos Ferreira
2abb916c16
Fix #3097 2018-03-14 21:30:18 +01:00
Carlos Ferreira
61e31fa3c5
Update ZendLuceneSearch.php 2018-03-13 01:38:48 +01:00
Carlos Ferreira
218b04eefb
Update ExportResult.php 2018-03-13 01:34:20 +01:00
Carlos Ferreira
ced80ad3a3
Update LogoImage.php 2018-03-13 01:33:29 +01:00