Alexander Kampmann
								
							 
						 | 
						
							
							
								
							
							
	355c42cb30
						 | 
						
							
							
								
								
								Merge branch 'master' of https://github.com/friendica/friendica
							
							
							
							
							
							
							
							Conflicts:
	include/config.php
	update.php 
							
						 | 
						
							2012-04-05 13:39:15 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Tobias Hößl
								
							 
						 | 
						
							
							
								
							
							
	35128ef2c9
						 | 
						
							
							
								
								
								Avoid a Notice
							
							
							
							
							
						 | 
						
							2012-02-27 22:01:17 +00:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Tobias Hößl
								
							 
						 | 
						
							
							
								
							
							
	4b1de0f538
						 | 
						
							
							
								
								
								Avoid some notices
							
							
							
							
							
						 | 
						
							2012-02-26 20:43:51 +00:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	8aa2552372
						 | 
						
							
							
								
								
								add remove_user hook (it looks like dreamhost changed all my file permissions, this will make a nasty commit)
							
							
							
							
							
						 | 
						
							2012-01-18 16:21:30 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	01164c8c2f
						 | 
						
							
							
								
								
								fix various html parse errors
							
							
							
							
							
						 | 
						
							2011-10-20 16:48:07 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	278433eac7
						 | 
						
							
							
								
								
								origin flag handling, and bug #137 - provide timezone conversion for events posted across to Diaspora
							
							
							
							
							
						 | 
						
							2011-10-17 14:52:03 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	b721fabc3c
						 | 
						
							
							
								
								
								show lock icon on private events
							
							
							
							
							
						 | 
						
							2011-07-27 02:21:55 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	c17890ab62
						 | 
						
							
							
								
								
								privacy settings on event item not propagated correctly
							
							
							
							
							
						 | 
						
							2011-07-26 22:40:11 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	6e5532149a
						 | 
						
							
							
								
								
								missing minutes in event listings
							
							
							
							
							
						 | 
						
							2011-06-30 23:27:16 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	8ffcd4323b
						 | 
						
							
							
								
								
								never enough comments
							
							
							
							
							
						 | 
						
							2011-06-23 18:56:24 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	a15bd91d17
						 | 
						
							
							
								
								
								don't update an event that hasn't changed.
							
							
							
							
							
						 | 
						
							2011-06-23 18:25:33 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	a66083b3e4
						 | 
						
							
							
								
								
								imported event should not have wall flag set
							
							
							
							
							
						 | 
						
							2011-06-16 18:11:00 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	cee63c7a0d
						 | 
						
							
							
								
								
								preserve original timezone adjust selection when editing events
							
							
							
							
							
						 | 
						
							2011-06-14 21:44:27 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	c379774300
						 | 
						
							
							
								
								
								add some whitespace in event html
							
							
							
							
							
						 | 
						
							2011-06-14 21:22:52 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	5105b3febc
						 | 
						
							
							
								
								
								event calendar links, editing
							
							
							
							
							
						 | 
						
							2011-06-14 19:48:37 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	05eb9ceaba
						 | 
						
							
							
								
								
								avoid returning events from getting posted again
							
							
							
							
							
						 | 
						
							2011-06-13 20:42:37 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	d5fdd4287d
						 | 
						
							
							
								
								
								event sharing, cont.
							
							
							
							
							
						 | 
						
							2011-06-13 19:06:49 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	8aaf55c1e6
						 | 
						
							
							
								
								
								event item
							
							
							
							
							
						 | 
						
							2011-06-09 20:02:48 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	67021c132a
						 | 
						
							
							
								
								
								event communication basics
							
							
							
							
							
						 | 
						
							2011-06-09 16:24:29 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	d371241e66
						 | 
						
							
							
								
								
								events
							
							
							
							
							
						 | 
						
							2011-06-09 00:58:45 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	df8ac668b8
						 | 
						
							
							
								
								
								more calendar work, undo strict_privacy flag to use different approach
							
							
							
							
							
						 | 
						
							2011-06-08 21:06:02 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	e2f1540f25
						 | 
						
							
							
								
								
								events, continued. Also better regex matching accounting for empty elements
							
							
							
							
							
						 | 
						
							2011-06-07 22:13:07 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	33fe26ecb0
						 | 
						
							
							
								
								
								more progress on events
							
							
							
							
							
						 | 
						
							2011-06-07 20:10:43 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	c1b2e90e37
						 | 
						
							
							
								
								
								basic saving of events
							
							
							
							
							
						 | 
						
							2011-06-06 22:27:38 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	9f51233451
						 | 
						
							
							
								
								
								event listings
							
							
							
							
							
						 | 
						
							2011-06-06 20:17:36 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	4c629e274b
						 | 
						
							
							
								
								
								begin event module
							
							
							
							
							
						 | 
						
							2011-06-05 23:10:07 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	4e8a97f30a
						 | 
						
							
							
								
								
								bug #38 posts and photos only visible to friends if so configured
							
							
							
							
							
						 | 
						
							2011-05-28 00:42:01 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	b0c383a6d0
						 | 
						
							
							
								
								
								begin event module
							
							
							
							
							
						 | 
						
							2011-05-27 21:01:30 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 |