2044 commits

Author	SHA1	Message	Date
friendica	2abbd1dc19	permissions selector showing up for guests, testbubble and smoothly	2012-09-15 20:21:17 -07:00
friendica	669d2b890e	rev update - add cancel markup to editor	2012-09-15 15:23:15 -07:00
friendica	32d4a359f1	reverse the default newuser privacy setting to public. Sites can over-ride.	2012-09-13 19:11:07 -07:00
friendica	d19a3b8324	provide separate hashtag and mentions for themes in addition to composite tags	2012-09-13 16:59:25 -07:00
friendica	f4e3f335ef	don't allow followers to get a post through unless it's a tag deliver	2012-09-12 18:53:20 -07:00
friendica	3d6c49d5b3	Merge https://github.com/friendica/friendica into pull	2012-09-12 17:20:52 -07:00
friendica	db09724aec	use local photo for tag notifications if available	2012-09-12 17:19:26 -07:00
Domovoy	67563d5c82	Fallback to gd if Imagick can't load the data	2012-09-12 11:55:09 +02:00
Domovoy	16eec24a21	Tabs trouble? What happened? I sure aven't changed anything to my editor...	2012-09-10 10:36:30 +02:00
Domovoy	1b82df60db	Port friendica/friendica#79012bf8882baa6843726bcffbcafe959028c1bd	2012-09-10 09:50:30 +02:00
Domovoy	bb68461c6d	Merge branch 'master' of https://github.com/friendica/friendica into threaded_items ... Conflicts: include/conversation.php	2012-09-10 09:19:08 +02:00
friendica	5c0f0df59a	provide local_block - block_public as far as content but can connect with the grid.	2012-09-06 20:17:50 -07:00
Thomas Willingham	d0994fc882	Merge branch 'master' of https://github.com/friendica/friendica	2012-09-07 00:44:01 +01:00
Thomas Willingham	5f970aea72	Typo in notifier.	2012-09-07 00:43:05 +01:00
fermionic	9bf8efc45f	Merge pull request #459 from fermionic/individual-choice-of-mobile-theme ... Individual choice of mobile theme	2012-09-06 16:35:04 -07:00
Zach Prezkuta	a089a89478	small twitter improvements	2012-09-06 17:31:05 -06:00
Zach Prezkuta	77529ccdf1	allow individual choice of mobile themes	2012-09-06 17:24:34 -06:00
friendica	1478229abc	allow comments on other folks wall-to-wall postings	2012-09-05 18:24:06 -07:00
friendica	3968dc932f	update writable for dfrn contacts when using local delivery	2012-09-05 16:26:11 -07:00
friendica	9e5fa5b9a9	ignore exif orientation if we can't parse the particular flavour of exif	2012-09-05 04:02:30 -07:00
friendica	411b6a71b4	Merge https://github.com/friendica/friendica into pull	2012-09-04 22:53:32 -07:00
friendica	4cd8233f61	remote_user can now support multiple contacts being logged in at once	2012-09-04 22:50:28 -07:00
Zach Prezkuta	79012bf888	conversation needs preview parameter	2012-09-04 18:47:49 -06:00
friendica	cdf648c0b4	attachments from non-friendica contacts shouldn't go through redir - it won't work	2012-09-03 21:31:35 -07:00
friendica	39c7b34276	rev update	2012-09-02 01:47:04 -07:00
friendica	2ace7d6646	Merge pull request #451 from fabrixxm/master ... fixes and tweaks	2012-08-31 01:26:03 -07:00
Domovoy	ef52ff6b01	Merge branch 'master' of https://github.com/friendica/friendica into threaded_items	2012-08-30 07:47:21 +02:00
Fabrixxm	f433158bed	config: fix get_config and get_pconfig search for serialized array ... works also if the serialized string contains newlines	2012-08-29 04:19:15 -04:00
Zach Prezkuta	f7a1999c15	manually fix escaped underscores in links	2012-08-28 20:12:41 -06:00
fermionic	597e96e156	Merge pull request #447 from fermionic/zrls-and-redir-photos-broken-with-tags ... regular expressions were grabbing too much	2012-08-28 19:03:04 -07:00
fermionic	8c064069d9	Merge pull request #443 from fermionic/new-users-privacy-settings ... automatically make posts private for new users	2012-08-28 19:02:51 -07:00
Fabrixxm	9ecb984285	Merge remote branch 'friendica/master' into bid-prov	2012-08-28 10:38:40 -04:00
Zach Prezkuta	72712175b5	regular expressions were grabbing too much	2012-08-26 14:56:34 -06:00
Zach Prezkuta	193cc2c537	try to get rid of scrollbars in Frost	2012-08-25 22:42:12 -06:00
Zach Prezkuta	f062ccbb66	add documentation; add to admin panel; some tweaks and interface stuff	2012-08-25 15:03:16 -06:00
Zach Prezkuta	bd59f3d152	probably shouldn't require exact match for non-string	2012-08-24 21:46:42 -06:00
Zach Prezkuta	7c5f5f3113	automatically make posts private for new users	2012-08-24 21:28:28 -06:00
Domovoy	9390eda5e6	Revert wall to wall detection based on @ tags (@ can also target a user, not only a forum)	2012-08-24 05:11:39 +02:00
Domovoy	5cd1dde59b	Logic error	2012-08-24 05:04:35 +02:00
Domovoy	72f3d628e8	Merge branch 'wall_to_wall' of github.com:CyberDomovoy/friendica into threaded_items	2012-08-24 04:58:11 +02:00
Domovoy	c9cfc52293	method, not property	2012-08-24 04:57:32 +02:00
Domovoy	71d9c95faf	Merge branch 'wall_to_wall' of github.com:CyberDomovoy/friendica into threaded_items	2012-08-24 04:47:29 +02:00
Domovoy	e3ee997cd3	Fix copy/paste stupidity	2012-08-24 04:45:10 +02:00
Domovoy	8a25c7876c	Better wall to wall detection (fallback on checking if we have a @ tag)	2012-08-24 04:36:03 +02:00
Domovoy	f1bc2afbfe	Merge branch 'master' of https://github.com/friendica/friendica into threaded_items	2012-08-23 10:25:22 +02:00
friendica	386b6d081b	moods	2012-08-22 21:36:55 -07:00
friendica	ff0e0782a5	restore old comment behaviour when threading turned off	2012-08-21 19:41:50 -07:00
friendica	bcec1bddc0	put the real post time into the post	2012-08-19 14:39:43 -07:00
Domovoy	1406480258	Merge branch 'master' of https://github.com/friendica/friendica into threaded_items	2012-08-19 14:14:33 +02:00
friendica	6bc48b58d8	algorithm for crypt tag	2012-08-19 00:35:39 -07:00