| 
								
								
									 lain | c78e7d8b11 | Fix formatting. | 2018-04-24 21:25:31 +02:00 |  | 
				
					
						| 
								
								
									 lambda | 7a52c4549c | Merge branch 'feature/message-rewrite-facility' into 'develop' message rewrite facility
See merge request pleroma/pleroma!112 | 2018-04-24 17:21:28 +00:00 |  | 
				
					
						| 
								
								
									 Dashie | afe892ddac | Correct syntax with mix format | 2018-04-24 14:12:23 +02:00 |  | 
				
					
						| 
								
								
									 Dashie | 9972678a68 | Add User.decrease_note_count and call it from ActivityPub.delete | 2018-04-24 11:34:18 +02:00 |  | 
				
					
						| 
								
								
									 lambda | 62a2287bba | Merge branch 'favicon_tag' into 'develop' Fix endpoint for favicon
See merge request pleroma/pleroma!84 | 2018-04-24 05:54:28 +00:00 |  | 
				
					
						| 
								
								
									 lain | 0574df273c | Small cleanup. | 2018-04-22 10:01:10 +02:00 |  | 
				
					
						| 
								
								
									 lain | 114ca9e069 | Merge branch 'develop' into fix/note-count-not-updating | 2018-04-22 09:56:24 +02:00 |  | 
				
					
						| 
								
								
									 lain | 0c221943ef | Formatter: Use proper escaping for links. | 2018-04-21 18:27:31 +02:00 |  | 
				
					
						| 
								
								
									 eal | 22bfeac256 | Update note count in ActivityPub.create. | 2018-04-21 12:58:04 +03:00 |  | 
				
					
						| 
								
								
									 lain | 9e6ae44729 | Formatting fixes. | 2018-04-21 09:43:53 +02:00 |  | 
				
					
						| 
								
								
									 lain | ff5e957476 | Make search use id index too. Seems to be faster in general, query planner chooses well. | 2018-04-21 09:22:31 +02:00 |  | 
				
					
						| 
								
								
									 lain | a61e8ac154 | Formatting. | 2018-04-20 13:10:57 +02:00 |  | 
				
					
						| 
								
								
									 eal | fa37acfcc7 | TwitterAPI: Add Qvitter notification endpoint. | 2018-04-19 21:46:59 +03:00 |  | 
				
					
						| 
								
								
									 nenolod@dereferenced.org | f08f9d4498 | ActivityPub MRF: fix nsfw tagging of objects with attachments by looking at the right object (the child in this case) | 2018-04-19 07:45:09 -05:00 |  | 
				
					
						| 
								
								
									 William Pitcock | ee6f15529d | CommonAPI post: kill \r with fire | 2018-04-18 15:46:39 -05:00 |  | 
				
					
						| 
								
								
									 eal | 947431e9aa | MastoAPI and OAuth: allow login with either email or username. | 2018-04-18 13:13:57 +03:00 |  | 
				
					
						| 
								
								
									 William Pitcock | d24ddd9fb9 | ActivityPub MRF: implement the SimplePolicy policy | 2018-04-14 06:32:45 -05:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 4a178b3d65 | ActivityPub: implement MRF core hook and baseline noop policy object | 2018-04-14 06:32:44 -05:00 |  | 
				
					
						| 
								
								
									 Gian Sass | 907df9b8ed | Fix issue #124 | 2018-04-11 14:55:49 -04:00 |  | 
				
					
						| 
								
								
									 lain | 1dd2c8163f | Order masto searches by date. | 2018-04-10 18:38:52 +02:00 |  | 
				
					
						| 
								
								
									 lambda | d7c2909ce2 | Merge branch 'bugfix/user-search-with-at-sign' into 'develop' user: strip leading @ from user query when searching for users if present
Closes #117
See merge request pleroma/pleroma!99 | 2018-04-09 08:42:01 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 2edde06042 | user: strip leading @ from user query when searching for users if present closes #117 | 2018-04-09 02:42:37 -05:00 |  | 
				
					
						| 
								
								
									 lambda | 9998b4519d | Merge branch 'feature/mastodon-api-for-tootstream' into 'develop' mastodon api emulation improvements for tootstream
Closes #101
See merge request pleroma/pleroma!100 | 2018-04-08 06:02:11 +00:00 |  | 
				
					
						| 
								
								
									 lambda | 9a2d3705c6 | Merge branch 'fix/persisted-mastofe-settings' into 'develop' MastoAPI: Persist frontend timelines and settings.
