Friendika
								
							 
						 | 
						
							
							
								
							
							
	15b6792ca0
						 | 
						
							
							
								
								
								revup
							
							
							
							
							
						 | 
						
							2011-03-28 15:41:08 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	1f6c6c466a
						 | 
						
							
							
								
								
								author collapse: close off before pagination
							
							
							
							
							
						 | 
						
							2011-03-28 00:49:20 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	77fbd2f78c
						 | 
						
							
							
								
								
								tweaks to author collapsing
							
							
							
							
							
						 | 
						
							2011-03-27 20:43:45 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	7defb1768b
						 | 
						
							
							
								
								
								collapse posts by same author (but not you).
							
							
							
							
							
						 | 
						
							2011-03-27 20:37:44 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	b57214cb78
						 | 
						
							
							
								
								
								wrong date order profile page
							
							
							
							
							
						 | 
						
							2011-03-27 19:59:27 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	c962f5c4bc
						 | 
						
							
							
								
								
								comment collapsing, pagination wasn't advancing past 16
							
							
							
							
							
						 | 
						
							2011-03-27 19:53:36 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	76918ed5a5
						 | 
						
							
							
								
								
								info page
							
							
							
							
							
						 | 
						
							2011-03-27 16:35:56 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	ff8bddb4a8
						 | 
						
							
							
								
								
								Merge branch 'tobiasd-master'
							
							
							
							
							
						 | 
						
							2011-03-25 15:11:22 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	f7928f15a8
						 | 
						
							
							
								
								
								revup
							
							
							
							
							
						 | 
						
							2011-03-25 15:08:40 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	9808b0378d
						 | 
						
							
							
								
								
								fixed wrong colors for links
							
							
							
							
							
						 | 
						
							2011-03-25 13:03:30 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	af0f3a7e05
						 | 
						
							
							
								
								
								Merge branch 'master' of git://github.com/friendika/friendika
							
							
							
							
							
						 | 
						
							2011-03-25 12:47:36 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	ca113bfaa0
						 | 
						
							
							
								
								
								change link to project website
							
							
							
							
							
						 | 
						
							2011-03-24 21:10:51 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	6bc5d6f17b
						 | 
						
							
							
								
								
								repair duplicate nickname accounts caused by race condition
							
							
							
							
							
						 | 
						
							2011-03-24 15:45:27 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	067626380d
						 | 
						
							
							
								
								
								Merge branch 'erikl-master'
							
							
							
							
							
							
							
							Conflicts:
	view/sv/insecure_net.tpl
	view/sv/jot-header.tpl
	view/sv/msg-header.tpl
	view/sv/profile_edit.tpl
	view/sv/profile_tabs.tpl
	view/sv/strings.php 
							
						 | 
						
							2011-03-24 04:36:53 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	ba99ce3d0a
						 | 
						
							
							
								
								
								Merge branch 'master' of https://github.com/erikl/friendika into erikl-master
							
							
							
							
							
						 | 
						
							2011-03-24 04:06:01 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	51447932f7
						 | 
						
							
							
								
								
								link same as visited
							
							
							
							
							
						 | 
						
							2011-03-24 01:16:14 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	f0bd849555
						 | 
						
							
							
								
								
								Merge branch 'fabrixxm-master'
							
							
							
							
							
						 | 
						
							2011-03-23 14:32:23 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	de8d9ab66d
						 | 
						
							
							
								
								
								revup
							
							
							
							
							
						 | 
						
							2011-03-23 14:31:02 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Fabio Comuni
								
							 
						 | 
						
							
							
								
							
							
	1f1fe4d5be
						 | 
						
							
							
								
								
								Merge branch 'master' of github.com:fabrixxm/friendika
							
							
							
							
							
						 | 
						
							2011-03-23 14:04:35 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Fabio Comuni
								
							 
						 | 
						
							
							
								
							
							
	4a14269349
						 | 
						
							
							
								
								
								Added plural string for contact block
							
							
							
							
							
						 | 
						
							2011-03-23 13:58:46 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	620d7bd770
						 | 
						
							
							
								
								
								upd8 readme
							
							
							
							
							
						 | 
						
							2011-03-23 05:33:41 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	f0b791fe9a
						 | 
						
							
							
								
								
								upd8 readme
							
							
							
							
							
						 | 
						
							2011-03-23 05:30:44 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	85e227151b
						 | 
						
							
							
								
								
								use correct mime type for json
							
							
							
							
							
						 | 
						
							2011-03-22 16:52:14 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	e0202d82a1
						 | 
						
							
							
								
								
								add fulltext index on keywords, missed some directory localisations
							
							
							
							
							
						 | 
						
							2011-03-22 16:34:12 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	8f31935b7d
						 | 
						
							
							
								
								
								items back in personal data download, chunked this time
							
							
							
							
							
						 | 
						
							2011-03-22 16:19:00 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									erik
								
							 
						 | 
						
							
							
								
							
							
	af12c696cb
						 | 
						
							
							
								
								
								Edited view/sv/strings.php via GitHub
							
							
							
							
							
						 | 
						
							2011-03-22 14:12:33 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									erik
								
							 
						 | 
						
							
							
								
							
							
	eb02adb163
						 | 
						
							
							
								
								
								Edited view/sv/wall_received_eml.tpl via GitHub
							
							
							
							
							
						 | 
						
							2011-03-22 12:22:25 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									erik
								
							 
						 | 
						
							
							
								
							
							
	93b1f32170
						 | 
						
							
							
								
								
								Edited view/sv/settings_nick_unset.tpl via GitHub
							
							
							
							
							
						 | 
						
							2011-03-22 12:21:15 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									erik
								
							 
						 | 
						
							
							
								
							
							
	0353b36f5d
						 | 
						
							
							
								
								
								Edited view/sv/settings_nick_subdir.tpl via GitHub
							
							
							
							
							
						 | 
						
							2011-03-22 12:19:04 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									erik
								
							 
						 | 
						
							
							
								
							
							
	42a5eb5d9b
						 | 
						
							
							
								
								
								Edited view/sv/settings_nick_set.tpl via GitHub
							
							
							
							
							
						 | 
						
							2011-03-22 12:18:09 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									erik
								
							 
						 | 
						
							
							
								
							
							
	b57b89516f
						 | 
						
							
							
								
								
								Edited view/sv/settings.tpl via GitHub
							
							
							
							
							
						 | 
						
							2011-03-22 12:17:25 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									erik
								
							 
						 | 
						
							
							
								
							
							
	fe7e6ad064
						 | 
						
							
							
								
								
								Edited view/sv/request_notify_eml.tpl via GitHub
							
							
							
							
							
						 | 
						
							2011-03-22 12:14:59 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									erik
								
							 
						 | 
						
							
							
								
							
							
	250d467f33
						 | 
						
							
							
								
								
								Edited view/sv/registrations.tpl via GitHub
							
							
							
							
							
						 | 
						
							2011-03-22 12:13:15 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									erik
								
							 
						 | 
						
							
							
								
							
							
	8c245a5d2f
						 | 
						
							
							
								
								
								Edited view/sv/registrations-top.tpl via GitHub
							
							
							
							
							
						 | 
						
							2011-03-22 12:12:23 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									erik
								
							 
						 | 
						
							
							
								
							
							
	61ba37b1ed
						 | 
						
							
							
								
								
								Edited view/sv/register_verify_eml.tpl via GitHub
							
							
							
							
							
						 | 
						
							2011-03-22 12:11:15 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									erik
								
							 
						 | 
						
							
							
								
							
							
	b2089c559c
						 | 
						
							
							
								
								
								Edited view/sv/register_open_eml.tpl via GitHub
							
							
							
							
							
						 | 
						
							2011-03-22 12:08:25 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									erik
								
							 
						 | 
						
							
							
								
							
							
	aa0915a2ad
						 | 
						
							
							
								
								
								Edited view/sv/pwdreset.tpl via GitHub
							
							
							
							
							
						 | 
						
							2011-03-22 12:07:38 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									erik
								
							 
						 | 
						
							
							
								
							
							
	a7601bc1a6
						 | 
						
							
							
								
								
								Edited view/sv/profile-in-netdir.tpl via GitHub
							
							
							
							
							
						 | 
						
							2011-03-22 12:04:06 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									erik
								
							 
						 | 
						
							
							
								
							
							
	5dae05f275
						 | 
						
							
							
								
								
								Edited view/sv/profile-in-directory.tpl via GitHub
							
							
							
							
							
						 | 
						
							2011-03-22 12:03:00 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									erik
								
							 
						 | 
						
							
							
								
							
							
	2856664eeb
						 | 
						
							
							
								
								
								Edited view/sv/profile-hide-friends.tpl via GitHub
							
							
							
							
							
						 | 
						
							2011-03-22 12:01:47 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									erik
								
							 
						 | 
						
							
							
								
							
							
	59a7ff8331
						 | 
						
							
							
								
								
								Edited view/sv/profile_tabs.tpl via GitHub
							
							
							
							
							
						 | 
						
							2011-03-22 12:00:49 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									erik
								
							 
						 | 
						
							
							
								
							
							
	5ead1a8599
						 | 
						
							
							
								
								
								Edited view/sv/profile_photo.tpl via GitHub
							
							
							
							
							
						 | 
						
							2011-03-22 11:59:50 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									erik
								
							 
						 | 
						
							
							
								
							
							
	0cbe80aeea
						 | 
						
							
							
								
								
								Edited view/sv/profile_listing_header.tpl via GitHub
							
							
							
							
							
						 | 
						
							2011-03-22 11:59:03 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									erik
								
							 
						 | 
						
							
							
								
							
							
	143b9ef1d5
						 | 
						
							
							
								
								
								Edited view/sv/profile_entry_default.tpl via GitHub
							
							
							
							
							
						 | 
						
							2011-03-22 11:58:04 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									erik
								
							 
						 | 
						
							
							
								
							
							
	6f2b633787
						 | 
						
							
							
								
								
								Edited view/sv/profile_edit.tpl via GitHub
							
							
							
							
							
						 | 
						
							2011-03-22 11:54:48 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									erik
								
							 
						 | 
						
							
							
								
							
							
	2e6f718f0d
						 | 
						
							
							
								
								
								Edited view/sv/profile_advanced.php via GitHub
							
							
							
							
							
						 | 
						
							2011-03-22 11:53:34 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									erik
								
							 
						 | 
						
							
							
								
							
							
	c7b671aa2d
						 | 
						
							
							
								
								
								Edited view/sv/profile.php via GitHub
							
							
							
							
							
						 | 
						
							2011-03-22 11:07:18 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									erik
								
							 
						 | 
						
							
							
								
							
							
	15ef0e601e
						 | 
						
							
							
								
								
								Edited view/sv/passchanged_eml.tpl via GitHub
							
							
							
							
							
						 | 
						
							2011-03-22 11:05:36 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									erik
								
							 
						 | 
						
							
							
								
							
							
	196ba3c51a
						 | 
						
							
							
								
								
								Edited view/sv/pagetypes.tpl via GitHub
							
							
							
							
							
						 | 
						
							2011-03-22 11:04:26 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									erik
								
							 
						 | 
						
							
							
								
							
							
	82bf55666f
						 | 
						
							
							
								
								
								Edited view/sv/msg-header.tpl via GitHub
							
							
							
							
							
						 | 
						
							2011-03-22 11:03:30 -07:00 | 
						
						
							
							
							
							
								
							
							
						 |