| 
							
							
								 friendica | 6679734135 | Merge branch 'master' into tres Conflicts:
	include/Contact.php
	include/ItemObject.php
	include/api.php
	include/attach.php
	include/diaspora.php
	include/dir_fns.php
	include/enotify.php
	include/event.php
	include/expire.php
	include/items.php
	include/notifier.php
	include/notify.php
	include/photos.php
	include/taxonomy.php
	include/text.php
	include/widgets.php
	include/zot.php
	mod/admin.php
	mod/channel.php
	mod/dirsearch.php
	mod/display.php
	mod/editwebpage.php
	mod/events.php
	mod/home.php
	mod/item.php
	mod/manage.php
	mod/mood.php
	mod/network.php
	mod/page.php
	mod/photos.php
	mod/ping.php
	mod/post.php
	mod/thing.php
	mod/viewsrc.php
	view/css/mod_events.css | 2015-04-23 19:49:41 -07:00 |  | 
			
				
					| 
							
							
								 friendica | da2349bb6a | provide relief to sites that are severely impacted by the slow ITEM_UNSEEN searches. This does not incorporate any other flag optimisations as that will require a major DB update and possibly involve significant downtime. This is just to bite off a little chunk now and provide some much needed relief. | 2015-02-12 17:45:25 -08:00 |  | 
			
				
					| 
							
							
								 friendica | e46eba1258 | heavy lifting converting item flag bits | 2015-01-22 17:41:16 -08:00 |  | 
			
				
					| 
							
							
								 friendica | ea3940c4b0 | start formatting for Doxygen | 2013-02-25 17:09:40 -08:00 |  | 
			
				
					| 
							
							
								 friendica | 89423844bb | network & home notification fixes | 2013-01-11 02:19:46 -08:00 |  | 
			
				
					| 
							
							
								 friendica | 948644bd46 | minor notification tweaks | 2013-01-08 13:38:07 -08:00 |  | 
			
				
					| 
							
							
								 friendica | 59ea856311 | further progress on new network/home notifications | 2012-11-29 20:46:45 -08:00 |  | 
			
				
					| 
							
							
								 friendica | aa88165383 | mood mostly working | 2012-11-13 19:32:59 -08:00 |  | 
			
				
					| 
							
							
								 friendica | 4af6d77de3 | a bit more progress on the new network/home ajax notifications, at least I've now got a plan | 2012-11-13 16:04:22 -08:00 |  | 
			
				
					| 
							
							
								 friendica | 96c8e74438 | start on network/home notification refactor | 2012-10-27 04:43:39 -07:00 |  |