Simon L'nu 
								
							 
						 
						
							
							
								
							
							
	46558e98a8  
						 
						
							
							
								
								
								Merge branch 'master', remote-tracking branch 'remotes/upstream/master'  
							
							 
							
							... 
							
							
							
							* remotes/upstream/master:
  diabook-themes: add "community profiles"-box to right_column
  change api.php in function api_item_get_user to check if $usercache is NULL before checking an element in it
  make 'aaa joined group bbb' work from the initiating end, new privacy pref to control it also hidewall wasn't properly checked before sending 'xxx is friends with yyy' messages
  diabook-themes: add "last tweets"-box to right_aside, that searches for #friendica on twitter
  rev update
  start adding tooltips to tab menus
  fix join group notifications
* master: 
							
						 
						
							2012-05-01 00:49:42 -04:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									tommy tomson 
								
							 
						 
						
							
							
								
							
							
	2c577ed90f  
						 
						
							
							
								
								
								diabook-themes: add "community profiles"-box to right_column  
							
							 
							
							
							
						 
						
							2012-05-01 06:21:40 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									tommy tomson 
								
							 
						 
						
							
							
								
							
							
	f35ffa9b60  
						 
						
							
							
								
								
								diabook-themes: add "last tweets"-box to right_aside, that searches for #friendica on twitter  
							
							 
							
							
							
						 
						
							2012-05-01 02:33:55 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Simon L'nu 
								
							 
						 
						
							
							
								
							
							
	34eb843fb4  
						 
						
							
							
								
								
								Merge branch 'master', remote-tracking branch 'remotes/upstream/master'  
							
							 
							
							... 
							
							
							
							* remotes/upstream/master:
  the heart should really be red.
  fix location change notification
  enhanced profile reporting for single values
  add db field for removed account, which will also be the first test of update error checking
  toggle to archive unfriends, though render them useless
  indicate successful updates
  diabook-themes: small fix
  diabook-themes: bug/css-fixes
  some constants for the db update failure possibilities
  bring back the email and logging of update failures, but without the transactions
* master: 
							
						 
						
							2012-04-29 22:06:16 -04:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									tommy tomson 
								
							 
						 
						
							
							
								
							
							
	920d40acf4  
						 
						
							
							
								
								
								diabook-themes: small fix  
							
							 
							
							
							
						 
						
							2012-04-29 05:58:23 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									tommy tomson 
								
							 
						 
						
							
							
								
							
							
	3d054341ef  
						 
						
							
							
								
								
								diabook-themes: bug/css-fixes  
							
							 
							
							
							
						 
						
							2012-04-29 04:12:04 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Simon L'nu 
								
							 
						 
						
							
							
								
							
							
	ecd1dab373  
						 
						
							
							
								
								
								Merge branch 'master', remote-tracking branch 'remotes/upstream/master'  
							
							 
							
							... 
							
							
							
							* remotes/upstream/master:
  a few more continues that should be returns
  small bugfix. sometimes also avatar pics were rescaled
* master: 
							
						 
						
							2012-04-28 20:16:25 -04:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Christian Vogeley 
								
							 
						 
						
							
							
								
							
							
	3f586bb962  
						 
						
							
							
								
								
								small bugfix. sometimes also avatar pics were rescaled  
							
							 
							
							
							
						 
						
							2012-04-28 20:15:10 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Simon L'nu 
								
							 
						 
						
							
							
								
							
							
	c661dc502f  
						 
						
							
							
								
								
								Merge branch 'master', remote-tracking branch 'remotes/upstream/master'  
							
							 
							
							... 
							
							
							
							* remotes/upstream/master:
  break up poller into separate processes
  add tooltip title to common_tabs
  PRIVACY: if wall is blocked, don't provide public keywords in HTML meta
  Diabook-dark update, it's almost useable now (if you're lenient).
  Added "important changes" to admin menu for admins who don't follow the github properly.
