8698 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Thomas Willingham	046ddea9e8	Ugh, typo	2013-09-29 20:06:43 +01:00
Thomas Willingham	1f4ed2b4a4	Add kdevelop files to .gitignore	2013-09-29 20:02:55 +01:00
Thomas Willingham	42e11019b9	Missing include	2013-09-29 19:44:57 +01:00
Thomas Willingham	3c42989fc4	Typo	2013-09-29 16:45:21 +01:00
Thomas Willingham	9212fd0ecc	Issue #117	2013-09-29 16:40:15 +01:00
friendica	4f83a1c152	Merge https://github.com/friendica/red into zpull	2013-09-29 02:47:58 -07:00
friendica	a06f1f9594	Issue #158	2013-09-29 02:47:36 -07:00
Thomas Willingham	5a0623299c	Prevent toolbar overlapping comanche nav links.	2013-09-28 23:31:30 +01:00
Thomas Willingham	3cf5e5effd	Fix Comanche menus	2013-09-28 19:05:50 +01:00
friendica	6ca6bc2dd8	close comment	2013-09-28 05:03:58 -07:00
friendica	13e18332aa	Merge https://github.com/friendica/red into zpull	2013-09-28 04:42:08 -07:00
friendica	110974eb55	fix can_comment_on_post when viewing wall-to-wall	2013-09-28 04:41:12 -07:00
friendica	8fe5575469	string update	2013-09-28 04:40:57 -07:00
friendica	c98605df37	doc updates	2013-09-28 04:30:57 -07:00
friendica	b1c6ef9f33	Merge pull request #157 from 0xAF/master ... Add colorpicker jquery plugin for themes	2013-09-28 04:02:34 -07:00
Stanislav Lechev [0xAF]	24128a4e1f	Add colorpicker jquery plugin for themes	2013-09-28 12:23:55 +03:00
friendica	4b3c565174	convert to plaintext before matching words in body. Otherwise every post I make with a link in it is going to match a test for zot.	2013-09-26 19:58:24 -07:00
friendica	6dc4d963fa	Merge https://github.com/friendica/red into zpull	2013-09-26 19:35:09 -07:00
friendica	017db29947	aggregate channels	2013-09-26 19:34:45 -07:00
Thomas Willingham	dc692cd748	Actually, lets add a content wrapper while we're in there.	2013-09-27 03:11:28 +01:00
Thomas Willingham	83a41a5af6	Typo	2013-09-27 03:06:20 +01:00
Thomas Willingham	b838585e27	Issue #131	2013-09-27 03:03:37 +01:00
Thomas Willingham	8d92d21135	Merge branch 'master' of https://github.com/friendica/red	2013-09-27 02:45:16 +01:00
Thomas Willingham	d6607f2093	Minor theme stuff - make the pages toolbar a toolbar, get rid of a naughty center tag, and stop very long tags overlapping the directory.	2013-09-27 02:44:28 +01:00
friendica	8e94e79c7b	Merge https://github.com/friendica/red into zpull	2013-09-26 16:26:08 -07:00
friendica	edc5566f79	structure for channel unions	2013-09-26 16:25:28 -07:00
Olaf Conradi	c81ad135ac	Merge pull request #155 from oohlaf/fixes ... Explain why public comments are disabled and what needs to happen to enable them.	2013-09-26 14:03:26 -07:00
Olaf Conradi	26492b3ad4	Add explanation why public comments are disabled.	2013-09-26 22:57:13 +02:00
Thomas Willingham	689cea3170	Typo	2013-09-26 18:26:03 +01:00
friendica	6519433301	suppress creating the directory update record for profile updates which are part of the normal import_xchan sequence - otherwise we get two for every change. Create it normally if we are called with a profile_update message and don't go through the whole import_xchan thing.	2013-09-25 21:22:36 -07:00
friendica	00e5ded1c8	populate the new fields in the directory updates table	2013-09-24 20:13:53 -07:00
friendica	d62508072c	don't send email notifications for likes (as comment notifications). We'll need a separate preference for whether you want notifications for likes.	2013-09-24 19:43:28 -07:00
friendica	2a0406ec8c	add some text for issue #79	2013-09-24 19:23:39 -07:00
Olaf Conradi	a2ee22e51f	Merge pull request #154 from oohlaf/fixes ... Fix name of Bleichenbacher	2013-09-24 12:06:57 -07:00
Olaf Conradi	66d2fe2289	Fix name of Bleichenbacher	2013-09-24 21:04:01 +02:00
zzottel	e9a51797a2	Merge pull request #153 from zzottel/master ... Fix observer=1 tag. Using only observer without =1 won't work anymore	2013-09-24 05:39:37 -07:00
zottel	5092ae9e2b	Fix observer=1 tag. Using only observer without =1 won't work anymore now.	2013-09-24 14:35:47 +02:00
friendica	5ee339c99e	Merge https://github.com/friendica/red into zpull	2013-09-24 05:22:07 -07:00
friendica	d4ea56a77e	reduce susceptibility to bleichenberger attack	2013-09-24 05:20:29 -07:00
friendica	c9b485bc3e	Merge pull request #152 from MicMee/master ... Preparation for maintenance od hubloc/server	2013-09-24 01:52:48 -07:00
Michael Meer	a37986cdc0	added new smarty template admin_hubloc.tpl	2013-09-24 09:33:52 +02:00
Michael Meer	54823a6589	admin hubloc page now with content from all hublocs, in next steps I add some tests with zping and reduce the content to known problems.	2013-09-24 09:28:42 +02:00
friendica	1f916adfb8	spice this up a little bit...	2013-09-23 18:38:08 -07:00
friendica	32416a915a	Merge https://github.com/friendica/red into zpull	2013-09-23 18:28:07 -07:00
friendica	15ce90e69c	oauth settings - clarify text	2013-09-23 18:27:23 -07:00
friendica	c1234d6f5f	Merge pull request #151 from zzottel/master ... add [observer] tags and [observer.baseurl]	2013-09-23 16:50:06 -07:00
zottel	e79bc29244	add [observer] tags and [observer.baseurl]	2013-09-23 13:26:23 +02:00
friendica	a2b20bd58f	one more edge case in the public perms - don't match perms = 0 which is private, this and prior checkin are for issue #114	2013-09-22 23:00:55 -07:00
friendica	956d275693	fixes for display and search privacy enforcement	2013-09-22 22:52:48 -07:00
friendica	3ff9642750	update ru strings	2013-09-22 21:18:15 -07:00