Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						4a8e936e19 
					 
					
						
						
							
							Somewhat more meaningful error message  
						
						
						
						
					 
					
						2016-01-06 14:10:37 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						0fd2ad649e 
					 
					
						
						
							
							Conversation IDs (again) no longer based on Notice ID  
						
						
						
						
					 
					
						2016-01-06 13:58:46 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						4b22b0c42a 
					 
					
						
						
							
							More listitems and lists into separate files + stronger typing  
						
						
						
						
					 
					
						2016-01-06 01:36:46 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						6d9f390ba8 
					 
					
						
						
							
							Separating classes into files and stronger typing  
						
						
						
						
					 
					
						2016-01-06 01:30:12 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						da2f179ae9 
					 
					
						
						
							
							Typing to Profile  
						
						
						
						
					 
					
						2016-01-06 01:25:00 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						e577e883f4 
					 
					
						
						
							
							Subscriber lists to separate files and also Profile typing  
						
						
						
						
					 
					
						2016-01-06 00:57:31 +01:00 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								mmn 
							
						 
					 
					
						
						
							
						
						2c5460eb0e 
					 
					
						
						
							
							Merge branch 'openid-plugin' into 'nightly'  
						
						... 
						
						
						
						OpenID plugin: 'openid_only' should be 'openidonly'
To match everywhere else.
See merge request !72  
						
						
					 
					
						2016-01-05 23:28:28 +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 
							
						 
					 
					
						
						
							
						
						0b4b0de412 
					 
					
						
						
							
							longurl in href  
						
						
						
						
					 
					
						2016-01-05 23:14:51 +00: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 
						 
				 
			
				
					
						
							
							
								hannes 
							
						 
					 
					
						
						
							
						
						8b78e01d4c 
					 
					
						
						
							
							$longurl->url is just the same $canon we fed to File_redirection::where()  
						
						
						
						
					 
					
						2016-01-05 23:06:02 +00:00 
						 
				 
			
				
					
						
							
							
								hannes 
							
						 
					 
					
						
						
							
						
						64f2f3d976 
					 
					
						
						
							
							effectiveUrl seems to contain the url we want  
						
						
						
						
					 
					
						2016-01-05 22:44:06 +00: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 
							
						 
					 
					
						
						
							
						
						9a75778b29 
					 
					
						
						
							
							If there's no Happening, we can't use the RSVP.  
						
						
						
						
					 
					
						2016-01-05 15:00:34 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						3471213d1c 
					 
					
						
						
							
							processFeed would abort on certain errors where findLocalObject failed  
						
						
						
						
					 
					
						2016-01-05 15:00:07 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						ab93bb009c 
					 
					
						
						
							
							XSS vulnerability when remote-subscribing  
						
						... 
						
						
						
						->raw was used on non-filtered strings for some reasons, changed
to ->text. 
						
						
					 
					
						2016-01-05 12:15:50 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						df8c14d66a 
					 
					
						
						
							
							ProfileMiniList->newListItem changed to match ProfileList->newListItem  
						
						
						
						
					 
					
						2016-01-05 00:09:47 +01: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 
						 
				 
			
				
					
						
							
							
								Chimo 
							
						 
					 
					
						
						
							
						
						bf0df016e5 
					 
					
						
						
							
							OpenID plugin: 'openid_only' should be 'openidonly'  
						
						... 
						
						
						
						To match everywhere else. 
						
						
					 
					
						2016-01-04 10:36:05 -05:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						de7e8c59e8 
					 
					
						
						
							
							Version bump since we've fixed a lot of bugs  
						
						
						
						
					 
					
						2016-01-04 02:19:37 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						fb537fb7f4 
					 
					
						
						
							
							We would end up with a Managed_DataObject if now match was found  
						
						... 
						
						
						
						meaning we'd return for example a Notice with empty id (translated into 0)
and thus Faves coming in from remote instances where the fave'd notice was
not found would result in faving the first Notice in a table-wide search,
i.e. often the first post on the instance.
Whoopie! 
						
						
					 
					
						2016-01-04 02:04:18 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						065e23b1c4 
					 
					
						
						
							
							Code cleanup in lib/activityutils.php  
						
						
						
						
					 
					
						2016-01-04 01:58:45 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						00ace6c2df 
					 
					
						
						
							
							More explicit catch  
						
						
						
						
					 
					
						2016-01-04 01:53:33 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						f7a1c8a94c 
					 
					
						
						
							
							The $options array isn't used here  
						
						
						
						
					 
					
						2016-01-04 01:48:54 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						34b25e6afc 
					 
					
						
						
							
							Use EmptyIdException in Fave deletion try-catch  
						
						
						
						
					 
					
						2016-01-03 22:57:28 +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 
							
						 
					 
					
						
						
							
						
						bda30a92bc 
					 
					
						
						
							
							Fave deletion would fail in some cases with missing profiles or notices  
						
						
						
						
					 
					
						2016-01-03 22:35:49 +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 
							
						 
					 
					
						
						
							
						
						3bddf01350 
					 
					
						
						
							
							Somewhat better layout for approving/rejecting subrequests  
						
						
						
						
					 
					
						2016-01-03 20:42:21 +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 
							
						 
					 
					
						
						
							
						
						7df8a6b731 
					 
					
						
						
							
							This version of the EventPlugin won't work with StatusNet any longer  
						
						
						
						
					 
					
						2016-01-03 16:23:44 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						aa3028e5d9 
					 
					
						
						
							
							Merge branch 'nightly' of git.gnu.io:gnu/gnu-social into mmn_fixes  
						
						
						
						
					 
					
						2016-01-03 16:23:07 +01:00 
						 
				 
			
				
					
						
							
							
								mmn 
							
						 
					 
					
						
						
							
						
						3251ef3b51 
					 
					
						
						
							
							Merge branch 'beautify_profile_list' into 'nightly'  
						
						... 
						
						
						
						Beautify profiles and groups lists
Some css fixes to make groups and profiles list more consistent:
In base:
* Remove bullets that were floating around
* Reduce font size to fit and look better
* Group nickname is bold
* Same location and full name layout in both groups and profile lists
In neo-gnu:
* Align vertically location  
In neo-quitter:
* Make group list look like profile one
* Small adjustments due to changes to base
How it looks with neo-gnu
Profile:

Groups:

How it looks with neo-quitter
Profile:

Group:

See merge request !26  
						
						
					 
					
						2016-01-03 15:22:32 +00:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						95d415257a 
					 
					
						
						
							
							Merge branch 'nightly' into singpolyma/gnu-social-events-saveObjectFromActivity  
						
						... 
						
						
						
						Conflicts:
	plugins/Event/EventPlugin.php
	plugins/Event/classes/RSVP.php
I just fixed 'em with magic! 
						
						
					 
					
						2016-01-03 13:08:34 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						0dc7fcce5b 
					 
					
						
						
							
							Fixes issue  #94  with undefined 'fr'  
						
						... 
						
						
						
						I just copied the English example... 
						
						
					 
					
						2016-01-03 00:45:47 +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 
							
						 
					 
					
						
						
							
						
						fe328ae5e4 
					 
					
						
						
							
							Fix because qvitter supplies a twitter array value which is an array  
						
						... 
						
						
						
						works for json API, not for XML, so we make an exception here... 
						
						
					 
					
						2016-01-02 02:01:54 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						cf6e06a5dd 
					 
					
						
						
							
							Avoid exception for invalid URL aborting rendering for parent notice if it fails  
						
						
						
						
					 
					
						2016-01-02 00:09:10 +01:00