Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	dbe52c74b5
						 | 
						
							
							
								
								
								Added Beanow as author, since he did most of the last changes.
							
							
							
							
							
						 | 
						
							2015-02-02 21:03:14 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	9f0e19762e
						 | 
						
							
							
								
								
								New version for "Vier". The navigation was restructured and several other stuff was changed as well, thanks to Beanow!
							
							
							
							
							
						 | 
						
							2015-02-02 21:00:32 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	86afc21841
						 | 
						
							
							
								
								
								Merge pull request #1332 from silke/develop
							
							
							
							
							
							
							
							Added local mail delivery for vagrant (postfix). 
							
						 | 
						
							2015-01-30 22:56:39 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Silke Meyer
								
							 
						 | 
						
							
							
								
							
							
	1f5d8167c7
						 | 
						
							
							
								
								
								Added local mail delivery for vagrant (postfix).
							
							
							
							
							
						 | 
						
							2015-01-30 17:03:42 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									fabrixxm
								
							 
						 | 
						
							
							
								
							
							
	2d02153df1
						 | 
						
							
							
								
								
								Merge pull request #1328 from friendica/release-3.3.3
							
							
							
							
							
							
							
							Update version to 3.3.3-RC 
							
						 | 
						
							2015-01-29 10:18:46 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									fabrixxm
								
							 
						 | 
						
							
							
								
							
							
	4cf36ec2cf
						 | 
						
							
							
								
								
								Update FRIENDICA_VERSION
							
							
							
							
							
						 | 
						
							2015-01-29 09:44:48 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	cfb6d4c5c1
						 | 
						
							
							
								
								
								Merge pull request #1327 from annando/1501-more-stuff-to-proxy
							
							
							
							
							
							
							
							And yet another two places where pictures have to be sent through the proxy 
							
						 | 
						
							2015-01-29 08:19:20 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	036ccf84de
						 | 
						
							
							
								
								
								And yet another two places where pictures have to be sent through the proxy.
							
							
							
							
							
						 | 
						
							2015-01-28 23:34:46 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	b91d8a1039
						 | 
						
							
							
								
								
								Merge pull request #1325 from annando/1501-more-stuff-to-proxy
							
							
							
							
							
							
							
							Just two more places where pictures have to be send through the proxy 
							
						 | 
						
							2015-01-28 11:16:50 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	b309187e3d
						 | 
						
							
							
								
								
								Just two more places where pictures have to be send through the proxy function.
							
							
							
							
							
						 | 
						
							2015-01-28 10:09:16 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									fabrixxm
								
							 
						 | 
						
							
							
								
							
							
	147413507b
						 | 
						
							
							
								
								
								Merge pull request #1320 from tobiasd/20150127adminpanel
							
							
							
							
							
							
							
							add links to the plugin config pages for active plugins 
							
						 | 
						
							2015-01-28 08:24:29 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	5ad8b6abf6
						 | 
						
							
							
								
								
								Merge pull request #1322 from tugelbend/develop
							
							
							
							
							
							
							
							bug fix: syntax error #1321 
							
						 | 
						
							2015-01-28 08:04:04 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	a8206f6fe1
						 | 
						
							
							
								
								
								Merge pull request #1324 from annando/issue-1323
							
							
							
							
							
							
							
							Issue 1323: Contact pictures from the acl selector weren't proxied. 
							
						 | 
						
							2015-01-28 08:03:38 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	c058be9908
						 | 
						
							
							
								
								
								Issue 1323: Contact pictures from the acl selector weren't proxied.
							
							
							
							
							
						 | 
						
							2015-01-28 01:22:42 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									hauke
								
							 
						 | 
						
							
							
								
							
							
	3dcc1da88b
						 | 
						
							
							
								
								
								bug fix: syntax error #1321
							
							
							
							
							
						 | 
						
							2015-01-27 18:21:32 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	d6d7ba87a0
						 | 
						
							
							
								
								
								Merge pull request #1319 from annando/1501-better-contact-list
							
							
							
							
							
							
							
							In private mails the contact list now contains the user address as well 
							
						 | 
						
							2015-01-27 14:36:56 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	3df7370fa8
						 | 
						
							
							
								
								
								add links to the plugin config pages for active plugins
							
							
							
							
							
						 | 
						
							2015-01-27 14:34:11 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	6a34210353
						 | 
						
							
							
								
								
								Merge remote-tracking branch 'upstream/develop' into 1501-better-contact-list
							
							
							
							
							
						 | 
						
							2015-01-27 10:20:00 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	cd7d29d13e
						 | 
						
							
							
								
								
								Merge pull request #1318 from annando/1501-global-contacts
							
							
							
							
							
							
							
							Many enhacenments to the global contacts 
							
						 | 
						
							2015-01-27 08:25:30 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	848c09935a
						 | 
						
							
							
								
								
								The contact list in mails now contains not only the name but also the address.
							
							
							
							
							
						 | 
						
							2015-01-27 08:04:24 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	583c2ce13e
						 | 
						
							
							
								
								
								poco can now be used to query the global contacts.
							
							
							
							
							
						 | 
						
							2015-01-27 08:01:37 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	e8bfa32b37
						 | 
						
							
							
								
								
								Scrape now doesn't fetch page data when its twitter and Co./Update script that updates the contacts from the profile
							
							
							
							
							
						 | 
						
							2015-01-26 01:07:15 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	bc2c046446
						 | 
						
							
							
								
								
								poco: Only update the global contacts when there is a network value/Export your own contact as well
							
							
							
							
							
						 | 
						
							2015-01-25 16:40:20 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	105d6a22a4
						 | 
						
							
							
								
								
								gender will be updated in the profiles as well.
							
							
							
							
							
						 | 
						
							2015-01-25 13:22:25 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	2f400627c7
						 | 
						
							
							
								
								
								Support for keywords and gender in (global) contacts.
							
							
							
							
							
						 | 
						
							2015-01-25 13:19:37 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									fabrixxm
								
							 
						 | 
						
							
							
								
							
							
	44df625bad
						 | 
						
							
							
								
								
								Merge pull request #1305 from tobiasd/20150123-quaddro
							
							
							
							
							
							
							
							making the ignore button in contact suggestions visible in quattro 
							
						 | 
						
							2015-01-25 11:59:17 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									fabrixxm
								
							 
						 | 
						
							
							
								
							
							
	174d78c768
						 | 
						
							
							
								
								
								Merge pull request #1317 from tobiasd/20150125cs
							
							
							
							
							
							
							
							CS update to the strings 
							
						 | 
						
							2015-01-25 11:55:22 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	dff2384e82
						 | 
						
							
							
								
								
								Merge remote-tracking branch 'upstream/develop' into 1501-global-contacts
							
							
							
							
							
						 | 
						
							2015-01-25 08:44:42 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	c35e92b201
						 | 
						
							
							
								
								
								Merge pull request #1314 from annando/1501-better-diaspora-reshare
							
							
							
							
							
							
							
							Diaspora: Reshares are now working more reliable 
							
						 | 
						
							2015-01-25 08:25:02 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	1c424a5425
						 | 
						
							
							
								
								
								Merge pull request #1315 from annando/1501-issue-1283
							
							
							
							
							
							
							
							issue 1283 - Share-it button support for friendica 
							
						 | 
						
							2015-01-25 08:24:21 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	fc62c329c5
						 | 
						
							
							
								
								
								Merge pull request #1316 from annando/issue-1197
							
							
							
							
							
							
							
							Issue 1197: New hook for "oembed_fetch_url" 
							
						 | 
						
							2015-01-25 08:23:52 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	5cb3a0fced
						 | 
						
							
							
								
								
								CS update to the strings
							
							
							
							
							
						 | 
						
							2015-01-25 08:21:55 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	597ef20b71
						 | 
						
							
							
								
								
								"about" and "location" is now included in global contacts as well.
							
							
							
							
							
						 | 
						
							2015-01-25 02:29:46 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	cd41746597
						 | 
						
							
							
								
								
								Moved the "test" folder to "local"
							
							
							
							
							
						 | 
						
							2015-01-25 01:09:47 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	cb9196f6d6
						 | 
						
							
							
								
								
								Issue 1197: New hook for "oembed_fetch_url"
							
							
							
							
							
						 | 
						
							2015-01-25 00:58:51 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	5639f0448b
						 | 
						
							
							
								
								
								Merge pull request #1309 from tobiasd/20150124-defr
							
							
							
							
							
							
							
							DE + FR: update to the core strings 
							
						 | 
						
							2015-01-25 00:43:13 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	4f2af23122
						 | 
						
							
							
								
								
								Merge pull request #1310 from tobiasd/20150124admin
							
							
							
							
							
							
							
							type email for email field in add user form 
							
						 | 
						
							2015-01-25 00:42:11 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	344210bd6d
						 | 
						
							
							
								
								
								Global contacts are now added with reshares as well. Better support for "aboutme" and "location" in poco.
							
							
							
							
							
						 | 
						
							2015-01-25 00:19:59 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	58d814b793
						 | 
						
							
							
								
								
								issue 1283 - Share-it button support for friendica
							
							
							
							
							
						 | 
						
							2015-01-25 00:10:58 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	5c4d55c5e8
						 | 
						
							
							
								
								
								Diaspora: Reshares are now working more reliable
							
							
							
							
							
						 | 
						
							2015-01-25 00:01:58 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	eaaed02ffd
						 | 
						
							
							
								
								
								use type email in users settings as well
							
							
							
							
							
						 | 
						
							2015-01-24 09:40:01 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	8b558eb7ea
						 | 
						
							
							
								
								
								type email for email field in add user form
							
							
							
							
							
						 | 
						
							2015-01-24 09:30:44 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	a33ca89bb7
						 | 
						
							
							
								
								
								adding missing styling to the ignore button in quattro
							
							
							
							
							
						 | 
						
							2015-01-24 07:22:55 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	c5b8956730
						 | 
						
							
							
								
								
								FR update to the strings
							
							
							
							
							
						 | 
						
							2015-01-24 07:05:55 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	619f2a86f3
						 | 
						
							
							
								
								
								DE update to the strings
							
							
							
							
							
						 | 
						
							2015-01-24 07:05:42 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	d3bb944700
						 | 
						
							
							
								
								
								making the ignore button in contact suggestions visible in quattro
							
							
							
							
							
						 | 
						
							2015-01-23 09:51:24 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									fabrixxm
								
							 
						 | 
						
							
							
								
							
							
	f3d49cbfa8
						 | 
						
							
							
								
								
								Merge pull request #1304 from tobiasd/20150122
							
							
							
							
							
							
							
							updating master message.po and strings.php 
							
						 | 
						
							2015-01-23 08:29:54 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	11f88e15be
						 | 
						
							
							
								
								
								update to the master strings
							
							
							
							
							
						 | 
						
							2015-01-22 18:18:31 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									fabrixxm
								
							 
						 | 
						
							
							
								
							
							
	6e06169565
						 | 
						
							
							
								
								
								Merge pull request #1301 from annando/1501-bugfix-var_dump
							
							
							
							
							
							
							
							Bugfix: Removed test code 
							
						 | 
						
							2015-01-21 13:15:23 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	ee50b04382
						 | 
						
							
							
								
								
								Bugfix: Removed test code.
							
							
							
							
							
						 | 
						
							2015-01-21 12:42:34 +01:00 | 
						
						
							
							
							
							
								
							
							
						 |