1858 commits

Author	SHA1	Message	Date
Zach Prezkuta	9fbe921051	auto-orient uploaded wall photos and profile photos also	2012-07-08 09:18:05 -06:00
Zach Prezkuta	6d10374c17	cleanup	2012-07-07 18:50:46 -06:00
Zach Prezkuta	da2ccebed8	fix bugs	2012-07-07 18:50:33 -06:00
Zach Prezkuta	173b3a1b9a	allow more than one embedded private photo	2012-07-07 16:24:20 -06:00
Zach Prezkuta	57635e7684	add function to exclude embedded images when checking message length	2012-07-07 16:24:20 -06:00
friendica	0c5af9f303	Merge pull request #379 from fermionic/events-display-wrong-in-diaspora ... remove check for event description in bb2diaspora	2012-07-07 04:19:15 -07:00
Zach Prezkuta	4fb996d9f7	remove check for event description, since it's not required to create an event	2012-07-06 17:11:25 -06:00
Vasudev Kamath	ba4db236ec	Merge branch 'master' of git://github.com/friendica/friendica	2012-07-06 22:47:27 +05:30
friendica	a6514e81bb	remove obsolete zot encapsulation functions	2012-07-05 20:58:45 -07:00
Zach Prezkuta	47c7fd89ba	my php thinks this is a typo	2012-07-05 20:39:22 -06:00
Zach Prezkuta	5395cf5bd9	clear title and body of items on local delete	2012-07-05 20:07:01 -06:00
friendica	854abcf612	Merge pull request #376 from fermionic/diaspora-prevent-fcontact-race-conditions ... slightly better way of handling last loop	2012-07-05 18:10:32 -07:00
Zach Prezkuta	528d250ded	slightly better way of handling last loop	2012-07-05 19:08:30 -06:00
friendica	09959b1b1c	Merge pull request #375 from fermionic/diaspora-prevent-fcontact-race-conditions ... add some timeouts to prevent deadlock	2012-07-05 18:05:32 -07:00
Zach Prezkuta	5dcce1ed93	add some timeouts to prevent deadlock	2012-07-05 19:01:13 -06:00
friendica	fe984963ed	Merge pull request #373 from fermionic/more-list-fixes ... fix small bug in lists and revert Diaspora list processing to non-Markdo...	2012-07-05 16:03:29 -07:00
Zach Prezkuta	e0607e0238	cleanup some syntax errors in lock.php	2012-07-05 14:27:29 -06:00
Zach Prezkuta	75ed37fb3d	"lock" is a reserved MySQL keyword	2012-07-05 14:27:29 -06:00
Zach Prezkuta	46068935d0	minor cleanup in lock.php	2012-07-05 14:26:42 -06:00
Zach Prezkuta	20c4ecbcd9	cleanup obsolete comments	2012-07-05 14:26:42 -06:00
Zach Prezkuta	168ae40dd2	add rudimentary locking capability to Friendica functions	2012-07-05 14:26:42 -06:00
Zach Prezkuta	041aeaf4a1	fix small bug in lists and revert Diaspora list processing to non-Markdownify version	2012-07-05 12:54:52 -06:00
friendica	360c35e438	recycle symbol woes with multiple html entity encode/decode cycles going on	2012-07-04 23:24:59 -07:00
friendica	e29dd081ca	render the recycle symbol correctly on Diaspora reshares	2012-07-04 22:44:04 -07:00
friendica	f40b056e3b	some initial code and benchmarking for "red" content rendering engine	2012-07-04 20:37:15 -07:00
friendica	0990269555	restore translation of bbcode videos, events, bookmarks, etc. to diaspora	2012-07-04 19:12:09 -07:00
friendica	5589bca1e0	fix !@#$ tinymce linebreaks for the thousandth time	2012-07-04 17:15:43 -07:00
friendica	c726a92a3f	punycode hostname	2012-07-03 21:40:13 -07:00
friendica	ced0a208d8	fix double lines	2012-07-02 16:34:01 -07:00
friendica	315784444a	try and get unadulterated bb2md2html2bb for simple stuff, then we'll work up to harder stuff	2012-07-02 01:11:19 -07:00
friendica	dd71f9446b	config to disable email validation	2012-07-01 18:56:00 -07:00
friendica	6cc844b2f9	restore 'shareable' to feeds after recent feed privacy re-factoring	2012-06-30 05:16:30 -07:00
Fabrixxm	0fb08e3642	nav: pass $baseurl to template	2012-06-29 05:29:29 -04:00
friendica	43036bee98	wrong column name (- vs _)	2012-06-28 21:32:49 -07:00
friendica	1830ecc9ba	remote_self feeds are not private	2012-06-28 18:52:49 -07:00
friendica	a3edbf7e5d	create third privacy state - public post but not searchable or publicly visible	2012-06-28 17:43:29 -07:00
friendica	43d3721fa9	css smiley class	2012-06-28 16:42:40 -07:00
friendica	d7f35c81db	Merge https://github.com/friendica/friendica into pull	2012-06-28 16:05:28 -07:00
friendica	de93c61e0d	remove titles in ostatus even when edited date differs from created date	2012-06-28 16:04:00 -07:00
Zach Prezkuta	cd9ce0ecb3	fix logic for nested lists--should be OR, not AND	2012-06-27 21:21:26 -06:00
Sebastian Egbers	587b081a38	moved api direct message formating to own function. ... added same formating to direct reply message, when posting a new message.	2012-06-26 08:54:01 +02:00
Sebastian Egbers	0f0fb2e2f3	Merge branch 'master' of https://github.com/friendica/friendica	2012-06-26 08:33:41 +02:00
friendica	a4b407eb54	stray s	2012-06-25 22:01:32 -07:00
friendica	d32d0e2154	typos	2012-06-25 21:39:07 -07:00
friendica	78ede4744f	add event titles to discovered birthday events	2012-06-25 21:37:38 -07:00
friendica	0f0ffce1b6	change required doco	2012-06-25 21:27:34 -07:00
friendica	359a98cd22	change event behaviour so that title is required but description is not	2012-06-25 21:20:08 -07:00
friendica	fbaca4b742	event summary/title	2012-06-25 20:55:27 -07:00
friendica	53f0aee82d	Merge https://github.com/friendica/friendica into pull	2012-06-25 18:16:55 -07:00
friendica	f1991a5952	propagate remote deletes	2012-06-25 18:15:56 -07:00