11480 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
RedMatrix	0c929c2ec5	Merge pull request #601 from solstag/master ... update pt-br translation	2014-09-24 13:38:07 +10:00
friendica	f203d2a3b0	diaspora private mail seems to work now - but there's an obfuscation leak via the conversation structure that needs to be dealt with.	2014-09-23 20:36:10 -07:00
zzottel	7076eafc14	Merge pull request #602 from zzottel/master ... update German main help page	2014-09-23 16:37:24 +02:00
zottel	ccc97ffdc0	update German main help page	2014-09-23 16:35:30 +02:00
friendica	2b466ccb8c	d* little fixes	2014-09-23 04:40:36 -07:00
friendica	ad86cc24c8	d* PM cont.	2014-09-23 04:34:35 -07:00
friendica	509a85cb12	more work on d* private messages	2014-09-23 03:03:14 -07:00
friendica	72ec78d027	trying to call mod/magic on rss resources - which have no hub	2014-09-22 23:49:12 -07:00
friendica	e8854bb19d	better way to deal with effective_uid	2014-09-22 22:03:19 -07:00
friendica	fb05919d90	make discover items interactive	2014-09-22 21:37:19 -07:00
friendica	b735961560	found the sucker	2014-09-22 16:23:59 -07:00
tuscanhobbit	6e141a8a53	Merge from origin	2014-09-22 23:09:44 +02:00
tuscanhobbit	6a9e8fcd20	Merge from upstream	2014-09-22 22:44:10 +02:00
Alexandre Hannud Abdo	aa59010885	update pt-br translation	2014-09-22 15:42:59 -03:00
friendica	2070dbfdea	private mail from d* to r# seems to work with these edits. - Now have to go back the other way.	2014-09-22 02:27:52 -07:00
friendica	4aa1506c00	Merge https://github.com/friendica/red into pending_merge	2014-09-21 15:13:32 -07:00
friendica	e76ab30467	we don't always set HUBLOC_FLAGS_DELETED but we often set hubloc_status = HUBLOC_OFFLINE instead. Filter this as well from deliveries.	2014-09-21 15:11:47 -07:00
RedMatrix	aa928d65eb	Merge pull request #600 from dawnbreak/master ... Don't link unknown likes.	2014-09-22 07:50:20 +10:00
friendica	09b5bbb032	feeds with '@' in the URL were being handled as webfinger addresses and didn't fall through to RSS discovery. Issue #599	2014-09-21 14:46:12 -07:00
Klaus Weidenbach	d2268a412d	Don't link unknown likes. ... Likes/Dislikes of unknown channels have disabled links now. Fixed intention a bit, romved a unused variable.	2014-09-21 17:51:01 +02:00
friendica	22e6e691ca	Navbar notifications: don't show "nothing new here" unless we've checked and there's nothing. Until we know for sure, display "Loading...".	2014-09-20 16:34:48 -07:00
friendica	44cb423f21	Merge https://github.com/friendica/red into pending_merge	2014-09-20 16:22:21 -07:00
friendica	8d23a8da8d	fix empty likes	2014-09-20 16:21:49 -07:00
cvogeley	a1773fea25	Merge pull request #598 from cvogeley/master ... Allow ordering by created	2014-09-20 22:41:47 +01:00
Christian Vogeley	89fec0e085	Allow ordering by created	2014-09-20 23:28:42 +02:00
marijus	69a10e8ca7	oups...	2014-09-20 17:30:11 +02:00
marijus	6c806f6f48	aalso change the way we check for number of chatrooms	2014-09-20 17:28:42 +02:00
marijus	bd54358aa6	show bookmarks menu only if we have any bookmarks already	2014-09-20 16:31:56 +02:00
marijus	9feb619bea	update jg to latest preview release and try once more to really justify the whole gallery	2014-09-20 15:40:40 +02:00
friendica	1c56442818	Repeat after me - we always refer to our clientelle as 'members'. If your software calls you a "user" - get rid of it.	2014-09-19 23:35:16 -07:00
friendica	302483790c	Merge https://github.com/friendica/red into pending_merge	2014-09-19 16:51:05 -07:00
friendica	cb434818f8	closing tag	2014-09-19 16:50:43 -07:00
Jeroen	6923557ecb	Bit tweaking	2014-09-19 21:23:41 +00:00
Jeroen	017726f069	Another piece that didn't fit well in the dark schema. Hopefully this is the last.	2014-09-19 21:16:55 +00:00
Jeroen	de45f42f9f	update nl.2	2014-09-19 20:43:43 +00:00
Jeroen	eedc0e50c1	update nl	2014-09-19 15:54:19 +00:00
friendica	87a6f25769	try to sort out walltowall translation for diaspora recipients	2014-09-19 02:22:24 -07:00
friendica	083b5da967	doc updates	2014-09-19 02:22:12 -07:00
friendica	45df73d456	add stylish_select to new_channel page - but comment out until we can theme it. It needs a bit of theming to even work correctly.	2014-09-18 17:06:15 -07:00
friendica	3191432c40	add stylish_select library to provide a way to clean up and theme all the ugly select boxes	2014-09-18 16:46:17 -07:00
friendica	c824e426e2	Merge https://github.com/friendica/red into pending_merge	2014-09-18 16:33:31 -07:00
friendica	d4759a5883	repeated content collapse on update from display page under rare conditions (when the conversation hasn't changed)	2014-09-18 16:32:05 -07:00
RedMatrix	caabc69e08	Merge pull request #596 from beardy-unixer/master ... Allow syschan use and extend ping	2014-09-19 06:25:58 +10:00
Thomas Willingham	5c8f5e2aa3	Catch the settings too	2014-09-18 18:14:52 +01:00
Thomas Willingham	fc93ee89a9	If a short ping causes lots of issues, and anyone who has been here ... a while tends to have a longer ping, we should probably have a longer ping	2014-09-18 18:09:54 +01:00
Thomas Willingham	bdfe2c7786	Merge remote-tracking branch 'upstream/master'	2014-09-18 18:07:38 +01:00
Thomas Willingham	595be9919b	Merge branch 'master' of https://github.com/friendica/red	2014-09-18 17:08:23 +01:00
Thomas Willingham	65441b95bb	Doco - permissions needs some work, but this is a relative whopper.	2014-09-18 17:07:47 +01:00
Paolo T	7da97c1981	Merge pull request #3 from friendica/master ... Merge from upstream	2014-09-18 08:41:41 +02:00
friendica	0b47fb9a91	keep the language consistent	2014-09-17 22:59:56 -07:00