Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						d448275713 
					 
					
						
						
							
							Merge branch 'nightly'  
						
						
						
						
					 
					
						2015-09-06 01:54:00 +02:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						4354ce21d1 
					 
					
						
						
							
							introducing html_sprintf for easier sprintf'ing with htmlspecialchars  
						
						
						
						
					 
					
						2015-09-06 01:53:11 +02:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						ea75e1c29c 
					 
					
						
						
							
							Notice_location class in db/core.php  
						
						
						
						
					 
					
						2015-09-04 23:12:23 +02:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						7f30e61402 
					 
					
						
						
							
							Oops, forgot Notice_location PHP file  
						
						
						
						
					 
					
						2015-09-04 22:30:33 +02:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						3c86542a40 
					 
					
						
						
							
							Move notice location data to Notice_location  
						
						... 
						
						
						
						Will probably take a _long_ time to do scripts/upgrade.php but don't
worry, it can be aborted and resumed. 
						
						
					 
					
						2015-09-04 22:25:11 +02:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						476197569f 
					 
					
						
						
							
							sys_get_temp_dir was added in PHP 5 >= 5.2.1  
						
						... 
						
						
						
						Our requirements are higher than that, so let's just remove the workaround 
						
						
					 
					
						2015-09-04 22:24:01 +02:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						1e07f8c045 
					 
					
						
						
							
							Incorrect use of DataObject type matching after ->find()  
						
						
						
						
					 
					
						2015-09-04 20:35:11 +02:00 
						 
				 
			
				
					
						
							
							
								mmn 
							
						 
					 
					
						
						
							
						
						57c87088d4 
					 
					
						
						
							
							Merge branch 'configure-docs' into 'nightly'  
						
						... 
						
						
						
						Add a few missing 'attachments' config options
show_thumbs
show_html
filename_base
See merge request !27  
						
						
					 
					
						2015-09-03 16:11:28 +00:00 
						 
				 
			
				
					
						
							
							
								mmn 
							
						 
					 
					
						
						
							
						
						f4b0756e70 
					 
					
						
						
							
							Merge branch 'nightly' into 'nightly'  
						
						... 
						
						
						
						Adding ChooseTheme plugin into the plugin repository
This merge request propose the plugin ChooseTheme as a part of the plugin repository for GNU social.
See merge request !9  
						
						
					 
					
						2015-09-03 16:11:04 +00:00 
						 
				 
			
				
					
						
							
							
								mmn 
							
						 
					 
					
						
						
							
						
						a597b28001 
					 
					
						
						
							
							Merge branch 'nginx-sample' into 'nightly'  
						
						... 
						
						
						
						Add nginx sample configuration
See merge request !23  
						
						
					 
					
						2015-09-03 16:10:23 +00:00 
						 
				 
			
				
					
						
							
							
								mmn 
							
						 
					 
					
						
						
							
						
						5f74ec6782 
					 
					
						
						
							
							Merge branch 'webinstaller-faq-link' into 'nightly'  
						
						... 
						
						
						
						Fix broken link to FAQ in web installer
See merge request !24  
						
						
					 
					
						2015-09-03 16:09:38 +00:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						e06553b15b 
					 
					
						
						
							
							Suggested edits by hannes2peer  
						
						
						
						
					 
					
						2015-09-03 18:04:13 +02:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						84a65c7189 
					 
					
						
						
							
							Include PHP libraries from system if not packaged and they are installed.  
						
						... 
						
						
						
						Thanks to:
    "Bhuvan Krishna" <bhuvan@swecha.net >
    "Sunil Mohan" <sunil@medhas.org > 
						
						
					 
					
						2015-09-03 17:56:11 +02:00 
						 
				 
			
				
					
						
							
							
								abjectio 
							
						 
					 
					
						
						
							
						
						91c1ab6017 
					 
					
						
						
							
							Merge branch 'nightly' of git.gnu.io:gnu/gnu-social into nightly  
						
						
						
						
					 
					
						2015-08-18 22:55:28 +02:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						c77bce12e5 
					 
					
						
						
							
							Mf2 extlib update from  https://github.com/indieweb/php-mf2/  
						
						
						
						
					 
					
						2015-08-15 11:48:39 +02:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						c1e6e4e65b 
					 
					
						
						
							
							OpenID extlib updated: Fixes CVE-2014-8150  
						
						
						
						
					 
					
						2015-08-02 13:41:57 +02:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						b434243416 
					 
					
						
						
							
							OpenID extlib updated: Fixes CVE-2014-8150  
						
						
						
						
					 
					
						2015-08-02 13:39:38 +02:00 
						 
				 
			
				
					
						
							
							
								chimo 
							
						 
					 
					
						
						
							
						
						60e7dc1e39 
					 
					
						
						
							
							Add a few missing 'attachments' config options  
						
						... 
						
						
						
						show_thumbs
