3129 Commits

Author SHA1 Message Date
Lucas Bartholemy
d62b208802 Fixed PolymorphicRelation caching problem 2017-02-08 12:41:58 +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
Lucas Bartholemy
7ab67a5fa3 Ignore migration error when foreign key not exists 2017-02-06 20:10:16 +01:00
buddh4
70f7dded9e Fixed NewContent live event + live messageCount update. 2017-02-06 19:43:20 +01:00
buddh4
da0746dca3 Merge branch 'master' of https://github.com/humhub/humhub 2017-02-06 18:29:53 +01:00
buddh4
6aa21af4f4 Catch all exceptions when rendering stream entries. 2017-02-06 18:25:43 +01:00
Lucas Bartholemy
c04c938f9b Raised version to 1.2.0-beta.1 2017-02-06 16:39:56 +01:00
Lucas Bartholemy
45d3f273a2 Htaccess fix when URL rewriting is not enabled in Yii 2017-02-06 14:08:03 +01:00
buddh4
115b7af252 UpdateNotficatioView 2017-02-05 20:20:56 +01:00
buddh4
a09bb0df5e Asset rebuild. 2017-02-05 16:43:00 +01:00
buddh4
a18146928d Update Notification count for each pjax call. 2017-02-05 16:24:38 +01:00
buddh4
338dd40e73 Fixed spacechooser message count update 2017-02-05 15:23:27 +01:00
buddh4
b173035610 Fixed Spacechooser message counter. 2017-02-05 14:58:18 +01:00
buddh4
58332fc438 Merge branch 'v1.2-dev' of https://github.com/humhub/humhub into v1.2-dev 2017-02-05 14:39:23 +01:00
buddh4
219139daef Provide module instance in humhub module beforeInit. 2017-02-05 14:36:33 +01:00
Lucas Bartholemy
cf206ed25a Added changelog entries 2017-02-05 11:47:11 +01:00
Lucas Bartholemy
2565b0c180 Merge branch 'v1.2-dev' of github.com:humhub/humhub into v1.2-dev 2017-02-05 11:35:22 +01:00
Lucas Bartholemy
589b1e3afd Restored local configuration files 2017-02-05 11:35:10 +01:00
buddh4
82d9f51784 Revert InviteButton change to make it overwritable. + Small refactoring. 2017-02-04 19:04:27 +01:00
buddh4
1712b1c0b7 Workaround for Notification Record bulk send. + Fixed tests. 2017-02-04 14:20:06 +01:00
buddh4
e66d2ebbaa Merge branch 'v1.2-dev' of https://github.com/humhub/humhub into v1.2-dev 2017-02-04 13:48:52 +01:00
Lucas Bartholemy
2069eb240d Fixed wrong dates on new posts 2017-02-04 12:49:29 +01:00
Lucas Bartholemy
5eadcb7ba4 Fixed theme variable parsing 2017-02-04 11:55:42 +01:00
buddh4
427dc9dd5b Merge branch 'v1.2-dev' of https://github.com/humhub/humhub into v1.2-dev 2017-02-03 16:52:52 +01:00
Lucas Bartholemy
16e540747c Fixed asset problem on ajax requests 2017-02-03 16:45:05 +01:00