| 
								
								
									 ensra | cdb3dd48ab | Format | 2018-08-21 14:12:55 +01:00 |  | 
				
					
						| 
								
								
									 ensra | 5debd7b5cc | Twitter API: Support Mastodon-style bios (multi-line, with links, and user mentions) | 2018-08-21 14:03:36 +01:00 |  | 
				
					
						| 
								
								
									 kaniini | c1b8a6a73b | Merge branch 'feature/formatter-consistent-hashtag-mentions' into 'develop' formatter: consistent presentation of hashtags and mentions
See merge request pleroma/pleroma!280 | 2018-08-20 18:44:52 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | c033d2004b | formatting | 2018-08-20 18:40:05 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 145546e52a | common api: format hashtags in the same way as we format mentions | 2018-08-20 18:39:47 +00:00 |  | 
				
					
						| 
								
								
									 eal | f1c407e777 | Merge branch 'fix/redirect-on-user-fetch' into 'develop' ActivityPub: follow redirects when fetching user
See merge request pleroma/pleroma!278 | 2018-08-20 12:13:07 +00:00 |  | 
				
					
						| 
								
								
									 eal | 51a21284c6 | ActivityPub: follow redirects when fetching user | 2018-08-20 15:03:25 +03:00 |  | 
				
					
						| 
								
								
									 shadowfacts | 6698749073 | Fix typo in app creation response Mastodon sends redirect_uri (singular), so should Pleroma. | 2018-08-17 12:48:24 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | a3ef2ebb35 | mastodon api controller: client_name, not name | 2018-08-16 23:50:49 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | b5a92b1199 | mastodon api: add undocumented fields to json response, return app id as string like mastodon itself does | 2018-08-16 23:40:42 +00:00 |  | 
				
					
						| 
								
								
									 kaniini | c004b6ea0a | Merge branch 'mastofe/system-font' into 'develop' Mastodon frontend: Use system font
See merge request pleroma/pleroma!247 | 2018-08-16 15:38:59 +00:00 |  | 
				
					
						| 
								
								
									 kaniini | 5fbb14f5ec | Merge branch 'bugfix/federation-kroeg' into 'develop' fix federation with kroeg
See merge request pleroma/pleroma!272 | 2018-08-16 15:20:15 +00:00 |  | 
				
					
						| 
								
								
									 kaniini | 38361e7b5e | Merge branch 'fix/put-repeats-at-activitypub-outbox' into 'develop' Fix: Output repeats at ActivityPub outbox
Closes #191
See merge request pleroma/pleroma!175 | 2018-08-16 15:19:46 +00:00 |  | 
				
					
						| 
								
								
									 lambda | 9908cf8fda | Merge branch 'feature/suggestions-api-with-third-party-recommendation-engine' into 'develop' Feature / Suggestions API with third party recommendation engine
See merge request pleroma/pleroma!254 | 2018-08-15 07:47:33 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | f446e75577 | activitypub: transmogrifier: add necessary translations for kroeg | 2018-08-14 17:09:11 +00:00 |  | 
				
					
						| 
								
								
									 lain | 8c0c930041 | formatting | 2018-08-12 19:42:21 +02:00 |  | 
				
					
						| 
								
								
									 lain | ffd9ad1f0c | Fix for elixir 1.7. | 2018-08-12 18:41:33 +02:00 |  | 
				
					
						| 
								
								
									 lambda | 13440a80e1 | Merge branch 'feature/invites' into 'develop' Invites
Closes #108
See merge request pleroma/pleroma!208 | 2018-08-12 12:04:15 +00:00 |  | 
				
					
						| 
								
								
									 lambda | 9de6145737 | Merge branch 'fix/remote-follow-errormessage' into 'develop' Remote follow: don't show confusing error if already following