show_html
filename_base 
						
						
					 
					
						2015-08-01 09:24:05 -04:00 
						 
				 
			
				
					
						
							
							
								Chimo 
							
						 
					 
					
						
						
							
						
						abde7a2682 
					 
					
						
						
							
							Fix broken link to FAQ in web installer  
						
						
						
						
					 
					
						2015-07-25 10:36:31 -04:00 
						 
				 
			
				
					
						
							
							
								Chimo 
							
						 
					 
					
						
						
							
						
						05b814ce68 
					 
					
						
						
							
							Add nginx sample configuration  
						
						
						
						
					 
					
						2015-07-25 09:39:55 -04:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						266b032b17 
					 
					
						
						
							
							UsergroupbyidAction now extends ManagedAction  
						
						
						
						
					 
					
						2015-07-21 02:32:17 +02:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						7ce32619cc 
					 
					
						
						
							
							Missing getTarget function in targetedrss10action.php  
						
						
						
						
					 
					
						2015-07-21 02:17:34 +02:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						5b09a150bc 
					 
					
						
						
							
							Increased debugging and fixing conversation stitching for saveActivity  
						
						
						
						
					 
					
						2015-07-18 19:19:16 +02:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						e0084a6fdf 
					 
					
						
						
							
							Exception handling regarding Foreign_link  
						
						
						
						
					 
					
						2015-07-18 11:39:34 +02:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						b609a3610f 
					 
					
						
						
							
							Some missed exception throwing since fixing Foreign_link and Foreign_user  
						
						
						
						
					 
					
						2015-07-18 11:04:35 +02:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						6f62adedfc 
					 
					
						
						
							
							Infinite loop on CLI initiated profile deletion for local users  
						
						... 
						
						
						
						profile deleting user deleting profile deleting user... 
						
						
					 
					
						2015-07-18 02:16:52 +02:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						9fdf6474f8 
					 
					
						
						
							
							TwitterBridge working again (for signin and posting to Twitter at least)  
						
						... 
						
						
						
						Now we just need to make it include the newname suggestion if the form fails
(for example forgetting to check the license checkbox or so). 
						
						
					 
					
						2015-07-18 02:16:15 +02:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						beba2a25d0 
					 
					
						
						
							
							Don't retry unhandled transports in OpportunisticQM  
						
						... 
						
						
						
						It'd continue trying xmpp transports forever, for example... 
						
						
					 
					
						2015-07-18 01:09:50 +02:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						e10d081a56 
					 
					
						
						
							
							TwitterBridge is closer to working again  
						
						
						
						
					 
					
						2015-07-17 21:03:37 +02:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						6cd7a4a400 
					 
					
						
						
							
							TwitterBridge messing about, Twitter OAuth requires Authorization header now?  
						
						... 
						
						
						
						https://dev.twitter.com/oauth/reference/post/oauth/request_token  says that
