4638 Commits

Author SHA1 Message Date
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
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
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
Lucas Bartholemy
7fda5d6035
Merge pull request #2990 from acs-ferreira/patch-5
Clean and format
2018-02-07 09:41:01 +01:00
Lucas Bartholemy
325eea05db
Merge pull request #2991 from acs-ferreira/patch-6
Format
2018-02-07 09:40:35 +01:00
Lucas Bartholemy
4737d94f45
Merge pull request #2993 from acs-ferreira/patch-8
Update .ready() function
2018-02-07 09:40:08 +01:00
Lucas Bartholemy
294b548ea2
Merge pull request #2995 from acs-ferreira/patch-10
Clean
2018-02-07 09:38:43 +01:00
Lucas Bartholemy
0ab79d41b8
Merge pull request #2996 from acs-ferreira/patch-11
Clean
2018-02-07 09:38:29 +01:00
Lucas Bartholemy
1630d49110
Merge pull request #2997 from acs-ferreira/patch-12
Clean
2018-02-07 09:37:50 +01:00
Lucas Bartholemy
b5062905f7
Merge pull request #2998 from acs-ferreira/patch-13
Clean
2018-02-07 09:37:11 +01:00
HumHub Translations
0ed1c3d068 Enh: Updated Translations (translate.humhub.org) 2018-02-07 09:34:29 +01:00
Carlos Ferreira
bb51de654c
Clean 2018-02-06 10:55:43 +01:00
Carlos Ferreira
24e9b81771
Clean 2018-02-06 10:50:25 +01:00
Carlos Ferreira
e24a8c9781
Clean 2018-02-06 10:44:13 +01:00
Carlos Ferreira
55ebfc7ee1
Clean 2018-02-05 21:37:03 +01:00
Carlos Ferreira
2eaf3af394
Clean and format 2018-02-05 21:35:05 +01:00
Carlos Ferreira
056bfd6392
Update .ready() function
https://api.jquery.com/ready/
2018-02-05 21:27:46 +01:00
Carlos Ferreira
9be827cb17
Update Bundle of CA Root Certificates 2018-02-05 21:14:54 +01:00
Carlos Ferreira
9876911b70
Format 2018-02-05 21:11:28 +01:00
Carlos Ferreira
0644f49148
Clean and format 2018-02-05 21:08:48 +01:00
Carlos Ferreira
b7ecdf79c0
Fix and format 2018-02-05 18:32:06 +01:00
Carlos Ferreira
091142deb2
Fix and format 2018-02-05 18:19:54 +01:00
Carlos Ferreira
ad2c0ebd4f
Format and clean 2018-02-05 17:48:17 +01:00
Kristian Lein-Mathisen
9f97d987ed feature: supply 'submitted' listeners with server response
now your listeners can process the server response, which was
previously hidden.
2018-01-29 10:56:18 +01:00
Daniel Kesselberg
0615896aa7 PHPdoc 2018-01-28 23:27:44 +01:00
Daniel Kesselberg
931aa8d576 Try to fix php7.0 build 2018-01-28 23:05:36 +01:00
Daniel Kesselberg
49428f4cc7 Try to fix php7.0 build 2018-01-28 22:55:26 +01:00