| 
								
								
									 hakabahitoyo | 908cefd84a | debug | 2018-07-21 02:19:20 +09:00 |  | 
				
					
						| 
								
								
									 hakabahitoyo | 9c2afb2e71 | improve test | 2018-07-21 01:44:35 +09:00 |  | 
				
					
						| 
								
								
									 Tristan Mahé | bc2668bb63 | Merge remote-tracking branch 'upstream/develop' into feature/filter_exif | 2018-07-19 17:44:18 -07: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 |  | 
				
					
						| 
								
								
									 lambda | b7001ea9e7 | Merge branch 'feature/media-description' into 'develop' Feature/media description
Closes #174
See merge request pleroma/pleroma!255 | 2018-07-18 08:52:11 +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 | 2b3f049b06 | config: formatting | 2018-07-18 00:05:36 +00: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 | 091b7925d3 | debug | 2018-07-17 17:20:13 +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 | 18cac1e36b | test: mastodon attachments: update for added description field | 2018-07-17 03:40:48 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 489453c246 | tests: verify media description api support is working | 2018-07-17 03:40:47 +00: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 |  | 
				
					
						| 
								
								
									 William Pitcock | f10291a1d3 | upload: use generic Document object type instead of Image (mastodon compatibility) Mastodon does not use the object name as alt text when the object is an Image. | 2018-07-17 03:40:45 +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 | f96244006e | change api | 2018-07-14 12:07:09 +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 |  | 
				
					
						| 
								
								
									 Tristan Mahé | 5469fb9561 | Merge remote-tracking branch 'upstream/develop' into feature/filter_exif | 2018-07-13 11:14:37 -07: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 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 7501481db4 | [Pleroma.Web.ActivityPub.Transmogrifier] Add Person finding | 2018-07-12 23:37:07 +02:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 8472fba2a7 | [Pleroma.Web.ActivityPub.Transmogrifier]: Fix actor key outside of object The code here is copied from feature/peertube by lain.
Co-authored-by: lain <lain@soykaf.club> | 2018-07-12 23:37:00 +02:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 24b5a75d09 | Add test for Plume Articles | 2018-07-12 23:08:28 +02:00 |  | 
				
					
						| 
								
								
									 William Pitcock | f1a29fc43c | test: ostatus controller: add AS2 fetching tests | 2018-07-12 20:32:56 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 0899588e4d | ostatus: return AS2 objects on /notice and /activities URLs like with /objects. | 2018-07-12 17:15:47 +00:00 |  | 
				
					
						| 
								
								
									 lambda | d93789dfde | Merge branch 'feature/object-normalization' into 'develop' object normalization
See merge request pleroma/pleroma!238 | 2018-07-12 16:48:15 +00:00 |  | 
				
					
						| 
								
								
									 lambda | ceffb91065 | Merge branch 'feature/mediaproxy-nodeinfo' into 'develop' [Pleroma.Web.Nodeinfo.NodeinfoController]: add mediaProxy metadata
Closes #229
See merge request pleroma/pleroma!235 | 2018-07-12 16:47:19 +00:00 |  | 
				
					
						| 
								
								
									 lambda | b1fcfcfae1 | Merge branch 'bugfix/activitypub-object-actor' into 'develop' activitypub: more robustly handle object-to-actor associations
See merge request pleroma/pleroma!250 | 2018-07-12 16:46:50 +00:00 |  | 
				
					
						| 
								
								
									 lambda | cbef1030b7 | Merge branch 'feature/message-summary' into 'develop' message summary
See merge request pleroma/pleroma!249 | 2018-07-12 16:45:57 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 590d4df77c | activitypub: more robustly handle object-to-actor associations | 2018-07-12 16:39:03 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | b832df1e15 | formatting | 2018-07-12 16:12:54 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 4fb64c1d86 | testsuite: twitter api: add summary where necessary | 2018-07-12 16:12:25 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | f03e57f764 | twitter api: activity representer: add summary field for testsuite | 2018-07-12 16:12:16 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 152a526237 | twitter api: refactor activity html generation, add support for Articles | 2018-07-12 16:11:42 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 3b799f22b7 | twitterapi: activity view: expose message summary text | 2018-07-12 16:11:36 +00:00 |  | 
				
					
						| 
								
								
									 lambda | b806aa36c8 | Update nodeinfo_controller.ex | 2018-07-12 06:00:55 +00:00 |  | 
				
					
						| 
								
								
									 lambda | fe4387077a | Merge branch 'feature/default-scope' into 'develop' default scope setting
See merge request pleroma/pleroma!239 | 2018-07-12 05:59:12 +00:00 |  |