6746 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
friendica	e208e07e35	Make zot_feeds in ascending created order so that we'll see parents before kids. Otherwise if we get a kid and we don't have a parent we'll drop it.	2013-01-04 18:06:38 -08:00
friendica	9253eaa98a	never enough documentation	2013-01-04 17:16:35 -08:00
friendica	816383a9c3	This should fix the errant relaying...	2013-01-04 17:04:44 -08:00
friendica	37a4afa2ff	fix typo - commited to wrong tree	2013-01-04 16:28:33 -08:00
friendica	cccd9567e4	Merge https://github.com/friendica/red into zpull	2013-01-04 16:19:13 -08:00
friendica	f781e4e1ef	rev update	2013-01-04 16:18:47 -08:00
Thomas Willingham	bc06f338b5	Fix code boxes.	2013-01-04 23:27:01 +00:00
friendica	59c23564a0	break delivery loop	2013-01-04 03:36:32 -08:00
friendica	0b2c857246	zfinger issue stray unfinished statement	2013-01-04 01:41:18 -08:00
friendica	bd728e773b	small tweaks to icon positions	2013-01-03 20:41:17 -08:00
friendica	53cd7a64b6	json_decode param missing	2013-01-03 19:35:42 -08:00
friendica	bec7d9f483	temporary feed import/export (public only for the moment) until this is integrated with remote permissions	2013-01-03 19:34:04 -08:00
Thomas Willingham	cf0e960a90	Merge pull request #12 from beardy-unixer/master ... Events/Message icons	2013-01-03 17:55:45 -08:00
Thomas Willingham	0f25ebd5c5	Aha, I anticipated that - event and message icons.	2013-01-04 01:51:50 +00:00
friendica	b001323390	make the menu consistent and eliminate redundancy - though we need icons for mail and events (sorry Thomas if this breaks your themes in a bad way, but at least the menus make sense now).	2013-01-03 17:36:03 -08:00
friendica	9a8dec5480	place holders for mail and event icons on nav bar	2013-01-03 17:08:36 -08:00
friendica	13ec589f80	add refresh to connection edit menu, and notify of communication issues	2013-01-03 16:48:18 -08:00
friendica	e03f6cb975	more debugging - looks like michameer.dyndns.org is throwing 500s so cannot test further	2013-01-03 16:39:22 -08:00
friendica	6a42d3708c	change precedence of bitwise operation	2013-01-03 16:30:35 -08:00
friendica	acc1dfa773	stray paren in sql	2013-01-03 16:24:30 -08:00
friendica	72da7ceba4	ensure the function can be found	2013-01-03 16:18:52 -08:00
friendica	a103c96c46	add "refresh their permissions" function	2013-01-03 16:17:22 -08:00
friendica	f8bd476b88	import the toggle_mobile stuff to shut up some warnings	2013-01-03 15:52:05 -08:00
friendica	7df33bb963	fix register_policy globally	2013-01-03 13:50:23 -08:00
friendica	781f49768a	Merge pull request #11 from beardy-unixer/master ... Redbasic update	2013-01-03 13:38:27 -08:00
Thomas Willingham	3b140d6e2f	Fix register policy	2013-01-03 12:44:23 +00:00
friendica	05d8faf5e1	provide delivery report on both sides, local and remote	2013-01-03 02:21:35 -08:00
friendica	e6000f3f6e	fix event query - some DB's have problems with it	2013-01-03 02:10:37 -08:00
Thomas Willingham	60e2d7b026	Merge remote-tracking branch 'upstream/master'	2013-01-03 09:57:46 +00:00
friendica	4aae0ac948	issue with abook creation	2013-01-03 01:53:22 -08:00
Thomas Willingham	958b5d623e	Merge remote-tracking branch 'upstream/master'	2013-01-03 09:45:55 +00:00
friendica	1fc38311f9	fix item owner on conversations	2013-01-03 01:42:28 -08:00
Thomas Willingham	b1a02cf450	Merge remote-tracking branch 'upstream/master'	2013-01-03 09:17:11 +00:00
friendica	1e7a5560f5	missing )	2013-01-02 23:37:52 -08:00
friendica	4c196471b8	pconfig['system']['channel_format'] lets you specify what your channel page looks like. By default it's a social network-like profile. 'full' makes it a full page of channel content with no sidebar widgets, and 'partial' includes the archive and categories widget (like a blog and only if they are enabled) on the sidebar but leaves out the 'social network' vcard and contact block. This may undergo revision as we use it and figure out how to make other pages tweakable and configurable in the same sorts of ways.	2013-01-02 23:31:01 -08:00
friendica	4c21abe533	verify table needs auto_increment flag	2013-01-02 23:07:46 -08:00
friendica	32a97d5065	zome issues registering new hubs	2013-01-02 16:28:47 -08:00
Thomas Willingham	577236c372	Merge remote-tracking branch 'upstream/master'	2013-01-02 11:40:17 +00:00
friendica	4108598133	yikes that's a lot of typos	2013-01-02 02:00:46 -08:00
friendica	c266f0724b	another typo	2013-01-02 01:47:06 -08:00
friendica	a824a87d80	foreach issue	2013-01-02 01:44:50 -08:00
friendica	03a4ad0e09	typos etc.	2013-01-02 01:30:53 -08:00
friendica	50d1cb2e3a	start building social graph	2013-01-01 23:56:27 -08:00
Thomas Willingham	2fd0653d6f	Redbasic - floating wall-item-content sometimes causes massive top margins.	2013-01-01 16:08:32 +00:00
Thomas Willingham	556f38afde	Add icons to redbasic, move delete button to the right, and sync nav.tpl	2013-01-01 13:15:45 +00:00
friendica	4d7fe15d3b	more poco discovery	2013-01-01 02:06:41 -08:00
friendica	93d85858d5	poco discovery	2013-01-01 01:57:20 -08:00
friendica	6accc190d4	ensure all delivery result possibilities are logged and communicated to the sender	2013-01-01 00:45:44 -08:00
friendica	3e5e8b420f	accept expire params if expire feature is enabled	2012-12-31 23:00:37 -08:00
friendica	f2a4ea7254	add individual message delivery reporting	2012-12-31 21:33:11 -08:00