Closes #113
See merge request pleroma/pleroma!98 | 2018-04-08 06:01:06 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 1857f403be | mastodon api: report version as the Mastodon API version supported with the real version in parenthesis | 2018-04-07 17:29:28 -05:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 52a1a40d7d | mastodon api: implement /api/v1/lists stub | 2018-04-07 17:29:27 -05:00 |  | 
				
					
						| 
								
								
									 lain | 8f9bcc4ab0 | Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop | 2018-04-07 16:41:47 +02:00 |  | 
				
					
						| 
								
								
									 lain | 70bcdf32bd | Only search in public data for now. This should be the data the user is allowed to see later, but this
will stop accidental private message leaks. | 2018-04-07 16:40:45 +02:00 |  | 
				
					
						| 
								
								
									 eal | 7c47534970 | MastoAPI: Persist frontend timelines and settings. | 2018-04-07 17:26:56 +03:00 |  | 
				
					
						| 
								
								
									 lambda | d41bfd1d47 | Merge branch 'bugfix/html-webfinger-host-meta' into 'develop' webfinger: handle situations where the well-known endpoint returns HTML
See merge request pleroma/pleroma!94 | 2018-04-07 12:19:49 +00:00 |  | 
				
					
						| 
								
								
									 eal | e7ddda44c0 | Follow import: allow URI in addition to screen_name. | 2018-04-07 15:00:23 +03:00 |  | 
				
					
						| 
								
								
									 William Pitcock | bf9d3d4aba | XML: use try/catch with XPath functions | 2018-04-06 22:56:09 -05:00 |  | 
				
					
						| 
								
								
									 lain | 60f92e406c | Accept port number in urls. | 2018-04-06 16:35:54 +02:00 |  | 
				
					
						| 
								
								
									 lain | 303289d7da | MastodonAPI search: return only create activities. | 2018-04-05 13:59:53 +02:00 |  | 
				
					
						| 
								
								
									 RX14 | 033771d9f1 | Fix failure to serve media from custom upload path | 2018-04-05 11:46:33 +01:00 |  | 
				
					
						| 
								
								
									 lain | d70d1c427a | TwitterAPI: Don't put follows into the public tls. | 2018-04-04 15:23:27 +02:00 |  | 
				
					
						| 
								
								
									 lain | 81600c94f4 | Handle + in links. | 2018-04-04 11:29:03 +02:00 |  | 
				
					
						| 
								
								
									 lain | 806550c921 | Use user url in mention if we have it. | 2018-04-03 18:32:46 +02:00 |  | 
				
					
						| 
								
								
									 lain | b3b7ab5d9a | Load all users at once in timelines. | 2018-04-02 16:35:41 +02:00 |  | 
				
					
						| 
								
								
									 lain | 96007753ad | Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop | 2018-04-02 15:29:05 +02:00 |  | 
				
					
						| 
								
								
									 lain | 360c51f1f5 | Use context_ids directly if we have them. | 2018-04-02 15:28:35 +02:00 |  | 
				
					
						| 
								
								
									 lain | bc31bee7c4 | Generates contexts and ids on insertion time. | 2018-04-02 15:17:09 +02:00 |  | 
				
					
						| 
								
								
									 lain | a4db3a732f | Pre-fetch conversation ids. | 2018-04-02 14:46:56 +02:00 |  | 
				
					
						| 
								
								
									 lambda | 807d243c64 | Merge branch 'fix-107' into 'develop' masto api: run emojis through mediaproxy
Closes #107
See merge request pleroma/pleroma!92 | 2018-04-02 11:24:12 +00:00 |  | 
				
					
						| 
								
								
									 lain | cd543d58a1 | Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop | 2018-04-02 13:15:38 +02:00 |  | 
				
					
						| 
								
								
									 lain | 0a14d155d6 | Fail faster. | 2018-04-02 13:13:14 +02:00 |  | 
				
					
						| 
								
								
									 lain | 1b57522bba | Fix some test stuff. | 2018-04-02 13:13:04 +02:00 |  | 
				
					
						| 
								
								
									 Morgan Bazalgette | 5e4bb4ad92 | masto api: run emojis through mediaproxy fixes #107 | 2018-04-02 12:04:11 +02:00 |  | 
				
					
						| 
								
								
									 lambda | 978df55a86 | Merge branch 'feature/mastodon-search-tags' into 'develop' mastodon search api: implement a reasonable hashtags stub
See merge request pleroma/pleroma!89 | 2018-04-01 08:37:45 +00:00 |  | 
				
					
						| 
								
								
									 KANEKO Yoshitaka | b3d67750f0 | Fix conflict | 2018-04-01 16:58:35 +09:00 |  |