* master: 
							
						 
						
							2012-04-28 05:29:03 -04:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas Willingham 
								
							 
						 
						
							
							
								
							
							
	4b553de79f  
						 
						
							
							
								
								
								Diabook-dark update, it's almost useable now (if you're lenient).  
							
							 
							
							
							
						 
						
							2012-04-28 03:01:27 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Simon L'nu 
								
							 
						 
						
							
							
								
							
							
	3bfa3f2a13  
						 
						
							
							
								
								
								fix #search-text  
							
							 
							
							... 
							
							
							
							Signed-off-by: Simon L'nu <simon.lnu@gmail.com> 
							
						 
						
							2012-04-27 21:02:57 -04:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	26c53580d1  
						 
						
							
							
								
								
								implement contact archival  
							
							 
							
							
							
						 
						
							2012-04-27 17:17:58 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Christian Vogeley 
								
							 
						 
						
							
							
								
							
							
	731379fa25  
						 
						
							
							
								
								
								another attempt to fix lower tab behaviour on small screens, community back in tab area  
							
							 
							
							
							
						 
						
							2012-04-27 23:48:44 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Simon L'nu 
								
							 
						 
						
							
							
								
							
							
	64f3af49fa  
						 
						
							
							
								
								
								remove extra netsearch-box and fix  
							
							 
							
							... 
							
							
							
							Signed-off-by: Simon L'nu <simon.lnu@gmail.com> 
							
						 
						
							2012-04-27 14:33:56 -04:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Simon L'nu 
								
							 
						 
						
							
							
								
							
							
	d0d79196ba  
						 
						
							
							
								
								
								fix contact-friend stuff on profile sidebar  
							
							 
							
							... 
							
							
							
							Signed-off-by: Simon L'nu <simon.lnu@gmail.com> 
							
						 
						
							2012-04-27 13:31:06 -04:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	4b92e3543c  
						 
						
							
							
								
								
								Merge  https://github.com/friendica/friendica  into pull  
							
							 
							
							
							
						 
						
							2012-04-27 02:31:37 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	266eaae439  
						 
						
							
							
								
								
								put community back on the lower tab. It belongs with message streams  
							
							 
							
							
							
						 
						
							2012-04-27 02:30:49 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Simon L'nu 
								
							 
						 
						
							
							
								
							
							
	deae1df3be  
						 
						
							
							
								
								
								fix some css errors  
							
							 
							
							... 
							
							
							
							Signed-off-by: Simon L'nu <simon.lnu@gmail.com> 
							
						 
						
							2012-04-27 04:42:38 -04:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Simon L'nu 
								
							 
						 
						
							
							
								
							
							
	b936e3a18a  
						 
						
							
							
								
								
								fix 2 issues. contacts img in finder; wall filer title  
							
							 
							
							... 
							
							
							
							Signed-off-by: Simon L'nu <simon.lnu@gmail.com> 
							
						 
						
							2012-04-27 02:33:58 -04:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	dd33599a1d  
						 
						
							
							
								
								
								Merge  https://github.com/friendica/friendica  into pull  
							
							 
							
							
							
						 
						
							2012-04-26 19:56:25 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	3c6cf1f19c  
						 
						
							
							
								
								
								make comment edit icons look more like base theme  
							
							 
							
							
							
						 
						
							2012-04-26 19:55:20 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Simon L'nu 
								
							 
						 
						
							
							
								
							
							
	8834944952  
						 
						
							
							
								
								
								fix s/color/colour/g issue  
							
							 
							
							... 
							
							
							
							Signed-off-by: Simon L'nu <simon.lnu@gmail.com> 
							
						 
						
							2012-04-26 20:13:11 -04:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	3ee998dbaf  
						 
						
							
							
								
								
								Merge pull request  #267  from tomtom84/master  
							
							 
							
							... 
							
							
							
							add link "remove account" to /mod/settings.php 
							
						 
						
							2012-04-26 15:33:34 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Simon L'nu 
								
							 
						 
						
							
							
								
							
							
	d6116b6979  
						 
						
							
							
								
								
								announced dipsy change. re-tie your boots, we're in for a wee ride ;)  
							
							 
							
							... 
							
							
							
							Signed-off-by: Simon L'nu <simon.lnu@gmail.com> 
							
						 
						
							2012-04-26 16:14:42 -04:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									tommy tomson 
								
							 
						 
						
							
							
								
							
							
	328568943e  
						 
						
							
							
								
								
								diabook-themes: small-fix  
							
							 
							
							
							
						 
						
							2012-04-26 21:07:46 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	82abb14bf9  
						 
						
							
							
								
								
								Merge pull request  #265  from cvogeley/master  
							
							 
							
							... 
							
							
							
							cleanzero theme added 
							
						 
						
							2012-04-26 01:35:50 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Simon L'nu 
								
							 
						 
						
							
							
								
							
							
	c1f1974e44  
						 
						
							
							
								
								
								convert stylesheets to less, and compress output css  
							
							 
							
							... 
							
							
							
							Signed-off-by: Simon L'nu <simon.lnu@gmail.com> 
							
						 
						
							2012-04-26 02:38:18 -04:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas Willingham 
								
							 
						 
						
							
							
								
							
							
	20a9cdfc90  
						 
						
							
							
								
								
								Diabook-dark more CSS fixes.  
							
							 
							
							... 
							
							
							
							Slowly getting there. 
							
						 
						
							2012-04-25 23:40:40 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Christian Vogeley 
								
							 
						 
						
							
							
								
							
							
	43a257f2f6  
						 
						
							
							
								
								
								duepuntozero: move community and manage link to upper right area + css fixes to avoid breaking of design  
							
							 
							
							
							
						 
						
							2012-04-25 21:30:04 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Christian Vogeley 
								
							 
						 
						
							
							
								
							
							
	28370e320f  
						 
						
							
							
								
								
								duepuntozero: move community and manage link to upper right area + css fixes to avoid breaking of design  
							
							 
							
							
							
						 
						
							2012-04-25 21:28:13 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Christian Vogeley 
								
							 
						 
						
							
							
								
							
							
	c0d4e39052  
						 
						
							
							
								
								
								added BBCODE thing in comments  
							
							 
							
							
							
						 
						
							2012-04-25 21:08:31 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Christian Vogeley 
								
							 
						 
						
							
							
								
							
							
	4c1398c6b1  
						 
						
							
							
								
								
								add cleanzero theme  
							
							 
							
							
							
						 
						
							2012-04-25 19:09:46 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	37bc00094e  
						 
						
							
							
								
								
								this turns out to be harder than I thought  
							
							 
							
							
							
						 
						
							2012-04-25 01:36:22 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	50f10a4fd7  
						 
						
							
							
								
								
								Merge  https://github.com/friendica/friendica  into pull  
							
							 
							
							
							
						 
						
							2012-04-25 00:14:20 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	ba0ade3380  
						 
						
							
							
								
								
								cleanup - make bb-buttons vanish when comment closed  
							
							 
							
							
							
						 
						
							2012-04-25 00:13:36 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									tomtom84 
								
							 
						 
						
							
							
								
							
							
	5187faa595  
						 
						
							
							
								
								
								Merge pull request  #263  from tomtom84/master  
							
							 
							
							... 
							
							
							
							diabook-themes: fix css to login.tpl 
							
						 
						
							2012-04-24 18:42:32 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									tommy tomson 
								
							 
						 
						
							
							
								
							
							
	9fe6333fd4  
						 
						
							
							
								
								
								diabook-themes: fix css to login.tpl  
							
							 
							
							
							
						 
						
							2012-04-25 03:38:21 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	5af80dbb89  
						 
						
							
							
								
								
								restore qcomment selector  
							
							 
							
							
							
						 
						
							2012-04-24 18:23:48 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									tommy tomson 
								
							 
						 
						
							
							
								
							
							
	e72eaf2408  
						 
						
							
							
								
								
								zero-themes: add bbcode-toolbar to commentbox  
							
							 
							
							
							
						 
						
							2012-04-25 02:43:50 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									tommy tomson 
								
							 
						 
						
							
							
								
							
							
	08b990a314  
						 
						
							
							
								
								
								diabook-themes: small fix  
							
							 
							
							
							
						 
						
							2012-04-25 00:19:57 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	5ebc221c28  
						 
						
							
							
								
								
								Merge pull request  #261  from fabrixxm/eventspage  
							
							 
							
							... 
							
							
							
							Some tweak on events page and events/bitrhdays reminder 
							
						 
						
							2012-04-24 14:50:22 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas Willingham 
								
							 
						 
						
							
							
								
							
							
	a28fea987e  
						 
						
							
							
								
								
								Diabook-dark css fix  
							
							 
							
							
							
						 
						
							2012-04-24 20:07:08 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas Willingham 
								
							 
						 
						
							
							
								
							
							
	fade45ca76  
						 
						
							
							
								
								
								Diabook-dark, couple of new icons, and another css fix.  
							
							 
							
							
							
						 
						
							2012-04-24 20:00:49 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fabio Comuni 
								
							 
						 
						
							
							
								
							
							
	c9a8dbc322  
						 
						
							
							
								
								
								quattro: small week calendar view for event/birthday reminders  
							
							 
							
							
							
						 
						
							2012-04-24 09:50:44 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas Willingham 
								
							 
						 
						
							
							
								
							
							
	9443248fad  
						 
						
							
							
								
								
								Improvements to diabook-dark  
							
							 
							
							... 
							
							
							
							Still a long way to go, but some icons and a few CSS fixes 
							
						 
						
							2012-04-24 04:55:39 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									tommy tomson 
								
							 
						 
						
							
							
								
							
							
	a305cf9f5c  
						 
						
							
							
								
								
								diabok-themes: fixed bug in green-wide and dark-wide  
							
							 
							
							
							
						 
						
							2012-04-23 18:42:37 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									tommy tomson 
								
							 
						 
						
							
							
								
							
							
	c5c419a785  
						 
						
							
							
								
								
								diabook-themes: small fix in nets_aside, group_aside and delete obsolete .tpls in subfolders  
							
							 
							
							
							
						 
						
							2012-04-23 17:22:22 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									tommy tomson 
								
							 
						 
						
							
							
								
							
							
	d072c12e7d  
						 
						
							
							
								
								
								diabook-themes: bugfix in admin-section  
							
							 
							
							
							
						 
						
							2012-04-23 15:47:18 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									tommy tomson 
								
							 
						 
						
							
							
								
							
							
	e74ae8b031  
						 
						
							
							
								
								
								diabook-themes: bugfix  
							
							 
							
							
							
						 
						
							2012-04-22 23:58:34 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									tommy tomson 
								
							 
						 
						
							
							
								
							
							
	d6c8a14fb0  
						 
						
							
							
								
								
								diabook-themes: fixed youtube-bug and added "Info/Impressum" to footer  
							
							 
							
							
							
						 
						
							2012-04-22 22:31:44 +02:00