3152 Commits

Author SHA1 Message Date
Lucas Bartholemy
734376cb23 Make sure AppDynamicAsset is included after AppAsset 2017-02-09 16:11:39 +01:00
buddh4
b3061399cd Merge pull request #2250 from acs-ferreira/patch-20
Require PHP >= 5.6
2017-02-09 16:01:20 +01:00
buddh4
e67a5c2452 Asset Rebuild. 2017-02-09 15:55:32 +01:00
buddh4
4cce8fdf6b Fixed showMore syntax issue. 2017-02-09 15:35:43 +01:00
buddh4
df84ef633d Minified theme.css 2017-02-09 15:26:28 +01:00
buddh4
3a027c8989 Fixed markdown comment rendering. + Added collapsable text to comments. 2017-02-09 15:25:01 +01:00
Carlos Ferreira
f6511ad4ac Update composer.json 2017-02-09 12:30:35 +01:00
buddh4
0182c83c64 Merge branch 'master' of https://github.com/humhub/humhub 2017-02-09 11:20:26 +01:00
buddh4
59e90445f5 Theme rebuild. 2017-02-09 11:20:14 +01:00
Lucas Bartholemy
0d9bf69102 Fix: TimeAgo locale not loaded in production mode, added AppDynamicAsset 2017-02-08 23:48:06 +01:00
buddh4
ce76ef0bb9 Fixed Markdown space issue. 2017-02-08 18:27:21 +01:00
buddh4
162bd64671 Fixed search links. 2017-02-08 16:49:11 +01:00
buddh4
7d9f5cd1dc Merge branch 'master' of https://github.com/humhub/humhub 2017-02-08 16:33:10 +01:00
buddh4
1808381e1e Fixed confirm modal + guest user js issues. 2017-02-08 16:32:36 +01:00
Lucas Bartholemy
f74ec8a2f6 Added release date to CHANGELOG.md 2017-02-08 16:11:48 +01:00
buddh4
dc302d8286 Removed client validation in password-recovery form. 2017-02-08 14:47:01 +01:00
buddh4
8cf508e810 Merge branch 'master' of https://github.com/humhub/humhub 2017-02-08 14:46:21 +01:00
buddh4
ee74441921 Fixed guest ActivityStream. 2017-02-08 14:46:03 +01:00
Lucas Bartholemy
710fc99beb Added missing Exception import 2017-02-08 14:40:43 +01:00
Lucas Bartholemy
800049e093 Better error handling on foreign key migrations 2017-02-08 14:40:26 +01:00
Lucas Bartholemy
e2019bb3e4 Merge branch 'master' of github.com:humhub/humhub v1.2.0-beta.1 2017-02-08 12:42:16 +01:00
Lucas Bartholemy
d62b208802 Fixed PolymorphicRelation caching problem 2017-02-08 12:41:58 +01:00
buddh4
dfbc33335b Merge branch 'master' of https://github.com/humhub/humhub 2017-02-08 12:28:26 +01:00
buddh4
afa1d18150 Travis Test alignment. 2017-02-08 12:28:09 +01:00
Lucas Bartholemy
6ba8211fb1 Enhanced user integrity check with contentcontainer validation 2017-02-08 12:27:38 +01:00
Lucas Bartholemy
fce97082f0 Added post integrity checker method 2017-02-08 12:26:39 +01:00
Lucas Bartholemy
0491830670 Only automatically set aliases when not defined yet 2017-02-07 23:54:49 +01:00
Lucas Bartholemy
911884618f Added @webroot-static to Console Application 2017-02-07 23:41:50 +01:00
Lucas Bartholemy
bd237ea6c5 Better MailSummaryProcessor error handling 2017-02-07 19:54:07 +01:00
Lucas Bartholemy
8712d42cda Return null instead of exception when getViewFile not exists 2017-02-07 19:49:30 +01:00
Lucas Bartholemy
c0d4b220df Added @web-static alias in console application 2017-02-07 19:44:45 +01:00
Lucas Bartholemy
e2da89c15c Readded clickable view param to BaseActivity 2017-02-07 18:58:49 +01:00
buddh4
5bed9c0161 Built assets. 2017-02-07 18:56:08 +01:00
Lucas Bartholemy
9ae6e94811 Improved mail summary error handling 2017-02-07 18:08:48 +01:00
Lucas Bartholemy
24fecc9345 Fixed path for activity mail templates 2017-02-07 18:08:11 +01:00
Lucas Bartholemy
2038b08e3d Removed double activity mail layout 2017-02-07 18:07:08 +01:00
Lucas Bartholemy
d90baca7e9 Merge branch 'master' of github.com:humhub/humhub 2017-02-07 18:06:43 +01:00
Lucas Bartholemy
e45bf1c546 Removed unused coded, added php doc 2017-02-07 18:06:36 +01:00
Lucas Bartholemy
b3df50b073 Removed spaces in plaintext mail layout 2017-02-07 18:05:44 +01:00
Lucas Bartholemy
e2f97581dc Added fallback to version without subPath if not exists 2017-02-07 18:04:58 +01:00
Lucas Bartholemy
fe8afceb60 Use subPath also in plaintext mail layouts 2017-02-07 18:04:10 +01:00
buddh4
469b2e52b7 Fixed modal login issues. 2017-02-07 16:11:25 +01:00
buddh4
9ca6719e0c Merge branch 'master' of https://github.com/humhub/humhub
# Conflicts:
#	protected/humhub/modules/notification/components/MailNotificationTarget.php
2017-02-07 15:27:53 +01:00
buddh4
343bab7e76 Fixed pjax issue for installation with guest access. 2017-02-07 15:25:03 +01:00
Lucas Bartholemy
0703cd6515 Change to user language when sending notification mails 2017-02-07 14:40:33 +01:00
buddh4
b0c61f105f Fixed initial live poll + see mark as seen notification count reset. 2017-02-07 12:53:19 +01:00
buddh4
e768de78c1 Merge branch 'master' of https://github.com/humhub/humhub 2017-02-07 12:36:11 +01:00
buddh4
317d4c3e5b Fixed enable_html5_desktop_notifications setting. 2017-02-07 12:35:30 +01:00
Lucas Bartholemy
a1208b3a15 Fixed typo in attribute label 2017-02-06 20:11:01 +01:00
Lucas Bartholemy
3d9607eabf Fixed installer static folder path for example images 2017-02-06 20:10:43 +01:00