| 
								
								
									 Fabrixxm | 4748b6c4c3 | remove unneeded logger function | 2013-06-27 09:58:39 -04:00 |  | 
				
					
						| 
								
								
									 Fabrixxm | 0a1697d13a | add pubsubhubbub support to feed contacts | 2013-06-27 09:51:13 -04:00 |  | 
				
					
						| 
								
								
									 friendica | 9ae4c1fb32 | ignore hex escapes as numeric tags | 2013-06-26 04:58:54 -07:00 |  | 
				
					
						| 
								
								
									 friendica | bfc9cfb82f | put tags in items | 2013-06-26 04:02:04 -07:00 |  | 
				
					
						| 
								
								
									 Michael Vogel | 16737298b4 | Merge remote-tracking branch 'upstream/master' | 2013-06-22 18:31:28 +02:00 |  | 
				
					
						| 
								
								
									 Michael Vogel | e4ce383f2f | It's now possible to authenticate an ejabberd server against friendica. See auth_ejabberd.php for details how to install. | 2013-06-22 17:34:52 +02:00 |  | 
				
					
						| 
								
								
									 friendica | 407473f2ce | Merge https://github.com/friendica/friendica into pull | 2013-06-21 05:02:43 -07:00 |  | 
				
					
						| 
								
								
									 friendica | 1c10cf1ad7 | --  #039; is not a tag | 2013-06-21 05:00:30 -07:00 |  | 
				
					
						| 
								
								
									 fabrixxm | 5cdeef22ea | pager: fix stupid typo | 2013-06-19 14:28:39 +02:00 |  | 
				
					
						| 
								
								
									 fabrixxm | e3bb058e9f | Merge pull request #697 from annando/master API can now fetch posts from a single thread | 2013-06-17 05:09:54 -07:00 |  | 
				
					
						| 
								
								
									 Michael Vogel | e246c53b45 | API: Changed "parent_id" to "conversation_id" since that reflects better the meaning of this programming. | 2013-06-16 13:42:43 +02:00 |  | 
				
					
						| 
								
								
									 Michael Vogel | e7aa2b99a1 | OStatus: identi.ca seemed to have changed the format of activity streams for their migration. This fixes it API: It is now possible to fetch only posts from one thread. | 2013-06-16 13:28:04 +02:00 |  | 
				
					
						| 
								
								
									 Fabrixxm | faa510befc | move html from paginate functions to template | 2013-06-13 08:12:15 -04:00 |  | 
				
					
						| 
								
								
									 friendica | efce5ae1b9 | Merge https://github.com/friendica/friendica into pull | 2013-06-12 21:42:20 -07:00 |  | 
				
					
						| 
								
								
									 friendica | 2464915817 | don't try to parse empty xml with simplepie, throws conversion warning | 2013-06-12 21:41:07 -07:00 |  | 
				
					
						| 
								
								
									 Fabrixxm | bea89c17fe | uimport: set contacts 'avatar-date' to zero. should fix issue #692 | 2013-06-12 03:51:53 -04:00 |  | 
				
					
						| 
								
								
									 Michael Vogel | 323186864e | Merge remote-tracking branch 'upstream/master' | 2013-06-08 12:30:36 +02:00 |  | 
				
					
						| 
								
								
									 Michael Vogel | a2cef94d8b | ostatus completion of threads now works with longer threads well. | 2013-06-08 12:28:19 +02:00 |  | 
				
					
						| 
								
								
									 friendica | 8fe82d35d4 | Merge https://github.com/friendica/friendica into pull | 2013-05-28 04:53:27 -07:00 |  | 
				
					
						| 
								
								
									 friendica | b60e42d2fa | provide bbcode translation for imported red zmg tag (img tag with zot-id) | 2013-05-28 04:52:22 -07:00 |  | 
				
					
						|  | 2b09b8ae17 | make red# available as a smilie | 2013-05-27 08:34:12 +02:00 |  | 
				
					
						| 
								
								
									 friendica | 3381afab3d | Merge https://github.com/friendica/friendica into pull | 2013-05-20 17:37:23 -07:00 |  | 
				
					
						| 
								
								
									 friendica | a1c4d0ca93 | fix include paths when started via cmdline | 2013-05-20 17:36:29 -07:00 |  | 
				
					
						| 
								
								
									 Michael Vogel | 0723933c1c | removing of hashtag addresses is now hidden behind a configuration | 2013-05-19 11:08:08 +02:00 |  | 
				
					
						| 
								
								
									 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 |  | 
				
					
						|  | 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 |  |