Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						59d3bbe037 
					 
					
						
						
							
							Merge branch 'nightly' of git.gnu.io:gnu/gnu-social into mmn_fixes  
						
						
						
						
					 
					
						2016-01-06 00:53:20 +01:00 
						 
				 
			
				
					
						
							
							
								mmn 
							
						 
					 
					
						
						
							
						
						d45457e4a9 
					 
					
						
						
							
							Merge branch 'nightly' into 'nightly'  
						
						... 
						
						
						
						only count post-notices (i.e. don't include activity-notices in statuses_count in the API)
See merge request !73  
						
						
					 
					
						2016-01-05 23:53:08 +00:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						1946197a1c 
					 
					
						
						
							
							Merge request  #10  by aroque but in a slightly different version  
						
						
						
						
					 
					
						2016-01-06 00:48:03 +01:00 
						 
				 
			
				
					
						
							
							
								hannes 
							
						 
					 
					
						
						
							
						
						32549cfd8c 
					 
					
						
						
							
							$notices->verb = ActivityVerb::POST;  
						
						
						
						
					 
					
						2016-01-05 23:29:48 +00:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						31c8416a8f 
					 
					
						
						
							
							Merge branch 'nightly' of git.gnu.io:gnu/gnu-social into mmn_fixes  
						
						
						
						
					 
					
						2016-01-06 00:24:41 +01:00 
						 
				 
			
				
					
						
							
							
								mmn 
							
						 
					 
					
						
						
							
						
						956e053da6 
					 
					
						
						
							
							Merge branch 'lookup_url_fix' into 'nightly'  
						
						... 
						
						
						
						makes url lookup work and adds full url to href for shortened links
See merge request !74  
						
						
					 
					
						2016-01-05 23:24:16 +00:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						792b62874e 
					 
					
						
						
							
							Require Profile for Profile->getLists  
						
						
						
						
					 
					
						2016-01-06 00:18:10 +01:00 
						 
				 
			
				
					
						
							
							
								hannes 
							
						 
					 
					
						
						
							
						
						1c25cffbd8 
					 
					
						
						
							
							add $redir->redir_url to use in common_linkify()  
						
						
						
						
					 
					
						2016-01-05 23:07:24 +00:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						3d66d960a1 
					 
					
						
						
							
							Require Profile for Profile->getOtherTags  
						
						
						
						
					 
					
						2016-01-06 00:07:15 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						8ad6b8809a 
					 
					
						
						
							
							Don't abort on too long notices in Notice::saveActivity  
						
						
						
						
					 
					
						2016-01-05 17:31:09 +01:00 
						 
				 
			
				
					
						
							
							
								hannes 
							
						 
					 
					
						
						
							
						
						e10691abea 
					 
					
						
						
							
							only count post-notices (i.e. don't include activity-notices in statuses_count in the API)  
						
						
						
						
					 
					
						2016-01-05 14:19:33 +00:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						701f6ff608 
					 
					
						
						
							
							Allow Profile->getCurrentNotice to send scoped profile info  
						
						... 
						
						
						
						not that we're using it anywhere (yet anyway). 
						
						
					 
					
						2016-01-04 21:42:24 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						6a16939830 
					 
					
						
						
							
							Profile->getCurrentNotice handles PrivateStreamException  
						
						
						
						
					 
					
						2016-01-04 21:38:41 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						b4b57bba54 
					 
					
						
						
							
							EmptyIdException to make sure we get the right in catch  
						
						
						
						
					 
					
						2016-01-03 22:56:48 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						7266a968f9 
					 
					
						
						
							
							Err, forgot semicolon.  
						
						
						
						
					 
					
						2016-01-03 22:22:58 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						f467b89f40 
					 
					
						
						
							
							Try-catch on profile deletion unsubscribe actions  
						
						
						
						
					 
					
						2016-01-03 22:21:03 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						c19964094b 
					 
					
						
						
							
							Pending subscription requests now work as they should  
						
						... 
						
						
						
						A slight layout issue with the buttons still persists 
						
						
					 
					
						2016-01-03 20:27:53 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						b374e5f08b 
					 
					
						
						
							
							If a user has a private stream, assume a moderated subscription policy  
						
						
						
						
					 
					
						2016-01-03 19:33:26 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						df0f9547b5 
					 
					
						
						
							
							Handle private streams better (failed to show profile before)  
						
						
						
						
					 
					
						2016-01-03 19:16:29 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						336f099241 
					 
					
						
						
							
							Don't store object type for verbs (as they don't have it)  
						
						
						
						
					 
					
						2016-01-02 16:05:20 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						0dfafe2567 
					 
					
						
						
							
							NewnoticeAction now uses Notice::saveActivity(...)  
						
						
						
						
					 
					
						2016-01-01 20:18:54 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						f4309ed715 
					 
					
						
						
							
							whitespace switch for code layout  
						
						
						
						
					 
					
						2016-01-01 18:43:37 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						e02c10a589 
					 
					
						
						
							
							common_render_content doesn't require a Profile now  
						
						
						
						
					 
					
						2016-01-01 18:40:58 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						ad4beb9091 
					 
					
						
						
							
							->getID() instead of ->id  
						
						
						
						
					 
					
						2016-01-01 18:21:54 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						10973dcf69 
					 
					
						
						
							
							Don't require a notice object to common_linkify_mentions  
						
						
						
						
					 
					
						2016-01-01 18:20:42 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						86106b890a 
					 
					
						
						
							
							Output fixed sizes of thumbnails so we don't get jumpy scrolling  
						
						
						
						
					 
					
						2016-01-01 14:13:16 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						7adf1c99fc 
					 
					
						
						
							
							s/LOG_ERROR/LOG_ERR/  
						
						
						
						
					 
					
						2015-12-31 13:04:50 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						7f1ce07e9f 
					 
					
						
						
							
							Logging destinations and unnecessary debug  
						
						
						
						
					 
					
						2015-12-31 13:00:20 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						6606781916 
					 
					
						
						
							
							Proper error message in exception  
						
						
						
						
					 
					
						2015-12-31 12:41:02 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						df19791a8f 
					 
					
						
						
							
							Wups, $notice not $stored in the old function...  
						
						
						
						
					 
					
						2015-12-31 02:37:42 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						8b0fdfb4a0 
					 
					
						
						
							
							Notice conversation is perhaps not set yet  
						
						
						
						
					 
					
						2015-12-31 02:35:13 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						7cf6aaecd0 
					 
					
						
						
							
							Don't do saveKnownReplies unless it's a verb=post  
						
						
						
						
					 
					
						2015-12-31 02:31:35 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						66289d3e76 
					 
					
						
						
							
							Use recently implemented functions in saveKnownReplies  
						
						
						
						
					 
					
						2015-12-31 02:22:49 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						29847f172f 
					 
					
						
						
							
							setPassword now runs validate too  
						
						
						
						
					 
					
						2015-12-30 17:51:57 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						d7a8ee99af 
					 
					
						
						
							
							Added User->setPassword($password)  
						
						
						
						
					 
					
						2015-12-30 17:44:24 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						998db39b1a 
					 
					
						
						
							
							Notification mails are sent again fixes ssue  #99  
						
						... 
						
						
						
						The problem was that the ActivityVerbPostPlugin handled 'post' verbs
but didn't handle the notifications for them, so now we're returning
true in the event so the default behaviour (sending to 'getReplies'
recipients) is done by default. 
						
						
					 
					
						2015-12-30 17:35:47 +01:00 
						 
				 
			
				
					
						
							
							
								hannes 
							
						 
					 
					
						
						
							
						
						08be0e5c67 
					 
					
						
						
							
							fixes this issue:  https://quitter.se/notice/4344600  
						
						
						
						
					 
					
						2015-12-30 01:54:48 +00:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						4bc0b374bc 
					 
					
						
						
							
							File_redirection should get URLs properly  
						
						
						
						
					 
					
						2015-12-27 21:36:23 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						556d6e198f 
					 
					
						
						
							
							Confirm_address field address_extra _can_ be NULL  
						
						
						
						
					 
					
						2015-12-27 15:01:28 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						12d77ac3e4 
					 
					
						
						
							
							varchar to text since there's no reason to limit the fields  
						
						... 
						
						
						
						They caused problems when quitter.se was upgrading because someone was
named ryanjjjjjjjjjjjjjjjjjjj[and more than 191 'j's] etc. 
						
						
					 
					
						2015-12-27 11:50:11 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						0ac71c2b7b 
					 
					
						
						
							
							Duplicate URI means we have it already, I assume  
						
						
						
						
					 
					
						2015-12-27 01:40:00 +01:00 
						 
				 
			
				
					
						
							
							
								mmn 
							
						 
					 
					
						
						
							
						
						48f31928e9 
					 
					
						
						
							
							Merge branch 'autocomplete-group' into 'nightly'  
						
						... 
						
						
						
						Autocomplete group
Group autocompletion wasn't working for a couple of reasons:
1. $profile wasn't set (d8092207c03e830dad37!68  
						
						
					 
					
						2015-12-23 21:04:18 +00:00 
						 
				 
			
				
					
						
							
							
								Chimo 
							
						 
					 
					
						
						
							
						
						90945e548b 
					 
					
						
						
							
							Profile_prefs::getAll fix prefs loop  
						
						... 
						
						
						
						DataObject::fetch doesn't return an object. 
						
						
					 
					
						2015-12-17 14:58:06 +00:00 
						 
				 
			
				
					
						
							
							
								Chimo 
							
						 
					 
					
						
						
							
						
						71119e4980 
					 
					
						
						
							
							Profile_prefs::getAll fix call to listFind  
						
						... 
						
						
						
						2nd argument needs to be an array 
						
						
					 
					
						2015-12-17 14:55:39 +00:00 
						 
				 
			
				
					
						
							
							
								Chimo 
							
						 
					 
					
						
						
							
						
						3e830dad37 
					 
					
						
						
							
							Make Profile::getUri work with Groups  
						
						... 
						
						
						
						and by extension Profile::getAcctUri 
						
						
					 
					
						2015-12-15 21:50:10 -05:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						ef4c11d262 
					 
					
						
						
							
							Better checks for defined array indexes  
						
						
						
						
					 
					
						2015-12-15 11:50:57 +01:00 
						 
				 
			
				
					
						
							
							
								mmn 
							
						 
					 
					
						
						
							
						
						2dd968f94e 
					 
					
						
						
							
							Merge branch 'group-join-rejections' into 'nightly'  
						
						... 
						
						
						
						Fix group-join request rejections
Relates to #105  
See merge request !65  
						
						
					 
					
						2015-12-14 20:48:18 +00:00 
						 
				 
			
				
					
						
							
							
								mmn 
							
						 
					 
					
						
						
							
						
						d5d8068632 
					 
					
						
						
							
							Merge branch 'group-members-pending' into 'nightly'  
						
						... 
						
						
						
						Fix "pending members" group list
Related to #104  
See merge request !64  
						
						
					 
					
						2015-12-14 20:47:47 +00:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						20592f184d 
					 
					
						
						
							
							getID() will complain loudly if something is wrong  
						
						... 
						
						
						
						(just ->id would not) 
						
						
					 
					
						2015-12-14 21:44:59 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						42c653a9d0 
					 
					
						
						
							
							Merge commit '5c4a7a10' into nightly  
						
						... 
						
						
						
						hannes making sure notice is a repeat and not a delete activity notice 
						
						
					 
					
						2015-12-14 21:42:08 +01:00