friendica 
							
						 
					 
					
						
						
							
						
						2455b0c92f 
					 
					
						
						
							
							remove some unused settings from admin page  
						
						
						
						
					 
					
						2013-07-21 17:33:40 -07:00 
						 
				 
			
				
					
						
							
							
								Thomas Willingham 
							
						 
					 
					
						
						
							
						
						d1cae2da2a 
					 
					
						
						
							
							Merge remote-tracking branch 'upstream/master'  
						
						
						
						
					 
					
						2013-07-02 18:36:39 +01:00 
						 
				 
			
				
					
						
							
							
								friendica 
							
						 
					 
					
						
						
							
						
						f835737cb7 
					 
					
						
						
							
							fix some anomolies in config functions  
						
						
						
						
					 
					
						2013-06-21 21:36:48 -07:00 
						 
				 
			
				
					
						
							
							
								Thomas Willingham 
							
						 
					 
					
						
						
							
						
						620d4f5752 
					 
					
						
						
							
							Set a site channel so an admin can use CMS to create home.html and so on, without ever needing to touch HTML again.  When I've finished that bit too.  
						
						
						
						
					 
					
						2013-05-31 02:25:42 +01:00 
						 
				 
			
				
					
						
							
							
								friendica 
							
						 
					 
					
						
						
							
						
						ab5151c470 
					 
					
						
						
							
							more Friendica removals  
						
						
						
						
					 
					
						2013-04-14 22:44:11 -07:00 
						 
				 
			
				
					
						
							
							
								friendica 
							
						 
					 
					
						
						
							
						
						b84d8bfbc9 
					 
					
						
						
							
							begin to cut the umbilical  
						
						
						
						
					 
					
						2013-04-14 22:24:47 -07:00 
						 
				 
			
				
					
						
							
							
								Thomas Willingham 
							
						 
					 
					
						
						
							
						
						9c4b3b03db 
					 
					
						
						
							
							Allow admins to specify default mobile/accessibility theme.  
						
						
						
						
					 
					
						2013-03-17 18:51:17 +00:00 
						 
				 
			
				
					
						
							
							
								Thomas Willingham 
							
						 
					 
					
						
						
							
						
						b48c481b9c 
					 
					
						
						
							
							Tidy up  
						
						
						
						
					 
					
						2013-03-15 15:25:39 +00:00 
						 
				 
			
				
					
						
							
							
								Thomas Willingham 
							
						 
					 
					
						
						
							
						
						fbc5260995 
					 
					
						
						
							
							Get admin/users mostly working.  Still need to associate channels with accounts.  
						
						
						
						
					 
					
						2013-03-12 02:35:18 +00:00 
						 
				 
			
				
					
						
							
							
								friendica 
							
						 
					 
					
						
						
							
						
						62afdf3820 
					 
					
						
						
							
							more register_approve stuff - like the admin page. Hopefully this won't conflict with Thomas's admin page "list users" changes  
						
						
						
						
					 
					
						2013-02-08 03:51:31 -08:00 
						 
				 
			
				
					
						
							
							
								Thomas Willingham 
							
						 
					 
					
						
						
							
						
						70dc7993be 
					 
					
						
						
							
							We DO only have one queue for now.  
						
						
						
						
					 
					
						2013-02-02 15:00:13 +00:00 
						 
				 
			
				
					
						
							
							
								Thomas Willingham 
							
						 
					 
					
						
						
							
						
						1633f95db8 
					 
					
						
						
							
							Clean up no longer used admin functions, plus fix summary template.  
						
						
						
						
					 
					
						2013-02-02 14:54:40 +00:00 
						 
				 
			
				
					
						
							
							
								Thomas Willingham 
							
						 
					 
					
						
						
							
						
						21b04c4582 
					 
					
						
						
							
							Fix admin summary.  
						
						
						
						
					 
					
						2013-02-02 03:36:25 +00:00 
						 
				 
			
				
					
						
							
							
								Zach Prezkuta 
							
						 
					 
					
						
						
							
						
						a0d19ffb72 
					 
					
						
						
							
							implement Smarty3  
						
						
						
						
					 
					
						2013-01-06 15:57:11 -07:00 
						 
				 
			
				
					
						
							
							
								friendica 
							
						 
					 
					
						
						
							
						
						7df33bb963 
					 
					
						
						
							
							fix register_policy globally  
						
						
						
						
					 
					
						2013-01-03 13:50:23 -08:00 
						 
				 
			
				
					
						
							
							
								friendica 
							
						 
					 
					
						
						
							
						
						7f77670649 
					 
					
						
						
							
							revise auto_update system so as not to conflict with pre-existing Friendica settings  
						
						
						
						
					 
					
						2012-12-09 16:28:35 -08:00 
						 
				 
			
				
					
						
							
							
								friendica 
							
						 
					 
					
						
						
							
						
						19ee8f9b1b 
					 
					
						
						
							
							fix about half of the admin page  
						
						
						
						
					 
					
						2012-11-10 00:09:31 -08:00 
						 
				 
			
				
					
						
							
							
								friendica 
							
						 
					 
					
						
						
							
						
						cc8a11eee2 
					 
					
						
						
							
							allow theme selection  
						
						
						
						
					 
					
						2012-11-07 14:09:51 -08:00 
						 
				 
			
				
					
						
							
							
								friendica 
							
						 
					 
					
						
						
							
						
						b400e4dfad 
					 
					
						
						
							
							change admin pointer to update.php  
						
						
						
						
					 
					
						2012-11-01 15:11:11 -07:00 
						 
				 
			
				
					
						
							
							
								Mike Macgirvin 
							
						 
					 
					
						
						
							
						
						9d043d2db4 
					 
					
						
						
							
							remove remoteupdate since it only worked for a month in 2011  
						
						
						
						
					 
					
						2012-10-23 19:09:32 +11:00 
						 
				 
			
				
					
						
							
							
								friendica 
							
						 
					 
					
						
						
							
						
						0292d46e5d 
					 
					
						
						
							
							merge comment threading, provide plugin/theme functions to handle css/js includes  
						
						
						
						
					 
					
						2012-08-09 16:26:44 -07:00 
						 
				 
			
				
					
						
							
							
								Thomas Willingham 
							
						 
					 
					
						
						
							
						
						10cb60195f 
					 
					
						
						
							
							Bloody hell, this touches a lot of code.  
						
						
						
						
					 
					
						2012-08-06 19:41:27 +01:00 
						 
				 
			
				
					
						
							
							
								Thomas Willingham 
							
						 
					 
					
						
						
							
						
						fca25c1909 
					 
					
						
						
							
							Theme admin menu.  
						
						
						
						
					 
					
						2012-08-06 19:36:41 +01:00 
						 
				 
			
				
					
						
							
							
								friendica 
							
						 
					 
					
						
						
							
						
						a122fecf50 
					 
					
						
						
							
							add additional page types to admin user report  
						
						
						
						
					 
					
						2012-07-05 22:30:13 -07:00 
						 
				 
			
				
					
						
							
							
								friendica 
							
						 
					 
					
						
						
							
						
						3b49035636 
					 
					
						
						
							
							admin page untranslated strings, remove empty list element for update  
						
						
						
						
					 
					
						2012-06-06 22:28:30 -07:00 
						 
				 
			
				
					
						
							
							
								root 
							
						 
					 
					
						
						
							
						
						88d5d9684a 
					 
					
						
						
							
							admin: remove update link in admin menu  
						
						
						
						
					 
					
						2012-05-25 03:05:07 -04:00 
						 
				 
			
				
					
						
							
							
								friendica 
							
						 
					 
					
						
						
							
						
						f29f861d25 
					 
					
						
						
							
							add queue totals to admin summary page  
						
						
						
						
					 
					
						2012-05-22 03:44:03 -07:00 
						 
				 
			
				
					
						
							
							
								friendica 
							
						 
					 
					
						
						
							
						
						54e2c1ca81 
					 
					
						
						
							
							rev update, bug 428, 429, and ability to block globaldir submissions from demo sites  
						
						
						
						
					 
					
						2012-05-21 16:40:11 -07:00 
						 
				 
			
				
					
						
							
							
								friendica 
							
						 
					 
					
						
						
							
						
						e8b9b8a403 
					 
					
						
						
							
							separate poll_interval from delivery_interval - default is the same.  
						
						
						
						
					 
					
						2012-05-07 04:21:54 -07:00 
						 
				 
			
				
					
						
							
							
								friendica 
							
						 
					 
					
						
						
							
						
						421acee65b 
					 
					
						
						
							
							implement max load average before queuing/deferring delivery and poller processes  
						
						
						
						
					 
					
						2012-05-03 21:50:48 -07:00 
						 
				 
			
				
					
						
							
							
								friendica 
							
						 
					 
					
						
						
							
						
						0153d86b7f 
					 
					
						
						
							
							admin page to manage failed updates  
						
						
						
						
					 
					
						2012-04-29 19:10:07 -07:00 
						 
				 
			
				
					
						
							
							
								friendica 
							
						 
					 
					
						
						
							
						
						f163aed66d 
					 
					
						
						
							
							break up poller into separate processes  
						
						
						
						
					 
					
						2012-04-27 23:17:40 -07:00 
						 
				 
			
				
					
						
							
							
								Tobias Hößl 
							
						 
					 
					
						
						
							
						
						b885fedee1 
					 
					
						
						
							
							XSRF protection and PHPdoc for mod/admin.php  
						
						
						
						
					 
					
						2012-04-18 07:36:48 +00:00 
						 
				 
			
				
					
						
							
							
								Tobias Hößl 
							
						 
					 
					
						
						
							
						
						d7e750ad74 
					 
					
						
						
							
							XSRF protection and PHPdoc for mod/admin.php  
						
						
						
						
					 
					
						2012-04-18 07:24:47 +00:00 
						 
				 
			
				
					
						
							
							
								Fabio Comuni 
							
						 
					 
					
						
						
							
						
						138a0e06b8 
					 
					
						
						
							
							admin: change global theme settings  
						
						
						
						
					 
					
						2012-04-13 11:20:05 +02:00 
						 
				 
			
				
					
						
							
							
								Klaus Weidenbach 
							
						 
					 
					
						
						
							
						
						1f9fe8b5ee 
					 
					
						
						
							
							Remove Gravatar from core and add new hook avatar_lookup.  
						
						... 
						
						
						
						This patch removes all occurances of Gravatar from friendica's core and adds a new hook "avatar_lookup" inside the function avatar_img($email) where the new *avatar-plugins should hook in.
