3152 Commits

Author SHA1 Message Date
buddh4
700662dac0 Notification mail styles 2017-01-24 12:37:21 +01:00
buddh4
98ce7b4fef Use of better variable names in new theme + theme component variable loading. 2017-01-24 12:29:33 +01:00
Lucas Bartholemy
f10d6e3820 Added ContentContainerStream wrapper to improve 1.1 compatibility 2017-01-23 18:04:57 +01:00
Lucas Bartholemy
df38c021c2 Fixed missing imports in admin module permissions 2017-01-23 18:03:46 +01:00
Lucas Bartholemy
ba74c0fd9b Merge pull request #2218 from denntl/pin-unpin-feature
Pin-Unpin feature
2017-01-23 15:25:36 +01:00
denntl\Denis
2a66a83aac Update all var, function and file names (stick to pin) 2017-01-23 16:18:17 +02:00
Lucas Bartholemy
b9e51e61ed Added js compatibility dummy method for time fields 2017-01-22 23:54:42 +01:00
buddh4
56cd08b7ef Fixed ActiveRecord serialization for Notification Jobs. 2017-01-22 15:25:23 +01:00
Lucas Bartholemy
0a8e7334d8 Fixed AccountMenu modules entry highlight 2017-01-22 12:02:15 +01:00
Lucas Bartholemy
a557656b0d Fixed class renaming Migration feature 2017-01-22 12:01:36 +01:00
Lucas Bartholemy
d06ad540c8 Improved compatibility for BasePickerField with comma separated lists 2017-01-22 12:00:24 +01:00
Lucas Bartholemy
5f627a38d4 Added compatiblity js method 2017-01-22 11:41:56 +01:00
buddh4
a781418ad1 Merge branch 'v1.2-dev' of https://github.com/humhub/humhub into v1.2-dev
# Conflicts:
#	protected/humhub/modules/comment/models/Comment.php
2017-01-22 00:13:02 +01:00
buddh4
24fadd51f8 Theme variable loading. 2017-01-22 00:11:02 +01:00
buddh4
161312ea0c Notification Mails/Rendering 2017-01-22 00:08:20 +01:00
buddh4
f4b50fe2cf Fixed Follow and Membership query 2017-01-21 14:01:05 +01:00
Lucas Bartholemy
061d2c59ea Added space chooser and stream compatibility layer for older versions 2017-01-21 13:16:48 +01:00
Lucas Bartholemy
690b6b2d50 Smaller cleanups in Content models 2017-01-21 12:20:07 +01:00
Lucas Bartholemy
be6fc39ce9 Renamed Content VISIBILITY_NONE to VISIBILITY_OWNER 2017-01-20 21:01:40 +01:00
Lucas Bartholemy
82c3d3f75e Added live events for new comments, new content and new notifications 2017-01-20 20:51:56 +01:00
buddh4
3753e91aab StreamSupressQuery fix for Activities 2017-01-20 20:41:42 +01:00
buddh4
7869e99919 Removed old theme concept 2017-01-20 20:40:49 +01:00
Lucas Bartholemy
e4f9364370 Merge pull request #2213 from denntl/admin-profile-field-checkbox
Profile Field Checkbox (Administration Profile)
2017-01-20 17:09:53 +01:00
Lucas Bartholemy
3f21a2ce09 Merge pull request #2210 from denntl/v1.2-dev
Change "stick" to "pinned"
2017-01-20 17:09:46 +01:00
denntl\Denis
740ef429bf Profile Field Checkbox: Add a new Profile field type Checkbox to the Profile Administration & translations 2017-01-20 16:58:26 +02:00
denntl\Denis
fb2a4d9886 Profile Field Checkbox: Add a new Profile field type Checkbox to the Profile Administration & translations 2017-01-20 16:28:36 +02:00
denntl\Denis
a8b105a42d Merge branch 'v1.2-dev' of https://github.com/humhub/humhub into v1.2-dev 2017-01-20 16:05:14 +02:00
Lucas Bartholemy
dabce41553 Improved error logging in job queuing system 2017-01-20 13:58:45 +01:00
Lucas Bartholemy
98b975da13 Added live communication backend 2017-01-20 13:57:45 +01:00
Lucas Bartholemy
8694225c73 Added FollowEvent on create/remove following 2017-01-20 12:43:43 +01:00
Lucas Bartholemy
99ea7e3775 Trigger FriendshipEvent on new or canceled friendships 2017-01-20 12:07:10 +01:00
Lucas Bartholemy
106b949b1b Added space MemberEvent on membership add or remove 2017-01-20 11:42:07 +01:00
Lucas Bartholemy
3409d042fa Added shortcut for adding events in modules config.php 2017-01-20 11:39:45 +01:00
Lucas Bartholemy
d5ee7f9889 Merge branch 'v1.2-dev' of github.com:humhub/humhub into v1.2-dev 2017-01-18 19:15:26 +01:00
Lucas Bartholemy
f55a15416b Changed min PHP Version to 5.6 2017-01-18 19:15:15 +01:00
Lucas Bartholemy
5d2a066b4f Added missing doc 2017-01-18 19:14:27 +01:00
Lucas Bartholemy
b94b77484f Added stream channels instead of show in stream flag 2017-01-18 19:14:11 +01:00
denntl\Denis
3f4361729d Change "stick" to "pinned" for wall entries and change translations 2017-01-18 18:43:33 +02:00
Sebastian Stumpf
ab294c6503 Merge branch 'v1.2-dev' of https://github.com/humhub/humhub.git into v1.2-dev 2017-01-18 17:07:01 +01:00
Sebastian Stumpf
9cbbdb7e87 Fix: Call to getUrl() on null if preview image is not set.
Occurred for files where no conversion to a preview image was possible.
2017-01-18 17:06:40 +01:00
Lucas Bartholemy
43374aaf3b Admin panel wording fix 2017-01-18 13:12:50 +01:00
Lucas Bartholemy
e0720e9964 Added activity mail summary queuing 2017-01-18 12:49:25 +01:00
Lucas Bartholemy
e149b8be7e Added queuing component 2017-01-18 12:48:47 +01:00
buddh4
0b6a7b2362 Minor fixes + Small Notification refactoring + Test alignments. 2017-01-18 01:04:01 +01:00
buddh4
fd797c66e4 Merge branch 'v1.2-dev' of https://github.com/humhub/humhub into v1.2-dev 2017-01-17 16:08:38 +01:00
Lucas Bartholemy
ff3c9e3283 Added mailsummary handling of defined spaces, activity exclude and last sent 2017-01-17 13:25:35 +01:00
Lucas Bartholemy
dcce2c121b Activity mail in users language 2017-01-17 12:25:05 +01:00
Lucas Bartholemy
a57b25161f Improved I18N language handling 2017-01-17 12:16:00 +01:00
Lucas Bartholemy
e65b3a4ab5 Moved mail classes in own mail package 2017-01-17 10:37:25 +01:00
Lucas Bartholemy
327803e027 Added access rules to activity AdminController 2017-01-17 10:35:42 +01:00