| 
							
						 | 
						
							
							
								
							
							
	bbd5878734
						 | 
						
							
							
								
								
								Merge pull request #2449 from rabuzarus/1404_reworked_autocomplete
							
							
							
							
							
							
							
							new autocompletion 
							
						 | 
						
							2016-04-16 08:16:21 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rabuzarus
								
							 
						 | 
						
							
							
								
							
							
	ce1faf17d1
						 | 
						
							
							
								
								
								rework autocomplete: some polishing
							
							
							
							
							
						 | 
						
							2016-04-14 17:05:19 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rabuzarus
								
							 
						 | 
						
							
							
								
							
							
	01b02dbcaa
						 | 
						
							
							
								
								
								Merge develop into 1404_reworked_autocomplete
							
							
							
							
							
							
							
							Conflicts:
	include/text.php
	view/templates/head.tpl
	view/theme/duepuntozero/style.css
	view/theme/vier/style.css 
							
						 | 
						
							2016-04-14 16:23:51 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	d6a79abb68
						 | 
						
							
							
								
								
								Bugfix: "default_group" behaviour wasn't implemented correctly
							
							
							
							
							
						 | 
						
							2016-04-13 22:21:23 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	018b3ed25f
						 | 
						
							
							
								
								
								API: Just some more elements where Twidere has problems ...
							
							
							
							
							
						 | 
						
							2016-04-12 22:53:54 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	34dc23b871
						 | 
						
							
							
								
								
								API: Improvement for Twidere/Conversation call improved
							
							
							
							
							
						 | 
						
							2016-04-09 22:44:32 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	dfa5183774
						 | 
						
							
							
								
								
								Merge pull request #2441 from rabuzarus/0704_doxygen_forum
							
							
							
							
							
							
							
							Update ForumManager.php 
							
						 | 
						
							2016-04-07 21:06:32 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rabuzarus
								
							 
						 | 
						
							
							
								
							
							
	d5bf386cf7
						 | 
						
							
							
								
								
								Update ForumManager.php - small correction
							
							
							
							
							
						 | 
						
							2016-04-07 16:58:26 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rabuzarus
								
							 
						 | 
						
							
							
								
							
							
	a3c79d2007
						 | 
						
							
							
								
								
								Update ForumManager.php
							
							
							
							
							
							
							
							fix some doxygen description 
							
						 | 
						
							2016-04-07 14:43:56 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	952f8514a5
						 | 
						
							
							
								
								
								"remember me" in session does work now
							
							
							
							
							
						 | 
						
							2016-04-05 23:28:33 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	b9d9ffbd01
						 | 
						
							
							
								
								
								Merge pull request #2429 from annando/1604-item-shadow
							
							
							
							
							
							
							
							New post update function, search is now using the "global" field 
							
						 | 
						
							2016-04-03 19:55:34 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	1f61efc7fe
						 | 
						
							
							
								
								
								Scrape: Changed detection for the profile link
							
							
							
							
							
						 | 
						
							2016-04-03 19:29:35 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	3fdaafd54a
						 | 
						
							
							
								
								
								Some more documentation
							
							
							
							
							
						 | 
						
							2016-04-03 18:49:41 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	f192767d7a
						 | 
						
							
							
								
								
								Some reverted stuff
							
							
							
							
							
						 | 
						
							2016-04-03 16:38:32 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	9f57425d08
						 | 
						
							
							
								
								
								Post update ist now done.
							
							
							
							
							
						 | 
						
							2016-04-03 16:36:05 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	beb1e04069
						 | 
						
							
							
								
								
								New field in item table ("shadow") that indicates if there is a shadow entry
							
							
							
							
							
						 | 
						
							2016-04-03 13:48:31 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	ce2c1b4fc1
						 | 
						
							
							
								
								
								Small bugfix: We always liked the parent
							
							
							
							
							
						 | 
						
							2016-04-02 17:43:53 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	68b88c0384
						 | 
						
							
							
								
								
								Notify and poll aren't fetched at the moment
							
							
							
							
							
						 | 
						
							2016-04-02 15:49:57 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	b4b62493e6
						 | 
						
							
							
								
								
								Bugfix: The nickname vanished/better way to fetch the alias
							
							
							
							
							
						 | 
						
							2016-04-02 15:41:55 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	e5377a5e91
						 | 
						
							
							
								
								
								Merge remote-tracking branch 'upstream/develop' into 1604-salmon-like
							
							
							
							
							
						 | 
						
							2016-04-02 14:12:02 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	fd965b046a
						 | 
						
							
							
								
								
								Update contact data for uid=0 at feed import
							
							
							
							
							
						 | 
						
							2016-04-02 14:10:40 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	c30306e085
						 | 
						
							
							
								
								
								Merge pull request #2424 from annando/1603-scrape-alias
							
							
							
							
							
							
							
							Scrape: Always take the first alias 
							
						 | 
						
							2016-04-02 09:48:31 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	bc05984786
						 | 
						
							
							
								
								
								Only update contact when scrape runs with "probe_normal"
							
							
							
							
							
						 | 
						
							2016-04-02 09:06:10 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	08fb662b4a
						 | 
						
							
							
								
								
								OStatus: Salmon now works with "likes"/The alias is stored now as well
							
							
							
							
							
						 | 
						
							2016-04-02 00:24:56 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	eeb462cd04
						 | 
						
							
							
								
								
								Only update the contact entry with uid=0
							
							
							
							
							
						 | 
						
							2016-04-01 21:41:37 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	416a0e5ec2
						 | 
						
							
							
								
								
								Don't optimize the tables when the maximum size is lower than zero
							
							
							
							
							
						 | 
						
							2016-04-01 21:09:52 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	ffcc5f372f
						 | 
						
							
							
								
								
								Some more documentation
							
							
							
							
							
						 | 
						
							2016-03-31 22:24:54 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	d0b8f2092d
						 | 
						
							
							
								
								
								Some more documentation
							
							
							
							
							
						 | 
						
							2016-03-31 22:01:56 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	ffd73d137b
						 | 
						
							
							
								
								
								Added some documentation
							
							
							
							
							
						 | 
						
							2016-03-31 07:34:13 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	6ff5c23d50
						 | 
						
							
							
								
								
								Doxygen structure added
							
							
							
							
							
						 | 
						
							2016-03-31 00:14:51 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	1f2c495cd8
						 | 
						
							
							
								
								
								Tempory file is deleted
							
							
							
							
							
						 | 
						
							2016-03-30 23:26:37 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	2c5b5c1cd4
						 | 
						
							
							
								
								
								OStatus class is now moved into the right place
							
							
							
							
							
						 | 
						
							2016-03-30 23:25:20 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	7be0020da9
						 | 
						
							
							
								
								
								Merge remote-tracking branch 'upstream/develop' into 1603-scrape-alias
							
							
							
							
							
						 | 
						
							2016-03-30 12:47:48 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	4a5a964d89
						 | 
						
							
							
								
								
								"Scrape" now respects the new url formats with "index.php"
							
							
							
							
							
						 | 
						
							2016-03-30 12:46:10 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	b93e1d73a1
						 | 
						
							
							
								
								
								New OStatus implementation
							
							
							
							
							
						 | 
						
							2016-03-30 12:43:15 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	4d668fac8b
						 | 
						
							
							
								
								
								Not sure if that is correct ...
							
							
							
							
							
						 | 
						
							2016-03-29 17:54:36 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	f80f4f6a97
						 | 
						
							
							
								
								
								Some changed doxygen header stuff
							
							
							
							
							
						 | 
						
							2016-03-28 22:35:11 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	b6121a0009
						 | 
						
							
							
								
								
								And wow ... some more documentation
							
							
							
							
							
						 | 
						
							2016-03-28 00:06:46 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	7e711d9d62
						 | 
						
							
							
								
								
								And some more doc stuff
							
							
							
							
							
						 | 
						
							2016-03-27 23:38:35 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	faa9b77a90
						 | 
						
							
							
								
								
								Some more small documentation stuff
							
							
							
							
							
						 | 
						
							2016-03-27 23:25:32 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	16ef9f4940
						 | 
						
							
							
								
								
								Support for the new contact request data type
							
							
							
							
							
						 | 
						
							2016-03-25 00:49:18 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	7e7cac19f6
						 | 
						
							
							
								
								
								Avoid a guid whith spaces.
							
							
							
							
							
						 | 
						
							2016-03-24 21:32:55 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	ec90a9e6ad
						 | 
						
							
							
								
								
								Merge remote-tracking branch 'upstream/develop' into 1602-diaspora
							
							
							
							
							
						 | 
						
							2016-03-24 16:19:52 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	7bf079d858
						 | 
						
							
							
								
								
								Some more documentation - again.
							
							
							
							
							
						 | 
						
							2016-03-24 15:59:53 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	24afcdd5dd
						 | 
						
							
							
								
								
								Scrape: Always take the first alias
							
							
							
							
							
						 | 
						
							2016-03-24 08:35:06 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	7aae852fe0
						 | 
						
							
							
								
								
								Some more code cleaning
							
							
							
							
							
						 | 
						
							2016-03-23 22:12:08 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	799ff77797
						 | 
						
							
							
								
								
								API: Support for the conversation api call from GNU Social
							
							
							
							
							
						 | 
						
							2016-03-23 10:24:01 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	ac35f8c756
						 | 
						
							
							
								
								
								If the message already exists then the message id should be returned
							
							
							
							
							
						 | 
						
							2016-03-23 09:22:59 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	28dfaa694c
						 | 
						
							
							
								
								
								Add OEmbed data to the body of reshares
							
							
							
							
							
						 | 
						
							2016-03-23 07:36:17 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	e8c07aaac6
						 | 
						
							
							
								
								
								Merge remote-tracking branch 'upstream/develop' into 1602-diaspora
							
							
							
							
							
						 | 
						
							2016-03-23 06:59:20 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 |