| 
							
						 | 
						
							
							
								
							
							
	310ad912fa
						 | 
						
							
							
								
								
								rev up
							
							
							
							
							
							
							
							in preperation for the big pull 
							
						 | 
						
							2014-06-14 14:09:18 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	248b4fbcce
						 | 
						
							
							
								
								
								rev up
							
							
							
							
							
						 | 
						
							2014-05-29 14:44:19 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									fabrixxm
								
							 
						 | 
						
							
							
								
							
							
	77a54c66be
						 | 
						
							
							
								
								
								Merge pull request #998 from annando/master
							
							
							
							
							
							
							
							"Vier": New font version, fallback for oembed, more tracking variables removed 
							
						 | 
						
							2014-05-29 14:04:04 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	b6c1d7dc2b
						 | 
						
							
							
								
								
								fetching the hostname from the .htpreconfig.php if present
							
							
							
							
							
						 | 
						
							2014-05-29 11:40:54 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	5a55541dbd
						 | 
						
							
							
								
								
								rev up
							
							
							
							
							
						 | 
						
							2014-05-25 08:00:22 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	2846dfeb05
						 | 
						
							
							
								
								
								Ther eis now a user setting to disabled notices. The Diaspora reshare now checks for empty values.
							
							
							
							
							
						 | 
						
							2014-04-26 02:22:30 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	77986d76fa
						 | 
						
							
							
								
								
								Preparations for statusnet connector import
							
							
							
							
							
						 | 
						
							2014-04-04 10:40:46 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	6b8585d48d
						 | 
						
							
							
								
								
								Database stuff. New table "thread". Changing "left join" to "inner join", removing "limit 1" at update and delete.
							
							
							
							
							
						 | 
						
							2014-03-09 09:19:14 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	17236b1801
						 | 
						
							
							
								
								
								Merge remote-tracking branch 'upstream/master'
							
							
							
							
							
							
							
							Conflicts:
	include/acl_selectors.php 
							
						 | 
						
							2014-01-13 19:59:34 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	43e916e81a
						 | 
						
							
							
								
								
								New network constant for the Diaspora posting connector.
							
							
							
							
							
						 | 
						
							2014-01-13 19:57:15 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	b23ce65035
						 | 
						
							
							
								
								
								rev update
							
							
							
							
							
						 | 
						
							2014-01-06 07:36:57 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	aed28a24f1
						 | 
						
							
							
								
								
								Merge remote-tracking branch 'upstream/master'
							
							
							
							
							
							
							
							Conflicts:
	mod/crepair.php 
							
						 | 
						
							2014-01-05 16:22:42 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	28df35052a
						 | 
						
							
							
								
								
								Send notifications for each new post of a contact, option for creating a summary for a feed post
							
							
							
							
							
						 | 
						
							2014-01-05 16:10:02 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	0d159a77a7
						 | 
						
							
							
								
								
								rev update
							
							
							
							
							
						 | 
						
							2014-01-03 10:02:17 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	573e0128d6
						 | 
						
							
							
								
								
								rev update
							
							
							
							
							
						 | 
						
							2013-12-31 18:01:20 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	5130b19f5e
						 | 
						
							
							
								
								
								API: API is reworked in many parts so that it should be compatible to more statusnet clients then before (like AndStatus)
							
							
							
							
							
						 | 
						
							2013-12-15 23:00:47 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	e0cf2c5167
						 | 
						
							
							
								
								
								Merge remote-tracking branch 'upstream/master'
							
							
							
							
							
							
							
							Conflicts:
	mod/admin.php
	mod/settings.php 
							
						 | 
						
							2013-12-02 00:33:46 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	6684107b66
						 | 
						
							
							
								
								
								multiple admin mails. It is now possible to define more than one admin mail address. You can now add multiple addresses, separated by comma.
							
							
							
							
							
						 | 
						
							2013-12-02 00:11:31 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mats Sjöberg
								
							 
						 | 
						
							
							
								
							
							
	2859ce1483
						 | 
						
							
							
								
								
								Initial implementation of internal PuSH server in Friendica. It has been tested with GNU Social/StatusNet, and subscribe, unsubscribe and pushing new items seem to work.
							
							
							
							
							
						 | 
						
							2013-11-21 21:44:18 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	8feeba7af5
						 | 
						
							
							
								
								
								rev update
							
							
							
							
							
						 | 
						
							2013-11-07 10:06:10 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	53c06a3625
						 | 
						
							
							
								
								
								Several performance improvements.
							
							
							
							
							
						 | 
						
							2013-11-02 10:49:44 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	711972a166
						 | 
						
							
							
								
								
								Merge remote-tracking branch 'upstream/master'
							
							
							
							
							
						 | 
						
							2013-10-25 23:35:03 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	0ffeb4cf92
						 | 
						
							
							
								
								
								New field "network" in item table to speed up the system.
							
							
							
							
							
						 | 
						
							2013-10-25 23:33:53 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									fabrixxm
								
							 
						 | 
						
							
							
								
							
							
	6a2a54c9be
						 | 
						
							
							
								
								
								Merge pull request #792 from annando/master
							
							
							
							
							
							
							
							Bugfix: The function "exif_imagetype" doesn't seem to be available at every system. So we emulate it. 
							
						 | 
						
							2013-10-23 00:02:51 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	5b6e16d193
						 | 
						
							
							
								
								
								The emulation for the exif function is now much more sleaker
							
							
							
							
							
						 | 
						
							2013-10-22 16:19:55 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	d6f3de09e8
						 | 
						
							
							
								
								
								Bugfix: The function "exif_imagetype" doesn't seem to be available at every system. So we emulate it.
							
							
							
							
							
						 | 
						
							2013-10-22 16:08:29 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Fabrixxm
								
							 
						 | 
						
							
							
								
							
							
	008eef17c0
						 | 
						
							
							
								
								
								clear_cache() check if cache dir is writable before opening it
							
							
							
							
							
						 | 
						
							2013-10-21 14:03:01 -04:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	6f5589fed3
						 | 
						
							
							
								
								
								rev update
							
							
							
							
							
						 | 
						
							2013-10-20 15:31:10 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Fabrixxm
								
							 
						 | 
						
							
							
								
							
							
	bf4246842a
						 | 
						
							
							
								
								
								bump version to 3.2, add changelog
							
							
							
							
							
						 | 
						
							2013-10-14 03:53:23 -04:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	d5ae5ecedd
						 | 
						
							
							
								
								
								- Improved speed due to forced indexes when showing items.
							
							
							
							
							
							
							
							- Possibility to setup a hostname 
							
						 | 
						
							2013-09-15 10:40:58 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	159a7bda85
						 | 
						
							
							
								
								
								Prepearations for queueing of twitter messages
							
							
							
							
							
						 | 
						
							2013-09-05 08:34:54 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	34e7206ba4
						 | 
						
							
							
								
								
								Preparations for the pumpio synchronisation.
							
							
							
							
							
						 | 
						
							2013-08-28 08:56:48 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	bfc9cfb82f
						 | 
						
							
							
								
								
								put tags in items
							
							
							
							
							
						 | 
						
							2013-06-26 04:02:04 -07: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
								
							 
						 | 
						
							
							
								
							
							
	faa510befc
						 | 
						
							
							
								
								
								move html from paginate functions to template
							
							
							
							
							
						 | 
						
							2013-06-13 08:12:15 -04:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	2464915817
						 | 
						
							
							
								
								
								don't try to parse empty xml with simplepie, throws conversion warning
							
							
							
							
							
						 | 
						
							2013-06-12 21:41:07 -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 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	0cc641fbbc
						 | 
						
							
							
								
								
								messaging
							
							
							
							
							
						 | 
						
							2013-05-22 22:30:53 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	ed6ca1d384
						 | 
						
							
							
								
								
								rev update
							
							
							
							
							
						 | 
						
							2013-05-21 22:37:51 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	a1c4d0ca93
						 | 
						
							
							
								
								
								fix include paths when started via cmdline
							
							
							
							
							
						 | 
						
							2013-05-20 17:36:29 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	6ec1bd2fa8
						 | 
						
							
							
								
								
								double quotes in title mess up editpost
							
							
							
							
							
						 | 
						
							2013-05-18 16:02:31 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	0ce68665c6
						 | 
						
							
							
								
								
								check_config is gone - use check_db
							
							
							
							
							
						 | 
						
							2013-05-13 17:22:07 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	aee7429967
						 | 
						
							
							
								
								
								Merge https://github.com/friendica/friendica into pull
							
							
							
							
							
						 | 
						
							2013-05-11 17:04:51 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	e8fc26e74e
						 | 
						
							
							
								
								
								rev update
							
							
							
							
							
						 | 
						
							2013-05-11 17:04:23 -07: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
								
							 
						 | 
						
							
							
								
							
							
	2c8d33a6e2
						 | 
						
							
							
								
								
								rev update
							
							
							
							
							
						 | 
						
							2013-05-09 01:15:22 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Zach Prezkuta
								
							 
						 | 
						
							
							
								
							
							
	fec4581f34
						 | 
						
							
							
								
								
								basic video playback support using VideoJS
							
							
							
							
							
						 | 
						
							2013-05-03 18:17:56 -06:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	ed5768c4a3
						 | 
						
							
							
								
								
								optimise cachefile logic - still not sure why the cachefile profiling was getting triggered on a site with no cachefile configured
							
							
							
							
							
						 | 
						
							2013-05-02 21:59:20 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	185d29c41e
						 | 
						
							
							
								
								
								undefined element
							
							
							
							
							
						 | 
						
							2013-05-02 21:42:34 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 |