3040 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
buddh4	ff0284b026	Merge branch 'v1.2-dev' of https://github.com/humhub/humhub into v1.2-dev	2017-01-27 13:06:59 +01:00
buddh4	a4467290e2	Fixed Mail layout/style issue and Space Notificatoin Follow.	2017-01-27 13:06:37 +01:00
Lucas Bartholemy	c9b2e41ee4	Improved stream suppressions	2017-01-27 00:48:33 +01:00
Lucas Bartholemy	e7e42de41f	Fixed less build paths	2017-01-27 00:27:36 +01:00
buddh4	c5420dbd9b	Travis test alingment.	2017-01-27 00:26:23 +01:00
buddh4	1f51a9f120	Travis test fix.	2017-01-26 23:46:51 +01:00
buddh4	f5d79730eb	Fixed space tests.	2017-01-26 23:32:51 +01:00
buddh4	824dac6b0d	Fixed of common.php for travis.	2017-01-26 23:05:42 +01:00
buddh4	929bf1e804	Test alignments.	2017-01-26 21:27:46 +01:00
buddh4	45ce24024d	Fixed theme @web-static path.	2017-01-26 19:09:38 +01:00
Lucas Bartholemy	779090cb2e	Moved @webroot-static definition to Application	2017-01-26 18:37:55 +01:00
Lucas Bartholemy	d35ace1154	Fixed upload folder typo	2017-01-26 18:02:17 +01:00
Lucas Bartholemy	37a7832850	Fixed default profile images	2017-01-26 18:01:32 +01:00
Lucas Bartholemy	98f92e2221	Moved root folders (js/css/resources/less) into static folder	2017-01-26 17:44:51 +01:00
Lucas Bartholemy	4de8d75525	Added @webroot-static and @web-static aliases	2017-01-26 17:36:59 +01:00
Lucas Bartholemy	07042ad57f	Merge branch 'v1.2-dev' of github.com:humhub/humhub into v1.2-dev	2017-01-26 16:50:45 +01:00
Lucas Bartholemy	1742c43f1d	Added missing RewriteEngine on in .htaccess.dist	2017-01-26 16:50:30 +01:00
buddh4	9c354fbde1	Merge branch 'v1.2-dev' of https://github.com/humhub/humhub into v1.2-dev	2017-01-26 16:10:11 +01:00
buddh4	657c31fa1c	Fixed stream filter reload.	2017-01-26 16:08:45 +01:00
Lucas Bartholemy	02e125a662	Added option to show also fixed permissions on PermissionGridEditor	2017-01-26 15:20:55 +01:00
buddh4	f1b5bfba24	AssetBundle cleanup.	2017-01-26 15:18:00 +01:00
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