See merge request pleroma/pleroma!267 | 2018-08-12 10:55:53 +00:00 |  | 
				
					
						| 
								
								
									 eal | db5cdfa333 | Remote follow: don't show confusing error if already following | 2018-08-09 20:47:29 +03:00 |  | 
				
					
						| 
								
								
									 eal | 37b802682c | HTML-sanitize usernames before emojifying. | 2018-08-09 13:07:03 +03:00 |  | 
				
					
						| 
								
								
									 eal | ed9738e031 | Add tests for emoji in user profiles Also use the correct field in TwitterAPI... | 2018-08-08 09:24:50 +03:00 |  | 
				
					
						| 
								
								
									 eal | cee63ad3f7 | TwitterAPI user view: add screen_name_html and description_html. | 2018-08-08 08:38:25 +03:00 |  | 
				
					
						| 
								
								
									 eal | c2d1a5e9c4 | MastoAPI AccountView: render profile emoji. | 2018-08-07 21:56:50 +03:00 |  | 
				
					
						| 
								
								
									 Hakaba Hitoyo | f72cfada1a | add suggestions/web config | 2018-08-02 18:03:35 +09:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 3be58ad34e | activitypub: actually send digest header when federating this is needed for backwards compatibility with non-digest pleroma instances | 2018-08-01 10:32:02 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 8da406afa2 | activitypub: verify remote http signature digests by recomputing the digest and replacing the digest header | 2018-07-31 23:24:30 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 2890aef9e8 | activitypub: add digest header to outbound messages and sign it | 2018-07-31 23:24:30 +00:00 |  | 
				
					
						| 
								
								
									 Hakaba Hitoyo | cc9c062b55 | merge | 2018-07-19 17:42:00 +09:00 |  | 
				
					
						| 
								
								
									 lambda | 41b0ecef95 | Merge branch 'tests/plume' into 'develop' Articles/Notes with a actor list outside object
See merge request pleroma/pleroma!252 | 2018-07-19 07:35:34 +00:00 |  | 
				
					
						| 
								
								
									 lambda | 54963a6379 | Merge branch 'bugfix/activitystreams-notice-urls' into 'develop' ostatus: return AS2 objects on /notice and /activities URLs like with /objects.
Closes #206
See merge request pleroma/pleroma!251 | 2018-07-19 07:31:33 +00:00 |  | 
				
					
						| 
								
								
									 lambda | 6f23fb53d3 | Merge branch 'feature/fe-configuration' into 'develop' serverside frontend configuration
See merge request pleroma/pleroma!256 | 2018-07-19 07:31:10 +00:00 |  | 
				
					
						| 
								
								
									 Hakaba Hitoyo | b12d17d2ce | configurable timeout | 2018-07-18 13:36:20 +09:00 |  | 
				
					
						| 
								
								
									 Hakaba Hitoyo | e4dd58307a | better configuration | 2018-07-18 09:58:59 +09:00 |  | 
				
					
						| 
								
								
									 William Pitcock | b23630076f | TwitterAPI: present pleroma frontend config in API | 2018-07-17 15:46:24 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | cf219b6add | config: make instance description configurable | 2018-07-17 15:46:23 +00:00 |  | 
				
					
						| 
								
								
									 Hakaba Hitoyo | 5b4a21317d | correct error message | 2018-07-17 17:29:18 +09:00 |  | 
				
					
						| 
								
								
									 Hakaba Hitoyo | 8ff336e02a | debug | 2018-07-17 17:00:14 +09:00 |  | 
				
					
						| 
								
								
									 Hakaba Hitoyo | 2b7b1b3e6b | add suggestionsThirdPartyEngine into /nodeinfo/2.0.json | 2018-07-17 16:56:30 +09:00 |  | 
				
					
						| 
								
								
									 Hakaba Hitoyo | d76f0d87be | do nothing if configuration is skipped | 2018-07-17 16:45:18 +09:00 |  | 
				
					
						| 
								
								
									 Hakaba Hitoyo | df3233e7e7 | improve getting host name | 2018-07-17 13:20:58 +09:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 99c0252314 | mastodon api: support descriptions in media api, add PUT endpoint for updating metadata about a media upload | 2018-07-17 03:40:47 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | cd19d37a90 | mastodon api: use object name as alt text | 2018-07-17 03:40:46 +00:00 |  | 
				
					
						| 
								
								
									 hakabahitoyo | e7c580828c | format | 2018-07-15 20:36:26 +09:00 |  | 
				
					
						| 
								
								
									 hakabahitoyo | 2eeaf01627 | id field | 2018-07-14 14:03:30 +09:00 |  | 
				
					
						| 
								
								
									 hakabahitoyo | 127882a5d5 | configurable | 2018-07-14 11:41:09 +09:00 |  | 
				
					
						| 
								
								
									 hakabahitoyo | eb0afda3a7 | http access to third party user recommendation | 2018-07-14 10:04:37 +09:00 |  | 
				
					
						| 
								
								
									 hakabahitoyo | 3812b627ca | better mock /api/v1/suggestions | 2018-07-14 00:52:23 +09:00 |  | 
				
					
						| 
								
								
									 hakabahitoyo | 4a21c1b343 | mock /api/v1/suggestions | 2018-07-14 00:44:18 +09:00 |  | 
				
					
						| 
								
								
									 hakabahitoyo | f944f8157a | /api/v1/suggestions endpoint | 2018-07-14 00:21:38 +09:00 |  |