154 commits

Author	SHA1	Message	Date
rabuzarus	ce3188d5c6	notifications - move intros to NotificationsManager & make json output work	2016-08-03 12:44:04 +02:00
rabuzarus	6d3c15fe91	notifications - add attendance notifications	2016-08-02 00:01:43 +02:00
rabuzarus	bcee356f66	notifications - add docu & pagination	2016-08-01 23:04:41 +02:00
rabuzarus	7a4be1cead	notifications.php: move more code to NotificationsManager	2016-08-01 18:18:11 +02:00
trebor	52f641904b	notifications.php: reduce code duplication	2016-07-30 10:51:21 +02:00
rabuzarus	f09cd57165	notifications.php - move duplicated code in an own function	2016-07-28 11:39:09 +02:00
rabuzarus	819b374401	notifications.php - move some template creation to the end of the file	2016-07-27 21:07:54 +02:00
rabuzarus	320751660d	frio: intro notifications + some restructuring in core for notifications	2016-07-27 19:53:22 +02:00
Michael Vogel	0b1188b7fe	Imrpoved avatar handling when storing them/partly use of "micro"	2016-06-25 13:56:55 +02:00
Roland Haeder	3e701b90ac	Continued rewriting: ... - use dba::is_result() everywhere (where I found the old, bad way) - converted some spaces -> tabs for code - converted some CRLF -> LF as mixures of both is not good Signed-off-by: Roland Haeder <roland@mxchange.org>	2016-05-01 14:24:44 +02:00
Michael Vogel	7d4c99ebbc	"get_baseurl" and "z_root" are disappearing ...	2016-02-17 23:47:32 +01:00
fabrixxm	b202e02fbf	Revert "Updated modules to allow for partial overrides without errors" ... This reverts commit db949bb802.	2016-02-07 15:11:34 +01:00
Andrej Stieben	db949bb802	Updated modules to allow for partial overrides without errors ... Only define functions if they have not been defined before, e.g. in themes. This makes it possible to override parts of a module and still use the other functions.	2016-02-05 21:52:39 +01:00
Michael Vogel	1f0b759e2f	Added resize possibility to proxy function	2015-10-07 08:25:10 +02:00
Michael Vogel	14e17b944f	Reworked fetching of contact data on "display" page	2015-10-06 18:31:08 +02:00
Michael Vogel	eefedc019b	Merge remote-tracking branch 'upstream/develop' into 1510-diaspora-privacy	2015-10-06 07:41:09 +02:00
Michael Vogel	901b95e935	Hide some profile data if not connected.	2015-10-06 06:56:31 +02:00
Michael Vogel	7ed61b2edc	Removed "proxy_parse_html" since it is now done in the bbcode function.	2015-10-05 22:25:14 +02:00
Michael Vogel	8a2d1fe301	Show RedMatrix and use the proxy for the profile pictures	2015-10-04 22:24:58 +02:00
Michael Vogel	8c514307cf	For safety reasons include the include	2015-10-04 17:20:47 +02:00
Michael Vogel	4003b9cc5d	Let the notification look more like the follow dialog	2015-10-04 17:18:58 +02:00
Michael Vogel	83ea4f7253	transfer some stuff from "follow" to the "notifications" to reduce the differences in the two dialogues.	2015-10-04 15:55:24 +02:00
Michael Vogel	d0ae5ce326	Show more information when following a new contact	2015-10-04 14:41:39 +02:00
Michael Vogel	c7b80b532a	Bugfix: The "about" field in the introductions should be send through bbcode	2015-09-25 17:47:37 +02:00
Michael Vogel	a0f69dc92c	Contact requests now contain more information.	2015-08-12 08:07:21 +02:00
Michael Vogel	b4d09777b9	Added many accesskeys ...	2015-08-08 17:33:43 +02:00
fabrixxm	2d3437daa3	different help text for different network	2015-04-04 18:02:26 +02:00
Silke Meyer	c05f95b54e	Improved help text, issue 1349.	2015-04-01 10:10:00 +02:00
Silke Meyer	cdd3089444	Help text sounded too complicated	2015-02-04 16:43:31 +01:00
Silke Meyer	6bccf0be79	Added help text as requested in #1349.	2015-02-04 16:13:07 +01:00
Fabrixxm	f971f52482	remove messages link from notification tabs bar	2014-09-17 11:01:47 +02:00
Michael Vogel	ed1dce93d6	Usage of /display/(guid) as path instead of /display/(user)/(id) ... Bugfix for adding tags to photos	2014-07-22 00:36:20 +02:00
Michael Vogel	6e7bd68ebb	More "LIMIT 1" removed - and some other SQL improvements.	2014-03-11 23:52:32 +01:00
Michael Vogel	b0dd16696a	Solving some more SQL warnings ("limit" must never be used in update statements)	2013-12-02 20:30:24 +01:00
Olaf Conradi	aa7aa59def	Fix SQL error for missing AND operator ... AND operator was missing from WHERE clause	2013-03-03 20:44:52 +01:00
Zach Prezkuta	263fe0f6bc	revert unnecessary variable name changes	2012-12-26 10:42:01 -07:00
Zach Prezkuta	11c06e21b7	simplify by making Smarty include directives behave like Friendica native ones	2012-12-25 11:55:57 -07:00
Zach Prezkuta	96ed0a7791	Implement Smarty3	2012-12-22 12:57:29 -07:00
friendica	caebcc5e83	rev update	2012-11-04 13:43:28 -08:00
friendica	dec5298248	rev update	2012-10-14 17:16:25 -07:00
friendica	816db4396a	better fix for threads with no parent showing up as unseen	2012-10-10 16:17:40 -07:00
friendica	bfb821e918	well that was a silly mistake...	2012-04-13 16:12:06 -07:00
friendica	d1b57d6e74	setting wasn't being applied	2012-04-13 15:37:25 -07:00
friendica	32cd62ff0a	allow setting default new friend notify	2012-04-12 18:15:46 -07:00
friendica	7e2d4d4026	turn off new friend activity by default	2012-04-12 16:51:57 -07:00
Alexander Kampmann	355c42cb30	Merge branch 'master' of https://github.com/friendica/friendica ... Conflicts: include/config.php update.php	2012-04-05 13:39:15 +02:00
friendica	cfdfcb37cb	don't delete contact from a friend request if friendship was already established	2012-03-30 15:10:50 -07:00
friendica	d83bfd464b	zrl into people searches	2012-03-29 22:20:14 -07:00
friendica	a72a23b6d6	missed a default profile photo replacement in notifications	2012-03-20 15:43:34 -07:00
friendica	894278dbcc	change default profile photo to something more interesting than a reddish brown square	2012-03-20 15:41:06 -07:00
friendica	110e8f2919	basic ssl_policy for important modules	2012-03-14 21:20:20 -07:00
friendica	65ddefe9c5	system notifications to notify module, untranslated string in notifications.tpl	2012-02-23 17:37:03 -08:00
friendica	41636a50aa	new notify sort of working in testbubble	2012-02-22 23:34:30 -08:00
friendica	76308eca67	add toggle to choose sending "friends with" activity even if contact is not hidden	2012-02-06 16:41:05 -08:00
friendica	e2d0eb4a88	redirect to a useful location after deleting or ignoring a friend request, begin comment moderation logic	2012-01-24 18:59:55 -08:00
friendica	8aa2552372	add remove_user hook (it looks like dreamhost changed all my file permissions, this will make a nasty commit)	2012-01-18 16:21:30 -08:00
friendica	c735582ead	hide contacts on approval	2011-12-29 00:23:05 -08:00
friendica	0c24784f5e	include diaspora mentions in personal (requires adding a Diaspora profile url because they don't use ours)	2011-12-06 15:24:01 -08:00
friendica	f1af2c224f	personal notifications	2011-11-30 22:26:02 -08:00
Fabio Comuni	5830682e0c	another fix to tabs in notifications	2011-10-17 17:14:10 +02:00
Fabio Comuni	a2dc8bad2e	fix tabs in notifications	2011-10-17 16:54:21 +02:00
Fabio Comuni	2116943964	Merge remote-tracking branch 'friendika/master'	2011-10-17 16:37:37 +02:00
Friendika	df7702709b	common tabs to notifications and mail	2011-10-11 21:30:23 -07:00
Fabio Comuni	906addf865	common_tabs in notifications.php	2011-10-10 17:01:14 +02:00
Friendika	1cfeb61ddc	more notification cleanup duepuntozero	2011-10-09 21:34:07 -07:00
Friendika	26f2c868da	some notification text cleanup and notification page layout fixes for duepuntozero	2011-10-09 20:26:17 -07:00
Devlon Duthie	8eedbf30f1	added posts to network section of the notifications page	2011-10-08 22:45:48 -05:00
Devlon Duthie	2cba65bd38	fix for 'show all notifications' on notifications drop-down to handle installations in sub-directories + fix for friend notifications (eg: joe became friends with sam)	2011-10-08 16:57:00 -05:00
Devlon Duthie	f5fc8dabe5	Anne set testbubble banner to be fixed, I added the other notification types to /notifcations, added link to notifcations drop-down for all notifications and added notifications drop-down to testbubble theme	2011-10-07 01:25:08 -05:00
fabrixxm	07b6c868b3	remove javascript to set selectect nav item. enanche img template prefetch ignoring	2011-08-17 18:36:24 +02:00
fabrixxm	bdf42473a0	Merge remote-tracking branch 'friendika/master' into newui	2011-08-17 17:35:37 +02:00
Friendika	8e3506048a	diaspora confirm cleanup	2011-08-15 19:31:45 -07:00
Friendika	a6d88fb8f7	diaspora friend approvals	2011-08-15 18:17:19 -07:00
Friendika	2637831d90	some more zot changes migrating back to f9a mainline	2011-08-01 21:02:25 -07:00
Fabio Comuni	e6444adafd	change nav selected css class	2011-07-25 16:52:30 +02:00
Friendika	3eb0b4be2a	now that we have admin interface, completely remove register approvals from notifications	2011-06-29 22:38:30 -07:00
Friendika	23f00aaab4	recipient ui, friend suggestions	2011-06-26 21:55:24 -07:00
Fabio Comuni	e1107b55c6	add info() function. Works like notice() but show messages in a div with class info-message. ... update code to use info() instead of notice() when appropriate (non-error message) add info-message class style in themes	2011-05-23 11:39:57 +02:00
Friendika	5f20925220	deny link not clickable on admin approval notification page	2011-05-20 15:11:36 -07:00
Friendika	b2e92e0af3	deprecate load_view_file	2011-05-11 04:37:13 -07:00
Friendika	c052d68828	don't use load_view_file() except in email templates and install of htconfig - to avoid getting wrong file when package is updated by copying over an older version.	2011-05-10 16:12:50 -07:00
Friendika	338ba48554	more templates	2011-04-07 18:00:35 -07:00
Friendika	f1db34eebc	more templates gone	2011-03-29 17:19:12 -07:00
Friendika	f57f9852b1	pulled strings from one more template	2011-02-22 15:35:33 -08:00
Friendika	5559893293	event and birthday data structures	2011-01-13 02:01:00 -08:00
Friendika	f257569713	couple minor issues with reg queue	2011-01-04 23:31:51 -08:00
Friendika	bb0c24bd4f	prevent admin hijacks	2011-01-04 22:17:58 -08:00
fabrixxm	0df91fd9a2	Manage user registrations in REGISTER_APPROVE mode.	2011-01-04 14:46:08 +01:00
Friendika	1adf69a049	more string extraction	2010-12-01 20:37:42 -08:00
Friendika	3b7dc43d3b	network was not yet set before testing type	2010-11-18 20:28:41 -08:00
Friendika	4240a23a8a	i18n re-arrange	2010-11-15 23:27:12 -08:00
Friendika	36d286d062	more fixes to introduction discards	2010-11-06 17:01:57 -07:00
Friendika	8c9aa975fa	unable to discard notify	2010-11-06 16:54:21 -07:00
Mike Macgirvin	b41218ca30	workflow for federated/non-dfrn followers	2010-10-24 20:39:24 -07:00
Mike Macgirvin	ac824fe83e	eradicate redundant get_uid function	2010-10-18 14:34:59 -07:00
Mike Macgirvin	84d2ad8ebf	cleaned up ACL expansion to remove unwanted '0' elements	2010-09-26 19:44:03 -07:00
Mike Macgirvin	d5a13b1e4c	localisation path for all view templates	2010-09-22 18:00:19 -07:00
Mike Macgirvin	65a420b227	theme cleanup	2010-09-18 21:11:18 -07:00
Mike Macgirvin	ffb1997902	mistpark 2.0 infrasturcture lands	2010-09-08 20:14:17 -07:00
Mike Macgirvin	4bcf380296	fix notification msgs	2010-08-15 22:43:42 -07:00