| 
								
								
									 William Pitcock | c2b69798dd | twitter api: add support for disabling rich text | 2018-09-22 02:53:02 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 2f5b026548 | twitter api: add support for user-specified html policy | 2018-09-22 02:53:01 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | c9585ec007 | twitter api: fix mimetype fallback when attachments use a URI instead of a URL object | 2018-09-19 04:59:26 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | e82ce2a4b3 | formatting | 2018-09-10 00:28:40 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | ac486fc59b | everywhere: use Pleroma.HTML module instead of HtmlSanitizeEx directly | 2018-09-10 00:14:47 +00:00 |  | 
				
					
						| 
								
								
									 kaniini | b7923aa304 | Merge branch 'hotfix_broken_likes' into 'develop' hotfix for broken like completely breaking the notifications API
See merge request pleroma/pleroma!284 | 2018-09-02 12:37:00 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | e2ce0e9e05 | run mix format. | 2018-09-01 21:12:42 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | c921d99898 | config: add ability to disable Pleroma FE config management (closes #276) | 2018-09-01 21:05:32 +00:00 |  | 
				
					
						| 
								
								
									 lambda | 58539e1357 | Revert "Merge branch 'feature/rich-text' into 'develop'" This reverts merge request !309 | 2018-08-31 09:51:20 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 856b5e1ca4 | config: chase pleroma-fe updates from MR pleroma-fe!324. | 2018-08-31 04:01:21 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 6aa65b68b8 | common api: add support for formatting messages outside of twitter-style plain text | 2018-08-31 03:13:59 +00:00 |  | 
				
					
						| 
								
								
									 Henry Jameson | 0f1c629d65 | better solution, added test. | 2018-08-27 17:07:26 +03:00 |  | 
				
					
						| 
								
								
									 hakabahitoyo | 946a0769c4 | remove unused settings from /api/statusnet/config | 2018-08-26 17:40:15 +09:00 |  | 
				
					
						| 
								
								
									 William Pitcock | aab2bdddf4 | twitter api: provide object descriptions as attachment description field | 2018-08-25 00:12:58 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 09cb402203 | fe config: add collapse_message_with_subject fe option | 2018-08-24 18:21:42 +00:00 |  | 
				
					
						| 
								
								
									 Henry Jameson | 9b046d2a84 | fixed notifications API completely breaking if there's a like for missing (deleted) post. | 2018-08-22 16:10:59 +03:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 643f373514 | Run mix format | 2018-08-22 12:09:01 +02:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | d5bdd55b5d | [Pleroma.Web.TwitterAPI.UserView]: Do not fail if user.bio is nil | 2018-08-22 01:47:25 +02:00 |  | 
				
					
						| 
								
								
									 kaniini | f6b06d2ac8 | Merge branch 'feature/peertube_2' into 'develop' rebase/update of feature/peertube
See merge request pleroma/pleroma!217 | 2018-08-21 16:58:44 +00:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 74c74decf5 | Basic peertube support. | 2018-08-21 18:24:09 +02:00 |  | 
				
					
						| 
								
								
									 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 |  | 
				
					
						| 
								
								
									 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 |  | 
				
					
						| 
								
								
									 William Pitcock | b23630076f | TwitterAPI: present pleroma frontend config in API | 2018-07-17 15:46:24 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | b832df1e15 | formatting | 2018-07-12 16:12:54 +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 | 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 |  | 
				
					
						| 
								
								
									 William Pitcock | 971bb4f2bd | activity interpretation: formatting | 2018-06-27 13:38:19 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 66819ea784 | twitter api: use ActivityView.render_content() where appropriate instead of duplicating the logic | 2018-06-27 13:38:07 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 121c1f6230 | twitter api: refactor activity html generation, add support for Articles | 2018-06-27 13:37:53 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 2f14996d9a | twitter api: allow setting default_scope | 2018-06-27 13:15:55 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | dcdf7b6686 | twitter api: user view: show default message scope if known | 2018-06-27 13:15:50 +00:00 |  | 
				
					
						| 
								
								
									 Vivian Lim | 1299bccc7d | return unquoted empty array from /api/qvitter/mutes.json | 2018-06-23 23:20:30 -07:00 |  | 
				
					
						| 
								
								
									 lambda | 8c7fdcb31b | Merge branch 'feature/twitterapi-unrepeat' into 'develop' Add TwitterAPI unretweet endpoint and cleanup AP.unannounce
See merge request pleroma/pleroma!218 | 2018-06-14 07:19:36 +00:00 |  | 
				
					
						| 
								
								
									 Francis Dinh | 1555c66650 | Add unretweet TwAPI endpoint and cleanup AP.unannounce | 2018-06-13 21:33:36 -04:00 |  | 
				
					
						| 
								
								
									 Henry Jameson | 9c1cf1befb | formatting | 2018-06-12 15:01:40 +03:00 |  | 
				
					
						| 
								
								
									 Henry Jameson | f42ffbe9a8 | Initial invites support + tests. | 2018-06-12 14:55:16 +03:00 |  | 
				
					
						| 
								
								
									 William Pitcock | f8e0942745 | twitter api: add approve/deny endpoints | 2018-06-11 22:15:53 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | e08cf21e5b | twitter api: add friend requests list api | 2018-06-11 22:15:53 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | ba8dab7542 | twitterapi: user view: return if an account is locked or not | 2018-06-11 22:15:53 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 993312cdb3 | twitterapi: add profile setting for locked/unlocked accounts | 2018-06-11 22:15:53 +00:00 |  | 
				
					
						| 
								
								
									 Rachel H | 1525a0404b | Fix follow errors | 2018-06-07 00:39:24 -07:00 |  | 
				
					
						| 
								
								
									 lain | 0f70e83e8c | Better error handling in TwitterApiController. | 2018-06-03 19:11:22 +02:00 |  | 
				
					
						| 
								
								
									 eal | 935e544e19 | TwitterAPI: fix "Follows you" being shown for the wrong user. | 2018-05-31 15:27:42 +03:00 |  | 
				
					
						| 
								
								
									 lain | 3ece4a3ebc | Only return certain activities in TwitterAPI mentions. | 2018-05-28 12:38:48 +02:00 |  | 
				
					
						| 
								
								
									 William Pitcock | e80d91c64a | introduce User.maybe_direct_follow() and use it where we used to call User.follow() | 2018-05-25 09:40:10 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | c89b90222c | twitter api: also remove explicit User.follow here | 2018-05-25 09:40:06 +00:00 |  | 
				
					
						| 
								
								
									 lambda | c2dcd767cf | Merge branch 'feature/incoming-remote-unfollow' into 'develop' Add support for incoming remote unfollows and blocks/unblocks
See merge request pleroma/pleroma!158 | 2018-05-24 19:52:24 +00:00 |  | 
				
					
						| 
								
								
									 Francis Dinh | 72b93d13f8 | Hook up block/unblock to TwitterAPI | 2018-05-22 05:41:17 -04:00 |  | 
				
					
						| 
								
								
									 Francis Dinh | 55f9aefd08 | Hook unfollow into TwitterAPI | 2018-05-22 04:49:30 -04:00 |  | 
				
					
						| 
								
								
									 Syldexia | d0690622cd | Added endpoint for changing passwords | 2018-05-21 23:06:03 +01:00 |  | 
				
					
						| 
								
								
									 Francis Dinh | 89c5de9096 | Fix unfollows | 2018-05-20 21:01:14 -04:00 |  | 
				
					
						| 
								
								
									 lain | dca26f3655 | Fix specs. | 2018-05-20 19:22:26 +02:00 |  | 
				
					
						| 
								
								
									 lain | ff007af0c2 | Return visilility in twitter api, too. | 2018-05-20 18:01:24 +02:00 |  | 
				
					
						| 
								
								
									 lain | 434601a5c3 | Return private / direct posts on user timelines, too. | 2018-05-20 16:15:18 +02:00 |  | 
				
					
						| 
								
								
									 lambda | 8b0c222b43 | Merge branch 'feature/account-deletion' into 'develop' Feature/account deletion
Closes #115
See merge request pleroma/pleroma!157 | 2018-05-20 10:57:19 +00:00 |  | 
				
					
						| 
								
								
									 Thog | 6f39ecc41b | Support Undo like activities (Fix #139) | 2018-05-19 22:14:15 +02:00 |  | 
				
					
						| 
								
								
									 Syldexia | d1366f8d46 | Modified deleting an account to run as a task | 2018-05-19 13:35:49 +01:00 |  | 
				
					
						| 
								
								
									 Syldexia | 5bfb7b4ce6 | Moved account deletion stuff to somewhere that hopefully makes more sense | 2018-05-13 14:36:02 +01:00 |  | 
				
					
						| 
								
								
									 Syldexia | a16117225f | Added endpoint for user account deletion | 2018-05-13 14:35:48 +01:00 |  | 
				
					
						| 
								
								
									 lambda | aeff2d6474 | Merge branch 'feature/unrepeats' into 'develop' Add unrepeats
Closes #69
See merge request pleroma/pleroma!113 | 2018-05-13 09:32:29 +00:00 |  | 
				
					
						| 
								
								
									 Mark Felder | aaacebd906 | Fix unused variables, imports, and aliases | 2018-05-04 21:42:20 +00:00 |  | 
				
					
						| 
								
								
									 Mark Felder | 636f0fa402 | Clean up unused aliases and imports | 2018-05-04 21:25:31 +00:00 |  | 
				
					
						| 
								
								
									 Mark Felder | 943820ae29 | More unused variables | 2018-05-04 21:16:02 +00:00 |  | 
				
					
						| 
								
								
									 Mark Felder | ab4aa5720a | Fix a bunch of unused variable warnings | 2018-05-04 20:59:01 +00:00 |  | 
				
					
						| 
								
								
									 lain | bc215f5684 | Fix format. | 2018-04-29 11:28:26 +02:00 |  | 
				
					
						| 
								
								
									 Francis Dinh | 0df1a4efc8 | Fix comment grammar | 2018-04-25 00:46:06 -04:00 |  | 
				
					
						| 
								
								
									 Wim Vanderbauwhede | 7517155544 | Changed to support \r\n and \n | 2018-04-24 13:28:55 +01:00 |  | 
				
					
						| 
								
								
									 Wim Vanderbauwhede | 52ee91efce | Patch to replace newlines with <br> tags in bio | 2018-04-24 13:20:17 +01:00 |  | 
				
					
						| 
								
								
									 Francis Dinh | c5dc7e6e31 | Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/unrepeats | 2018-04-20 16:48:18 -04: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 |  | 
				
					
						| 
								
								
									 Francis Dinh | 32a26eb910 | Fix TwitterAPI.delete call | 2018-04-18 20:43:03 -04:00 |  | 
				
					
						| 
								
								
									 Francis Dinh | 7b4f55238e | Handle unrepeats via the TwitterAPI | 2018-04-18 06:00:40 -04:00 |  | 
				
					
						| 
								
								
									 Francis Dinh | 85bd191291 | Remove unretweet function for now | 2018-04-17 04:12:16 -04:00 |  | 
				
					
						| 
								
								
									 Francis Dinh | b949577472 | Add unrepeat functionality | 2018-04-14 20:19:48 -04: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 | e7ddda44c0 | Follow import: allow URI in addition to screen_name. | 2018-04-07 15:00:23 +03:00 |  | 
				
					
						| 
								
								
									 lain | d70d1c427a | TwitterAPI: Don't put follows into the public tls. | 2018-04-04 15:23:27 +02:00 |  | 
				
					
						| 
								
								
									 lain | b3b7ab5d9a | Load all users at once in timelines. | 2018-04-02 16:35:41 +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 |  | 
				
					
						| 
								
								
									 lain | 802736679c | Remove unused ActivityRepresenter module. | 2018-03-30 16:50:30 +02:00 |  | 
				
					
						| 
								
								
									 lain | 7ab94ae22d | TwitterApiController: Use ActivityView. | 2018-03-30 16:30:16 +02:00 |  | 
				
					
						| 
								
								
									 lain | e90f8f6c4b | TwApi ActivityView: Add delete activities. | 2018-03-30 15:32:43 +02:00 |  | 
				
					
						| 
								
								
									 lain | 1f32ba052c | TwApi ActivityView: Add follows. | 2018-03-30 15:17:13 +02:00 |  | 
				
					
						| 
								
								
									 lain | 4afbef39f4 | Format the code. | 2018-03-30 15:01:53 +02:00 |  | 
				
					
						| 
								
								
									 lain | c1d529ee94 | TwApi ActivityView: Add announces. | 2018-03-30 14:46:36 +02:00 |  | 
				
					
						| 
								
								
									 lain | 1f1caab138 | TwApi ActivityView: Add Like rendering. | 2018-03-30 13:49:09 +02:00 |  |