the request should be a GET with a specific HTTP header instead of query
string parameters for OAuth? 
					
						2015-07-17 18:54:39 +02:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						5933056a5b 
					 
					
						
						
							
							Twittersettings now works better as Profilesettings extension  
						
						
						
						
					 
					
						2015-07-17 17:50:43 +02:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						d6d06c8cbb 
					 
					
						
						
							
							SubMirror now works properly as extended from FormAction  
						
						
						
						
					 
					
						2015-07-17 17:09:36 +02:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						712a6d49d0 
					 
					
						
						
							
							Poll settings adapted to FormAction  
						
						
						
						
					 
					
						2015-07-17 16:19:02 +02:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						da168674f9 
					 
					
						
						
							
							OpenID settings aligned with FormAction  
						
						
						
						
					 
					
						2015-07-17 16:08:22 +02:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						8d2504a809 
					 
					
						
						
							
							Early return in FacebookBridge settings action  
						
						
						
						
					 
					
						2015-07-17 15:27:47 +02:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						be0c10e8f6 
					 
					
						
						
							
							Facebooksettings adapted to FormAction  
						
						
						
						
					 
					
						2015-07-17 15:24:37 +02:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						992fe6896f 
					 
					
						
						
							
							Urlsettings now adapted to FormAction  
						
						
						
						
					 
					
						2015-07-17 15:16:45 +02:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						8d516d7f08 
					 
					
						
						
							
							Don't allow imports by default until it works well on large instances.  
						
						
						
						
					 
					
						2015-07-17 14:40:09 +02:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						2dd979d3f8 
					 
					
						
						
							
							SMS Settings now better adapted to FormAction  
						
						
						
						
					 
					
						2015-07-17 14:29:07 +02:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						a093dea38c 
					 
					
						
						
							
							ExtendedProfile is not something we want by default.  
						
						
						
						
					 
					
						2015-07-17 12:46:24 +02:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						9045575e62 
					 
					
						
						
							
							ExtendedProfile now works better as extended ProfilesettingsAction  
						
						
						
						
					 
					
						2015-07-17 12:46:09 +02:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						9f82da07f1 
					 
					
						
						
							
							ProfilesettingsAction and related stuff modernised  
						
						
						
						
					 
					
						2015-07-17 12:20:11 +02:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						53e820b466 
					 
					
						
						
							
							Maximum character limit with utf8mb4 is 191 in varchar  
						
						
						
						
					 
					
						2015-07-17 11:22:25 +02:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						cfaaf3c13c 
					 
					
						
						
							
							PasswordsettingsAction aligned with FormAction  
						
						... 
						
						
						
						Also made some changes in the password "munging" function call
common_munge_password to accept a profile instead of user ID (which
was only there because stoneage StatusNet used the ID to generate a
not-very-random salt, but nowadays we primarily use AuthCrypt plugin). 
						
						
					 
					
						2015-07-17 01:47:43 +02:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						47ef917f62 
					 
					
						
						
							
							oldschool settings adapted to FormAction  
						
						... 
						
						
						
						TODO: Rename this "Layout", "Display" or something, since it might
actually be interesting to have non-threaded views for some users. 
						
						
					 
					
						2015-07-17 01:18:28 +02:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						a6e299a2fc 
					 
					
						
						
							
							OAuth stuff adapted for FormAction  
						
						... 
						
						
						
						TODO: Break OAuth out into a plugin. 
						
						
					 
					
						2015-07-17 01:07:19 +02:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						ba5a43f2f9 
					 
					
						
						
							
							If XMLOutputter $output arg is null, use php://output  
						
						... 
						
						
						
						Since pushing a null value to the argument actually sets it to null
and not the default fallback (previously $output='php://output'); 
						
						
					 
					
						2015-07-16 23:58:04 +02:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						f1d9d8a6ed 
					 
					
						
						
							
							ImSettings adapted to FormAction inheritance  
						
						... 
						
						
						
						TODO: Get separate Form classes and move User_im_prefs to Profile_prefs 
						
						
					 
					
						2015-07-16 21:18:50 +02:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						647171e089 
					 
					
						
						
							
							EmailSettingsAction adapted to FormAction  
						
						... 
						
						
						
						TODO: EmailSettingsForm as a separate class would be good! 
						
						
					 
					
						2015-07-16 21:17:22 +02:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						fd2efbc6f8 
					 
					
						
						
							
							AvatarSettings more aligned to FormAction  
						
						... 
						
						
						
						TODO: Make classes called AvatarCropForm and AvatarUploadForm 
						
						
					 
					
						2015-07-16 19:21:12 +02:00