Henry Jameson
								
							 
						 | 
						
							
							
							
							
								
							
							
								0673511d39
								
							
						 | 
						
							
							
								
								first version of safe DB setup
							
							
							
							
							
						 | 
						
							2017-12-04 03:56:54 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								d08a34e88b
								
							
						 | 
						
							
							
								
								OStatus: Add user bio as summary field
							
							
							
							
							
							
							
							Fixes problem with bio federation. 
							
						 | 
						
							2017-12-03 13:34:17 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Lain Iwakura
								
							 
						 | 
						
							
							
							
							
								
							
							
								5637d163e6
								
							
						 | 
						
							
							
								
								MastodonAPI: Add proper user count.
							
							
							
							
							
						 | 
						
							2017-11-30 14:59:44 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								9d1c0ec18d
								
							
						 | 
						
							
							
								
								Merge branch 'salmon-native-keys' into 'develop'
							
							
							
							
							
							
							
							Salmon: generate private key with native crypto if available.
See merge request pleroma/pleroma!33 
							
						 | 
						
							2017-11-28 16:46:01 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									href
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								4524721fba
								
							
						 | 
						
							
							
								
								Salmon: generate private key with native crypto if available.
							
							
							
							
							
						 | 
						
							2017-11-28 16:50:12 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Lain Iwakura
								
							 
						 | 
						
							
							
							
							
								
							
							
								c680ae581d
								
							
						 | 
						
							
							
								
								Return xml notice at /notice path.
							
							
							
							
							
						 | 
						
							2017-11-27 17:24:52 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Lain Iwakura
								
							 
						 | 
						
							
							
							
							
								
							
							
								44dc694882
								
							
						 | 
						
							
							
								
								Add configuration generation tool, update readme.
							
							
							
							
							
						 | 
						
							2017-11-23 16:22:20 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								d16b613929
								
							
						 | 
						
							
							
								
								MastodonUI login: Show error message on error.
							
							
							
							
							
						 | 
						
							2017-11-23 12:06:14 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								698a75cb39
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into 'develop'
							
							
							
							
							
							
							
							Pleroma-Dark default theme for the Mastodon Frontend
See merge request pleroma/pleroma!27 
							
						 | 
						
							2017-11-22 14:19:27 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eal
								
							 
						 | 
						
							
							
							
							
								
							
							
								1625021a9c
								
							
						 | 
						
							
							
								
								Merge branch 'fix/self-follow' into 'develop'
							
							
							
							
							
							
							
							Dont include the user in their own follower count.
See merge request pleroma/pleroma!29 
							
						 | 
						
							2017-11-21 23:09:59 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eal
								
							 
						 | 
						
							
							
							
							
								
							
							
								e9037ffc8d
								
							
						 | 
						
							
							
								
								Do not include user in their own follower count.
							
							
							
							
							
						 | 
						
							2017-11-21 15:33:09 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eal
								
							 
						 | 
						
							
							
							
							
								
							
							
								fa19de97ba
								
							
						 | 
						
							
							
								
								MastoAPI: no more than 4 attachments.
							
							
							
							
							
						 | 
						
							2017-11-20 22:49:20 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								747a68a075
								
							
						 | 
						
							
							
								
								Treat internal emoji like external.
							
							
							
							
							
						 | 
						
							2017-11-20 17:53:21 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								cf0bbf320d
								
							
						 | 
						
							
							
								
								MastoAPI: Add max_toot_chars.
							
							
							
							
							
						 | 
						
							2017-11-20 08:54:47 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eal
								
							 
						 | 
						
							
							
							
							
								
							
							
								bd921ca5d7
								
							
						 | 
						
							
							
								
								Fix posts being streamed to non-local websocket channels.
							
							
							
							
							
						 | 
						
							2017-11-20 07:58:43 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eal
								
							 
						 | 
						
							
							
							
							
								
							
							
								4db5954786
								
							
						 | 
						
							
							
								
								Don't let the user unfollow their own account.
							
							
							
							
							
						 | 
						
							2017-11-20 07:50:56 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eal
								
							 
						 | 
						
							
							
							
							
								
							
							
								aadf54e0df
								
							
						 | 
						
							
							
								
								Don't show the user in their own following count.
							
							
							
							
							
						 | 
						
							2017-11-20 00:31:39 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hyper! (Stitch)
								
							 
						 | 
						
							
							
							
							
								
							
							
								36011fee4e
								
							
						 | 
						
							
							
								
								Add Custom Pleroma-dark theme
							
							
							
							
							
						 | 
						
							2017-11-19 19:07:19 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								52aa65fe6e
								
							
						 | 
						
							
							
								
								Federator Queue: Add seperate in/out queues.
							
							
							
							
							
						 | 
						
							2017-11-19 15:10:51 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								5ff5d583b6
								
							
						 | 
						
							
							
								
								MastodonAPI: Streaming fixes.
							
							
							
							
							
							
							
							Now shows repeats in the home tl. 
							
						 | 
						
							2017-11-19 13:47:50 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								0f099dac67
								
							
						 | 
						
							
							
								
								MastodonAPI: Add sign out.
							
							
							
							
							
							
							
							Close #79 
							
						 | 
						
							2017-11-19 13:23:16 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								c336a13d2c
								
							
						 | 
						
							
							
								
								MastoAPI: Only return create activties in contexts.
							
							
							
							
							
						 | 
						
							2017-11-19 12:59:23 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thog
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								59770c3f5c
								
							
						 | 
						
							
							
								
								Fix all compilation warnings
							
							
							
							
							
						 | 
						
							2017-11-19 02:22:07 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								ed3403ad8b
								
							
						 | 
						
							
							
								
								Merge branch 'formatting-fixes' into 'develop'
							
							
							
							
							
							
							
							Formatting fixes
