3231 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Lucas Bartholemy	fe3e75b5ea	Merge branch 'master' of github.com:humhub/humhub ... Conflicts: protected/humhub/modules/user/messages/ar/base.php protected/humhub/modules/user/messages/ar/controllers_AccountController.php protected/humhub/modules/user/messages/de/base.php protected/humhub/modules/user/messages/fr/base.php protected/humhub/modules/user/messages/nb_no/base.php protected/humhub/modules/user/messages/pt_br/base.php protected/humhub/modules/user/messages/pt_br/views_auth_login.php	2017-02-03 12:08:06 +01:00
buddh4	657cb19a9c	Live update multi tab issue workaround.	2017-02-03 11:34:08 +01:00
buddh4	62c337e6aa	Fixed Originator Notification issue.	2017-02-03 11:31:14 +01:00
buddh4	0811ac6d73	Merge branch 'v1.2-dev' of https://github.com/humhub/humhub into v1.2-dev	2017-02-03 11:28:40 +01:00
buddh4	587c630c65	Fixed unsubscribe link in summary and notification mails.	2017-02-03 11:28:24 +01:00
HumHub Translations	a643c52327	Enh: Updated Translations (translate.humhub.org)	2017-02-03 11:08:08 +01:00
Lucas Bartholemy	10da378256	Added comment author to search index	2017-02-03 11:07:07 +01:00
Lucas Bartholemy	7a93567e0b	Prevent double widget init event with Yii 2.0.11	2017-02-03 10:57:39 +01:00
Lucas Bartholemy	7e0e1c3956	Added hideSidebar ContentContainerController option again, default is false	2017-02-03 10:42:09 +01:00
buddh4	1b929bf6fd	Enhanced Theming Guide + Theming Migration Guide.	2017-02-02 22:10:53 +01:00
buddh4	8c6880f2b4	Prevent module double initialization + Smaller stream js enhancement.	2017-02-02 22:10:17 +01:00
buddh4	9a89317e45	Merge branch 'v1.2-dev' of https://github.com/humhub/humhub into v1.2-dev	2017-02-02 22:08:25 +01:00
buddh4	8905451315	Added $label to RichtextField to add a richtext field label.	2017-02-02 22:08:10 +01:00
Lucas Bartholemy	2ca9b623a9	Added coding standards	2017-02-02 16:55:36 +01:00
Lucas Bartholemy	2063b0394e	Dev Documentation enhancements	2017-02-02 16:29:59 +01:00
Lucas Bartholemy	0e6e3c0891	Removed dev prefix of developer docs	2017-02-02 15:19:42 +01:00
Lucas Bartholemy	00c56585de	Administration documentation improvements	2017-02-02 13:42:55 +01:00
buddh4	56d4435b8a	Merge branch 'v1.2-dev' of https://github.com/humhub/humhub into v1.2-dev	2017-02-02 12:49:54 +01:00
Lucas Bartholemy	80f0a4fe85	Documentation improvements	2017-02-02 12:04:00 +01:00
Lucas Bartholemy	483b820c22	Minor documentation fixes	2017-02-01 19:28:23 +01:00
Lucas Bartholemy	76e30fbfdf	Renamed docs	2017-02-01 19:00:25 +01:00
Lucas Bartholemy	f76b436741	Moved docs into own folders	2017-02-01 18:15:43 +01:00
buddh4	5f1fd3ff22	Cache space follower + User follow without notifications.	2017-02-01 14:49:06 +01:00
buddh4	ee66981407	Prevent duplicates in live polling client.	2017-01-27 22:33:46 +01:00
buddh4	04b8ce5c34	Fixed 2108	2017-01-27 22:33:07 +01:00
buddh4	baa740f3af	Removed client validation from password recovery and fixed reenter recovery page issue.	2017-01-27 15:23:32 +01:00
buddh4	32dc94a84e	Password Recovery view alignments + Use Firefox in travis acceptance tests.	2017-01-27 15:03:49 +01:00
buddh4	10c3ceaa4a	Removed old theme parsing from bootstrap.	2017-01-27 13:31:02 +01:00
buddh4	08c879b5b9	Use of new theme variables in other mails.	2017-01-27 13:23:15 +01:00
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