3119 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
buddh4	3165fa22d1	Added icons to user profile menu.	2017-01-26 14:48:40 +01:00
buddh4	df7d087369	Stream use lastContentId of response.	2017-01-26 14:29:53 +01:00
buddh4	98c7ade7ab	Merge branch 'v1.2-dev' of https://github.com/humhub/humhub into v1.2-dev	2017-01-25 20:35:15 +01:00
buddh4	498d10adc0	Simple smartpolling client for live events.	2017-01-25 20:34:47 +01:00
Lucas Bartholemy	bc4827f704	Merge branch 'v1.2-dev' of github.com:humhub/humhub into v1.2-dev	2017-01-25 19:15:48 +01:00
Lucas Bartholemy	d207832d5b	Added support for global content which not belongs to a content container	2017-01-25 18:05:42 +01:00
buddh4	8d46004594	Removed legacy link function.	2017-01-25 18:04:40 +01:00
Lucas Bartholemy	16703c0583	Merge branch 'v1.2-dev' of github.com:humhub/humhub into v1.2-dev	2017-01-25 18:02:17 +01:00
buddh4	f018028d20	Activity link fix.	2017-01-25 18:01:55 +01:00
buddh4	ecd193c7c2	Notification Overview markAsSeen fix.	2017-01-25 18:01:16 +01:00
Lucas Bartholemy	ba946f2aab	Merge branch 'v1.2-dev' of github.com:humhub/humhub into v1.2-dev	2017-01-25 17:11:26 +01:00
buddh4	4da79ebe4f	Live Polling + Notification Frontend Rewrite.	2017-01-25 16:16:35 +01:00
Lucas Bartholemy	b8d4f3bb38	Improved translation category detection	2017-01-24 17:41:08 +01:00
Lucas Bartholemy	01fa1553ba	Added content compatibility layer	2017-01-24 17:01:33 +01:00
Lucas Bartholemy	56905f80cf	Improved PermissionGridEditor	2017-01-24 13:37:52 +01:00
Lucas Bartholemy	3823f3c414	Merge branch 'v1.2-dev' of github.com:humhub/humhub into v1.2-dev	2017-01-24 13:26:47 +01:00
Lucas Bartholemy	f93abdf8cb	Fixed filename typo in build.less	2017-01-24 13:18:16 +01:00
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