Closes #80
See merge request pleroma/pleroma!22 
							
						 | 
						
							2017-11-18 15:58:44 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eal
								
							 
						 | 
						
							
							
							
							
								
							
							
								146ec80285
								
							
						 | 
						
							
							
								
								Merge branch 'fix/mastofe-login-redirect' into 'develop'
							
							
							
							
							
							
							
							Redirect to Getting Started on login.
See merge request pleroma/pleroma!21 
							
						 | 
						
							2017-11-18 14:38:05 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eal
								
							 
						 | 
						
							
							
							
							
								
							
							
								f53cdabcdf
								
							
						 | 
						
							
							
								
								Add #nsfw tag if sensitive content bit is set
							
							
							
							
							
						 | 
						
							2017-11-18 16:30:18 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eal
								
							 
						 | 
						
							
							
							
							
								
							
							
								31e4277ba5
								
							
						 | 
						
							
							
								
								Don't add summary if empty.
							
							
							
							
							
						 | 
						
							2017-11-18 15:25:22 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eal
								
							 
						 | 
						
							
							
							
							
								
							
							
								fb118b2978
								
							
						 | 
						
							
							
								
								Don't insert newlines to generated HTML.
							
							
							
							
							
							
							
							MastoFE doesn't like them. 
							
						 | 
						
							2017-11-18 14:46:54 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eal
								
							 
						 | 
						
							
							
							
							
								
							
							
								66e78c3ec4
								
							
						 | 
						
							
							
								
								Escape HTML instead of discarding it.
							
							
							
							
							
						 | 
						
							2017-11-18 14:43:41 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								4647bcd6e6
								
							
						 | 
						
							
							
								
								Don't start streamer during tests.
							
							
							
							
							
						 | 
						
							2017-11-18 12:22:07 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eal
								
							 
						 | 
						
							
							
							
							
								
							
							
								9c60cc88df
								
							
						 | 
						
							
							
								
								Redirect to Getting Started on login.
							
							
							
							
							
						 | 
						
							2017-11-16 20:47:44 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								a743940463
								
							
						 | 
						
							
							
								
								MastoAPI: Implement all streaming functions.
							
							
							
							
							
						 | 
						
							2017-11-16 16:49:51 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								5719f69ae3
								
							
						 | 
						
							
							
								
								MastodonAPI: Stream fixes.
							
							
							
							
							
						 | 
						
							2017-11-16 13:48:58 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								43499848d0
								
							
						 | 
						
							
							
								
								Small css fix.
							
							
							
							
							
						 | 
						
							2017-11-16 12:58:33 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Shpuld Shpuldson
								
							 
						 | 
						
							
							
							
							
								
							
							
								189513e4ff
								
							
						 | 
						
							
							
								
								Add styles to make login page resemble mastodon's
							
							
							
							
							
						 | 
						
							2017-11-16 13:26:56 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								8de890a0d9
								
							
						 | 
						
							
							
								
								Add custom emoji to Mastodon UI initial state.
							
							
							
							
							
						 | 
						
							2017-11-16 09:40:06 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								ced0d64d75
								
							
						 | 
						
							
							
								
								MastoAPI: Make attachment ids strings.
							
							
							
							
							
						 | 
						
							2017-11-15 18:58:39 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								1cca544e20
								
							
						 | 
						
							
							
								
								Merge branch 'twitterapi-bitlbee' into 'develop'
							
							
							
							
							
							
							
							TwitterAPI: Add missing endpoints for bitlbee.
