2315 commits

Author	SHA1	Message	Date
Michael Vogel	03c489150c	Merge remote-tracking branch 'upstream/master'	2013-05-17 08:08:34 +02:00
Michael Vogel	d4240a265b	When converting to HTML, hashtag addresses are now removed (only when the message is exported)	2013-05-15 22:20:06 +02:00
Zach Prezkuta	35358baac9	update to v4.0.0; point to local host of SWF	2013-05-11 10:55:09 -06:00
fermionic	3a13aba62e	Merge pull request #674 from fermionic/20130503-basic-video-support ... basic video playback support using VideoJS	2013-05-11 08:33:36 -07:00
friendica	ef4ebd8546	remove stub code	2013-05-09 01:17:11 -07:00
friendica	3339f55310	Merge https://github.com/friendica/friendica into pull	2013-05-09 01:15:40 -07:00
friendica	2c8d33a6e2	rev update	2013-05-09 01:15:22 -07:00
fabrixxm	2da4f8268e	fix smarty3 folder not writable message	2013-05-08 11:34:30 +03:00
Fabrixxm	4bf41b8e5d	check if view/smarty3 folder is writable by webserver	2013-05-08 03:26:20 -04:00
Zach Prezkuta	fec4581f34	basic video playback support using VideoJS	2013-05-03 18:17:56 -06:00
friendica	886c3d1472	bad checkin	2013-05-02 22:19:16 -07:00
friendica	cc8a4fbf16	Merge pull request #672 from cpfeiffer/email-notification-sitename-fix ... fix reading sitename config	2013-04-29 22:41:32 -07:00
Carsten Pfeiffer	5ee19401c4	pgettext needs dba.php for q()	2013-04-29 22:51:08 +02:00
friendica	1d358fe6de	system support for complete blocking	2013-04-28 21:02:53 -07:00
friendica	61a0f9c196	bug #540 and hush up a couple of log messages that are way too verbose	2013-04-28 04:30:20 -07:00
Carsten Pfeiffer	7f6a7af2b3	fix reading sitename config	2013-04-27 21:40:40 +02:00
friendica	1ed6a2bd3d	rev update	2013-04-25 02:36:52 -07:00
Fabrixxm	d36292c532	template: set smarty3 as default template engine in theme info array. ... remove commented code from get_markup_template. add check for $root/$filename in get_template_file.	2013-04-23 03:35:31 -04:00
Fabrixxm	6fddd1cbbf	template: remove old 'internal' template files, move smarty3 templates into 'templates' subdir	2013-04-23 03:35:31 -04:00
Fabrixxm	ddf1caf0fd	template engine rework ... - use smarty3 as default engine - new pluggable template engine system	2013-04-23 03:27:52 -04:00
Fabrixxm	dd02b7bd00	drop items to group pages if no mentions in it. should fix bug 557	2013-04-19 09:55:07 -04:00
Tobias Diekershoff	960d1d99b2	invalid arguments for a foreach loop found	2013-04-17 17:32:31 +02:00
Fabrixxm	659d0cc1b8	uimport remove db scheme version check	2013-04-08 09:03:31 -04:00
Fabrixxm	1442fecd14	uimport: fix file formatting	2013-04-02 09:44:19 -04:00
Fabrixxm	13e315e004	uimport: check table columns before import	2013-04-02 09:16:24 -04:00
Matthew Exon	5b158dbcfb	Make the content type available after calling fetch_url	2013-04-01 12:36:43 +08:00
tobiasd	cda327a368	Merge pull request #658 from annando/master ... Mail importing problems, a small "vier" change	2013-03-30 01:46:13 -07:00
Michael Vogel	f7fbac2e2b	Merge remote-tracking branch 'upstream/master'	2013-03-29 11:22:10 +01:00
friendica	74954e6c68	Merge pull request #656 from fabrixxm/master ... phpdocs for include/text.php	2013-03-27 19:44:24 -07:00
Matthew Exon	c3621407d1	Remove debug line added by mistake	2013-03-28 10:29:27 +08:00
Matthew Exon	10b68ef837	Add separate lock file for cronhooks, which might also take a long time and shouldn't be allowed to interfere with itself	2013-03-28 09:49:10 +08:00
Fabrixxm	1a8bdf8ae8	more phpdocs	2013-03-27 10:28:56 +01:00
Fabrixxm	a161b86d1f	add phpdoc	2013-03-27 05:11:40 -04:00
tobiasd	e7c705c9a1	Merge pull request #654 from mexon/filter_var ... Use filter_var instead of parse_url to validate URLs, since the latter r...	2013-03-26 11:31:11 -07:00
fermionic	04a255e393	Merge pull request #652 from mexon/edited_timestamp ... items.php edited timestamp logic	2013-03-24 07:30:07 -07:00
Matthew Exon	c7cfc6b170	Use filter_var instead of parse_url to validate URLs, since the latter returns true even for invalid URLs, in particular the empty string	2013-03-21 16:27:12 +08:00
Matthew Exon	6edc52f78f	Convert received "edited" timestamp to UTC before comparing to what's in the database, and don't overwrite with older items.	2013-03-20 09:00:12 +08:00
friendica	00aab4039d	Merge https://github.com/friendica/friendica into pull	2013-03-19 03:31:37 -07:00
friendica	17cb682ed0	rm addon.old	2013-03-19 03:30:50 -07:00
fermionic	1a49c841d8	Merge pull request #649 from mexon/redirect_fix ... Restore redirect functionality removed by change 452ff19d	2013-03-18 18:06:41 -07:00
friendica	133ef9155d	don't allow deleted accounts to appear on "manage" page	2013-03-18 17:31:21 -07:00
Michael Vogel	111495423c	Imported mails were deleted the second time the poller ran - when moving or deleting of mails was activated.	2013-03-14 23:15:15 +01:00
Matthew Exon	c53bdfb163	Restore redirect functionality removed by change 452ff19d	2013-03-14 14:09:42 +08:00
fermionic	3399b1ccf6	Merge pull request #648 from mexon/mailstream-prerequisites ... Mailstream prerequisites	2013-03-10 15:34:54 -07:00
fermionic	91a6a1cb25	Merge pull request #646 from annando/master ... OStatus conversations, "vier" and diaspora android client	2013-03-10 15:24:27 -07:00
Matthew Exon	720a44bb0b	The post_remote_end hook was being called with an escaped version of the item, not very useful. This change moves the hook to the end of item_store and gets all data fresh from the database.	2013-03-09 15:57:50 +08:00
Matthew Exon	4df162d929	Explicitly list protocols that are allowed, rather than using their initials. Also, add cid, which I need for my mailstream plugin to work.	2013-03-09 15:57:40 +08:00
Michael Vogel	e200040c5b	Merge remote-tracking branch 'upstream/master'	2013-03-07 20:20:12 +01:00
Michael Vogel	5d3613c8bc	Vier: The change from blue to black in links is now faded as well.	2013-03-07 19:34:54 +01:00
Fabrixxm	a92ef6f0fe	remove authentication from api help/test. fix issue 552. ... identi.ca don't ask for auth on help/test.	2013-03-07 08:16:53 -05:00