2629 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Friendika	99ea045723	some minor work on contact edit page	2011-08-25 18:12:42 -07:00
Friendika	21c03fb522	diaspora2bb, salmon fix argument error	2011-08-25 16:37:27 -07:00
Friendika	1b33ba6587	third attempt to get rid of this stupid warning	2011-08-25 06:01:40 -07:00
Friendika	83605cf3dc	theme settings for contact photo menu	2011-08-25 05:15:05 -07:00
Friendika	71fc694c67	contact photo menu	2011-08-24 23:20:04 -07:00
Friendika	74d61ed00b	contact menu beginnings	2011-08-24 22:40:26 -07:00
Friendika	8f6ae2b660	missing salmon key? report it.	2011-08-24 20:40:08 -07:00
Friendika	96adbb6457	Merge branch 'pull'	2011-08-24 15:55:59 -07:00
Friendika	d51d42b7d4	revup	2011-08-24 15:55:27 -07:00
tobiasd	a2a3b75b6d	Merge pull request #162 from omigeot/master ... French translation	2011-08-24 08:58:07 -07:00
Olivier Migeot	1f5a67c81f	French translation up to date.	2011-08-24 17:47:21 +02:00
Friendika	d6f9e0e2a4	change the way public feeds work just to fix statusnet's bug, because they won't	2011-08-24 05:58:31 -07:00
Friendika	a775474dff	cleaned up the conditions on when to and when not to relay.	2011-08-24 04:42:28 -07:00
Friendika	b6fdd3c76b	turn off notifier - runaway	2011-08-24 01:55:34 -07:00
Friendika	0883a614a2	don't accept pubsub from diaspora	2011-08-24 01:41:27 -07:00
Friendika	0e1f868237	Merge branch 'pull'	2011-08-24 01:29:07 -07:00
Friendika	2aa23843e4	D* queue	2011-08-24 01:21:24 -07:00
tobiasd	9cba9d33b9	Merge pull request #161 from tobiasd/master ... fix for DE strings.php	2011-08-23 22:47:45 -07:00
Tobias Diekershoff	56c29a527d	Merge github.com:tobiasd/friendika	2011-08-24 07:38:05 +02:00
Friendika	2cfdcee29a	author and owner sign exactly the same string - apparently	2011-08-23 19:54:35 -07:00
Friendika	b57a01dc14	that was ugly - let's do better	2011-08-23 19:42:45 -07:00
Friendika	838d89a110	fix for public posts to D*	2011-08-23 19:40:50 -07:00
Friendika	6a052c3586	correct time in photo msg	2011-08-23 19:01:08 -07:00
Friendika	c1acea330c	photo fixes	2011-08-23 18:50:18 -07:00
Friendika	3b4da00495	fix it again	2011-08-23 18:28:17 -07:00
Friendika	b41592f556	fix group public members	2011-08-23 18:22:15 -07:00
Friendika	56d64316f4	diaspora photos ?	2011-08-23 18:17:35 -07:00
Friendika	91de9edecd	retractions - precedence issue	2011-08-23 04:02:29 -07:00
Friendika	99681e33af	testing retractions	2011-08-23 03:49:38 -07:00
Friendika	0739ae315b	typo	2011-08-23 03:07:26 -07:00
Friendika	afbc46c00f	don't process diaspora communications if no pubkey	2011-08-23 03:06:08 -07:00
Friendika	8cfbe2c432	include bb2diaspora at top level	2011-08-23 03:02:31 -07:00
Friendika	92504b5df7	more testing with images	2011-08-23 01:55:46 -07:00
Friendika	c55d24b451	second try	2011-08-23 01:52:59 -07:00
Friendika	124881903e	forget about the image link we have it in the wrapper	2011-08-23 01:51:37 -07:00
Friendika	508f22f859	photos a bit messed up on d*	2011-08-23 01:47:42 -07:00
Friendika	c1a1b2ab60	updates bb2md	2011-08-23 01:33:58 -07:00
Friendika	561051e805	convert bbcode to markdown for diaspora (first try, will need tweaking)	2011-08-23 01:00:29 -07:00
Friendika	56ea11a561	bad param in like function	2011-08-22 23:18:22 -07:00
Tobias Diekershoff	9cd28af4e8	fixed a missing string in DE	2011-08-23 06:32:21 +02:00
Friendika	58651f7eb8	public posts ~f to D*	2011-08-22 21:15:31 -07:00
Friendika	b9e4668f68	d* retractions	2011-08-22 20:35:34 -07:00
Friendika	b0211499c1	invoke notifier	2011-08-22 19:27:40 -07:00
Friendika	eb2ef6dec4	diaspora admin toggle, update install guide	2011-08-22 18:52:02 -07:00
Friendika	564ade0685	store key with contact record	2011-08-22 04:55:09 -07:00
Friendika	ef99267b94	Merge branch 'pull'	2011-08-22 01:58:53 -07:00
Friendika	812222fb17	correct the diaspora_like signable string format	2011-08-22 01:57:52 -07:00
tobiasd	8c75ede39d	Merge pull request #160 from michal-s/master ... added Czech translation of mail messages	2011-08-21 22:51:34 -07:00
Michal Supler	f3c5154f0c	added Czech translation of mail messages	2011-08-21 23:45:43 -03:00
Friendika	4ec706cfc7	log the friend request - it's important	2011-08-21 17:48:42 -07:00