3119 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
buddh4	b3e83e77eb	CreateContent Notificatoin for private content fix + View alignments.	2017-01-13 17:11:24 +01:00
Lucas Bartholemy	cb4489818b	MailSummary improvements	2017-01-13 11:21:38 +01:00
Lucas Bartholemy	322096f7eb	Created own Mailer class	2017-01-12 20:11:07 +01:00
Lucas Bartholemy	e21f6d1728	Removed MailUpdateSender, created own MaiLSummaryProcessor for Activity module	2017-01-12 19:48:58 +01:00
buddh4	178ac70054	Merge branch 'v1.2-dev' of https://github.com/humhub/humhub into v1.2-dev	2017-01-12 17:56:32 +01:00
buddh4	0ae5e5d808	Removed activity mail field from user fixture.	2017-01-12 17:56:11 +01:00
Lucas Bartholemy	ffa14c7b37	Fixed double menu entry	2017-01-12 17:46:03 +01:00
Lucas Bartholemy	b716b4698c	Fixed double method implementation	2017-01-12 17:42:37 +01:00
Lucas Bartholemy	0a2a42e662	Implemented getActivityClasses in base module	2017-01-12 17:41:10 +01:00
Lucas Bartholemy	bffc9f5c2f	Merge branch 'v1.2-dev' of github.com:humhub/humhub into v1.2-dev	2017-01-12 17:36:08 +01:00
buddh4	942c658bc8	Notification Rewrite + Web Target Configurable. ... # Conflicts: # protected/humhub/widgets/JsWidget.php	2017-01-12 17:34:19 +01:00
buddh4	06ad8dc2fb	Added default result support in Basepicker + Permalink fix in stream.js	2017-01-12 17:15:49 +01:00
Lucas Bartholemy	a507a470a1	Added activity mail migrations, moved last_activity_mail column to settings	2017-01-12 16:28:27 +01:00
Lucas Bartholemy	604ad336ec	Added a title and description to the core activities	2017-01-12 12:02:05 +01:00
Lucas Bartholemy	482cedc530	Added new E-mail summary configuration pages for admin / user	2017-01-12 11:12:54 +01:00
Lucas Bartholemy	6cc20dd676	Removed old style mailing settings in account settings and admin settings	2017-01-12 10:46:33 +01:00
Lucas Bartholemy	0eabbdca7b	Added own ActiveField class in ActiveForm	2017-01-12 10:38:57 +01:00
Lucas Bartholemy	28509a6d28	Added getActivityClasses method to the base Module class	2017-01-12 10:37:34 +01:00
Lucas Bartholemy	be4fec5dec	Use yii standard View class for mailer	2017-01-11 19:01:40 +01:00
Lucas Bartholemy	27275678e0	Extend BasePickerField from InputWidget for better ActiveField integration	2017-01-11 18:24:12 +01:00
buddh4	80891f4d81	Merge branch 'v1.2-dev' of https://github.com/humhub/humhub into v1.2-dev	2017-01-10 19:34:33 +01:00
buddh4	3d5a9c9fe4	Content error fix.	2017-01-10 19:23:21 +01:00
Lucas Bartholemy	2d99e6876e	Added extended HTML helper class, moved implemented backButton as helper	2017-01-10 19:01:42 +01:00
Lucas Bartholemy	1fd980aea8	Removed old fonts	2017-01-10 19:00:10 +01:00
buddh4	a22d1937be	Serialized settings.	2017-01-10 15:25:14 +01:00
buddh4	218bf7dbfa	Removed legacy flatelements.	2017-01-09 10:01:58 +01:00
buddh4	b096ff6ecc	Stream Fixes	2017-01-09 08:57:20 +01:00
buddh4	472d4eb853	Notification user account settings + Notification Overview alignment + Small comment fix.	2017-01-09 07:52:19 +01:00
buddh4	1ecf2a5a00	Notification Rewrite fixes + tests.	2017-01-09 00:14:12 +01:00
buddh4	10aef47872	Space change gui fix.	2017-01-08 18:43:00 +01:00
buddh4	fa48d0ef4f	Fixed Activity Stream.	2017-01-08 01:43:19 +01:00
buddh4	8f24748190	Merge branch 'v1.2-dev' of https://github.com/humhub/humhub into v1.2-dev	2017-01-08 00:29:00 +01:00
buddh4	887aa4f9d0	Revert of Activity field change + Test alignments.	2017-01-08 00:28:07 +01:00