7324 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
friendica	b8569cc27e	fix prettyphoto path	2013-05-07 00:41:00 -07:00
friendica	027f932ff5	add driver param to output queue so we know what protocol to use when faced with multiple choice	2013-05-06 03:55:58 -07:00
friendica	dc028ce8ba	fixes	2013-05-06 02:17:20 -07:00
friendica	524f205caa	photo driver issue when updating contact photos - old class structure used instead of photo_factory()	2013-05-05 22:49:46 -07:00
friendica	175f30d7cc	fix admin assign	2013-05-05 21:27:21 -07:00
friendica	5031015cc5	email notification content privacy by default (unless it's public content)	2013-05-05 20:07:19 -07:00
friendica	6f04a7e070	minor fixes related to postgres development	2013-05-05 19:34:56 -07:00
friendica	ef07b71bc7	incorrect comparison operator	2013-05-02 21:17:35 -07:00
friendica	b33c15d045	members_of_group() output not entirely correct	2013-05-02 20:51:58 -07:00
friendica	9f36fd107f	smarter handling of js_upload source param	2013-05-02 19:04:19 -07:00
friendica	d517b4fdf5	change plugin_install to plugin_load, etc.	2013-05-01 02:23:40 -07:00
friendica	72a770ae36	change the way profiles are imported	2013-04-30 18:16:51 -07:00
friendica	61a66bfb00	Merge branch 'photothread'	2013-04-29 19:59:27 -07:00
friendica	d63de4dbe2	don't try and load an empty string as a photo	2013-04-29 19:52:31 -07:00
friendica	641e69ef7f	fix broken profile syncing	2013-04-29 18:47:34 -07:00
friendica	04170328b1	add some debugging - update times are changing much faster than they're supposed to. Log what has changed.	2013-04-29 18:21:23 -07:00
friendica	2895890cb8	more directory sync stuff	2013-04-28 23:13:50 -07:00
friendica	608d3c6069	Merge https://github.com/friendica/red into zpull	2013-04-28 22:47:05 -07:00
friendica	50db4a7120	port superblock core code (except Red will use an xchan instead of a URL)	2013-04-28 22:46:07 -07:00
Thomas Willingham	9c64427047	Redundant CSS	2013-04-27 19:45:08 +01:00
friendica	ac64c93bf8	doc update	2013-04-26 15:09:35 -07:00
friendica	607d05e48f	rev update	2013-04-26 15:06:40 -07:00
friendica	24492f271b	Merge pull request #49 from beardy-unixer/master ... Add colorbox	2013-04-26 15:03:52 -07:00
Thomas Willingham	2f43553542	Unbork smarty templates.	2013-04-26 23:00:10 +01:00
Thomas Willingham	6383203ebc	Stupid mistake	2013-04-26 22:45:20 +01:00
Thomas Willingham	60721f4292	Colorbox	2013-04-26 22:31:50 +01:00
friendica	72e83f69bc	photo driver abstraction	2013-04-25 20:01:24 -07:00
friendica	d3b5e67890	odds and ends in prepearation for photo abstraction, plus red-to-friendica addon	2013-04-25 01:55:35 -07:00
friendica	9d564913f6	dba driver cleanup	2013-04-23 04:52:03 -07:00
friendica	9bff33f112	remove old driver	2013-04-22 21:40:33 -07:00
friendica	150b18005a	cleanup debugging code in abstracted db driver	2013-04-22 21:14:11 -07:00
friendica	552f03122c	db abstraction layer	2013-04-22 20:02:21 -07:00
friendica	7621bd3bb1	reverting to fancybox for "save to file" selection box until we find a better way - prettyPhoto just isn't working for this and I really need this functionality ATM until we can figure out how to make prettyPhoto work properly here.	2013-04-21 22:12:18 -07:00
friendica	868a1877d2	sql error on contact removal	2013-04-19 04:47:49 -07:00
friendica	9e22ec928b	more umbilical cutting	2013-04-18 21:06:31 -07:00
friendica	0fbb3b6a97	for directory sync, ensure we have a fallback master; even if we have nothing else	2013-04-18 20:47:35 -07:00
friendica	2679a5990e	small issue with zid returning incorrect result on your own channel link	2013-04-18 19:11:28 -07:00
friendica	db038c5654	turn naked links in posts into zrl's if we've got a hubloc for the site	2013-04-18 17:55:35 -07:00
friendica	ba1cb0bb05	move js from module to to module-specific js file	2013-04-17 22:45:22 -07:00
friendica	e99b9376a0	poke doco and cleanup	2013-04-17 22:44:53 -07:00
friendica	c2fe3fd8fe	poke bugfix	2013-04-17 22:15:38 -07:00
friendica	5f27e29bb8	basic poke working	2013-04-17 21:40:40 -07:00
friendica	4d5eade991	That was a bit premature. I'll hold these for now until they're more production ready.	2013-04-17 18:55:26 -07:00
friendica	3e1b005de0	start of DB driver abstraction class (we'll need similar mechanisms for the GD/ImageMagick photo stuff and perhaps also for abstracting alternate "social networks")	2013-04-17 01:47:36 -07:00
friendica	f72d351224	Merge branch 'master' into photothread	2013-04-16 20:16:44 -07:00
friendica	23f897b8ae	fix marking events seen	2013-04-16 19:59:12 -07:00
friendica	2217a3033d	oops	2013-04-16 16:41:08 -07:00
friendica	3c89d3160a	add Red detection to parse_url	2013-04-16 16:39:38 -07:00
friendica	5c43c57ce1	doc update	2013-04-16 16:23:35 -07:00
friendica	2ccb8c2e2b	more doco	2013-04-16 16:22:37 -07:00