I haven't touched the language files yet. Are they updated automatically somehow? 
						
						
					 
					
						2012-04-09 21:22:09 +02:00 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								friendica 
							
						 
					 
					
						
						
							
						
						466188ebd7 
					 
					
						
						
							
							re-opened bug  #363  
						
						
						
						
					 
					
						2012-04-03 20:14:37 -07:00 
						 
				 
			
				
					
						
							
							
								friendica 
							
						 
					 
					
						
						
							
						
						9391fc965d 
					 
					
						
						
							
							bug  #363  and a couple of other reported ssl link issues  
						
						
						
						
					 
					
						2012-04-02 17:43:11 -07:00 
						 
				 
			
				
					
						
							
							
								friendica 
							
						 
					 
					
						
						
							
						
						7ef1ed2d70 
					 
					
						
						
							
							theme screenshots  
						
						
						
						
					 
					
						2012-03-25 17:55:43 -07:00 
						 
				 
			
				
					
						
							
							
								friendica 
							
						 
					 
					
						
						
							
						
						e0e008fb8d 
					 
					
						
						
							
							template processor broken with foreach k=>v and k is integer 0  
						
						
						
						
					 
					
						2012-03-17 02:26:52 -07:00 
						 
				 
			
				
					
						
							
							
								friendica 
							
						 
					 
					
						
						
							
						
						110e8f2919 
					 
					
						
						
							
							basic ssl_policy for important modules  
						
						
						
						
					 
					
						2012-03-14 21:20:20 -07:00 
						 
				 
			
				
					
						
							
							
								friendica 
							
						 
					 
					
						
						
							
						
						f0a62d8908 
					 
					
						
						
							
							ssl_policy stuff  
						
						
						
						
					 
					
						2012-03-14 20:36:23 -07:00 
						 
				 
			
				
					
						
							
							
								friendica 
							
						 
					 
					
						
						
							
						
						8fb0ea4048 
					 
					
						
						
							
							bugs  #312 ,  #313  
						
						
						
						
					 
					
						2012-03-06 14:27:53 -08:00 
						 
				 
			
				
					
						
							
							
								friendica 
							
						 
					 
					
						
						
							
						
						23460302f5 
					 
					
						
						
							
							some admin page fixes and cleanup  
						
						
						
						
					 
					
						2012-03-05 18:51:21 -08:00 
						 
				 
			
				
					
						
							
							
								Fabio Comuni 
							
						 
					 
					
						
						
							
						
						f0b6e76293 
					 
					
						
						
							
							admin: fix small string  
						
						
						
						
					 
					
						2012-03-01 11:28:48 +01:00 
						 
				 
			
				
					
						
							
							
								friendica 
							
						 
					 
					
						
						
							
						
						5f7858a688 
					 
					
						
						
							
							show experimental and unsupported theme status on theme admin page  
						
						
						
						
					 
					
						2012-02-26 04:17:02 -08:00 
						 
				 
			
				
					
						
							
							
								friendica 
							
						 
					 
					
						
						
							
						
						579738aff7 
					 
					
						
						
							
							fixed link for toggling plugin from detail page  
						
						
						
						
					 
					
						2012-02-25 13:00:44 -08:00 
						 
				 
			
				
					
						
							
							
								friendica 
							
						 
					 
					
						
						
							
						
						18bf5d1402 
					 
					
						
						
							
							theme info (like plugin info)  
						
						
						
						
					 
					
						2012-02-25 00:30:14 -08:00 
						 
				 
			
				
					
						
							
							
								friendica 
							
						 
					 
					
						
						
							
						
						44c23cda8e 
					 
					
						
						
							
							theme shakeup commences - themes are now administered in admin panel.  
						
						
						
						
					 
					
						2012-02-23 20:29:09 -08:00