Closes #67
See merge request pleroma/pleroma!18 
							
						 | 
						
							2017-11-14 16:47:54 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eal
								
							 
						 | 
						
							
							
							
							
								
							
							
								f9828e578c
								
							
						 | 
						
							
							
								
								TwitterAPI: Add /users/show.
							
							
							
							
							
						 | 
						
							2017-11-14 17:34:48 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eal
								
							 
						 | 
						
							
							
							
							
								
							
							
								163c658202
								
							
						 | 
						
							
							
								
								TwitterAPI: Add unimplemented /mutes/users/ids.
							
							
							
							
							
						 | 
						
							2017-11-14 16:12:52 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eal
								
							 
						 | 
						
							
							
							
							
								
							
							
								22bbe27115
								
							
						 | 
						
							
							
								
								TwitterAPI: Add unimplemented /friendships/no_retweets/ids.
							
							
							
							
							
						 | 
						
							2017-11-14 16:10:13 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eal
								
							 
						 | 
						
							
							
							
							
								
							
							
								3533bf7eac
								
							
						 | 
						
							
							
								
								TwitterAPI: Add /friends/ids.
							
							
							
							
							
						 | 
						
							2017-11-14 16:04:58 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eal
								
							 
						 | 
						
							
							
							
							
								
							
							
								06c3ee3bac
								
							
						 | 
						
							
							
								
								Accept 1 as true.
							
							
							
							
							
						 | 
						
							2017-11-14 15:54:50 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eal
								
							 
						 | 
						
							
							
							
							
								
							
							
								c84723b679
								
							
						 | 
						
							
							
								
								MastoAPI: Add media timelines.
							
							
							
							
							
						 | 
						
							2017-11-14 15:41:16 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								083cd169d2
								
							
						 | 
						
							
							
								
								MastoAPI: Fix repeat api bug.
							
							
							
							
							
							
							
							Documentation was wrong, reblogging actually returns the reblog, not
the reblogged status. 
							
						 | 
						
							2017-11-13 09:48:56 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								5fc6e9d467
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
							
							
							
							
							
						 | 
						
							2017-11-12 14:25:15 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								d293ceb1b5
								
							
						 | 
						
							
							
								
								Add Mastodon frontend.
							
							
							
							
							
						 | 
						
							2017-11-12 14:23:05 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								08bc316742
								
							
						 | 
						
							
							
								
								Merge branch 'mastodon-notification-endpoints' into 'develop'
							
							
							
							
							
							
							
							MastoAPI: Add notification endpoints get, clear and dismiss.
Closes #42
See merge request pleroma/pleroma!13 
							
						 | 
						
							2017-11-12 11:08:06 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								87dee3902a
								
							
						 | 
						
							
							
								
								Merge branch 'filetype-recognition' into 'develop'
							
							
							
							
							
							
							
							Use headers for file content type recognition.
See merge request pleroma/pleroma!14 
							
						 | 
						
							2017-11-12 09:27:59 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								efcf54dc02
								
							
						 | 
						
							
							
								
								Merge branch 'mastoapi-update-credentials' into 'develop'
							
							
							
							
							
							
							
							MastoAPI: Add update credentials endpoint.
Closes #61
See merge request pleroma/pleroma!15 
							
						 | 
						
							2017-11-12 09:24:32 +00:00 | 
						
						
							
							
							
								
							
							
						 |