4620 Commits

Author SHA1 Message Date
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
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
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
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
Carlos Ferreira
9901c62590
Ommit defaults 2018-02-21 11:27:18 +01:00
Carlos Ferreira
fdd113327b
Clean 2018-02-21 10:28:30 +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
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
Carlos Ferreira
9f88ee7080
Camel Caps 2018-02-19 18:33:19 +01:00
Carlos Ferreira
5353d2020a
Clean and format 2018-02-19 18:29:17 +01:00
Carlos Ferreira
4873fa96ab
Clean Setting model 2018-02-19 18:21:46 +01:00
Carlos Ferreira
98a2a4feac
Clean 2018-02-19 17:56:19 +01:00
Carlos Ferreira
37aa7ae420
Inline control structures are not allowed 2018-02-19 17:54:11 +01:00
Carlos Ferreira
84902a6f90
Clean Comment Model 2018-02-19 15:19:57 +01:00
Daniel Kesselberg
5930532e9f
Merge pull request #3031 from danielkesselberg/master
Rename MIME_* into ICON_* to make purpose more clear
2018-02-19 14:31:17 +01:00
Daniel Kesselberg
e155dc617e Rename MIME_* into ICON_* to make purpose more clear 2018-02-18 22:58:27 +01:00
Carlos Ferreira
573185f280
Declare visibility after abstraction 2018-02-18 19:38:57 +01:00
Lucas Bartholemy
58bd1c4026
Merge pull request #3029 from danielkesselberg/refactor-mimehelper
Refactor mimehelper
2018-02-18 00:07:12 +01:00
Daniel Kesselberg
93e6f21e6b Merge branch 'master' into refactor-mimehelper
# Conflicts:
#	protected/humhub/libs/MimeHelper.php
2018-02-17 22:57:54 +01:00
Daniel Kesselberg
af4038b85b - Add unit test for MimeHelper
- Migrate if/elseif to map
2018-02-17 22:53:27 +01:00
Lucas Bartholemy
9214b31bf6
Merge pull request #3027 from acs-ferreira/patch-18
Fix powerpoint mime and add some other extensions
2018-02-17 20:30:36 +01:00
Carlos Ferreira
d80c6740bc
Fix powerpoint mime and add some other extensions 2018-02-16 20:05:25 +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
b7d4a4bb74 Removed CSRF client errors from log file 2018-02-13 16:35:57 +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