| 
								
								
									 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 | fc15f30a3c | fixup test | 2018-06-13 21:45:27 -04:00 |  | 
				
					
						| 
								
								
									 Francis Dinh | 1555c66650 | Add unretweet TwAPI endpoint and cleanup AP.unannounce | 2018-06-13 21:33:36 -04:00 |  | 
				
					
						| 
								
								
									 William Pitcock | c773f42ca4 | tests: update twitterapi user view tests for new locked variable | 2018-06-11 22:15:53 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | f8e0942745 | twitter api: add approve/deny endpoints | 2018-06-11 22:15:53 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | d116af3bee | tests: add tests for /api/pleroma/friend_requests | 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 |  | 
				
					
						| 
								
								
									 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 |  | 
				
					
						| 
								
								
									 William Pitcock | f569b67cda | tests: update for html changes | 2018-05-27 13:03:34 +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 |  | 
				
					
						| 
								
								
									 lambda | c41012053a | Merge branch 'feature/change-password' into 'develop' Feature/change password
See merge request pleroma/pleroma!166 | 2018-05-24 17:16:37 +00:00 |  | 
				
					
						| 
								
								
									 Francis Dinh | 72b93d13f8 | Hook up block/unblock to TwitterAPI | 2018-05-22 05:41:17 -04:00 |  | 
				
					
						| 
								
								
									 Syldexia | d0690622cd | Added endpoint for changing passwords | 2018-05-21 23:06:03 +01:00 |  | 
				
					
						| 
								
								
									 Thog | e55c6f311b | Migrate to comeonin 4 and Cachex 3 Also fix some warning in the code and add a missing alias | 2018-05-20 20:08:40 +02:00 |  | 
				
					
						| 
								
								
									 lain | 413de8e4bc | More fixes. | 2018-05-20 19:26:09 +02:00 |  | 
				
					
						| 
								
								
									 lain | ff007af0c2 | Return visilility in twitter api, too. | 2018-05-20 18:01:24 +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 |  | 
				
					
						| 
								
								
									 Pierrick Brun | 89603eda9e | do not create notification for yourself | 2018-05-11 11:31:17 +02:00 |  | 
				
					
						| 
								
								
									 lain | bc215f5684 | Fix format. | 2018-04-29 11:28:26 +02:00 |  | 
				
					
						| 
								
								
									 Wim Vanderbauwhede | 6908f29e0a | Added a test (written by @andrewzah) for the MR | 2018-04-28 12:01:43 +01: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 |  | 
				
					
						| 
								
								
									 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 | a4db3a732f | Pre-fetch conversation ids. | 2018-04-02 14:46:56 +02:00 |  | 
				
					
						| 
								
								
									 lain | 1b57522bba | Fix some test stuff. | 2018-04-02 13:13:04 +02:00 |  | 
				
					
						| 
								
								
									 lain | 802736679c | Remove unused ActivityRepresenter module. | 2018-03-30 16:50:30 +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 |  | 
				
					
						| 
								
								
									 lain | 361016349f | Add ActivityViewTest. | 2018-03-30 12:57:55 +02:00 |  | 
				
					
						| 
								
								
									 lain | e30752bc79 | Add basic activity view. | 2018-03-27 22:24:19 +02:00 |  | 
				
					
						| 
								
								
									 Francis Dinh | 9556c8f6e7 | Forgot to fix one of the links in a test | 2018-03-27 02:08:46 -04:00 |  | 
				
					
						| 
								
								
									 Francis Dinh | 5ba2f4b6d8 | Update tests to reflect hashtag link changes | 2018-03-27 02:07:07 -04:00 |  | 
				
					
						| 
								
								
									 lain | eb7ce61ca5 | Fix hashtags. | 2018-03-24 11:03:10 +01:00 |  | 
				
					
						| 
								
								
									 lain | 8a47974217 | Fix specs. | 2018-02-25 18:11:03 +01:00 |  | 
				
					
						| 
								
								
									 lain | 4ea2a41014 | Fix more specs. | 2018-02-25 17:48:31 +01:00 |  | 
				
					
						| 
								
								
									 lain | 94db9ac4db | Merge branch 'develop' into feature/activitypub | 2018-02-21 18:34:19 +01:00 |  | 
				
					
						| 
								
								
									 lain | 5bc810c452 | Add moderator function. | 2018-02-20 18:44:50 +01:00 |  | 
				
					
						| 
								
								
									 lain | b331cb449a | Merge branch 'develop' into feature/activitypub | 2018-02-12 10:24:15 +01:00 |  | 
				
					
						| 
								
								
									 lain | 26ccb768d3 | Make test output easier to read. | 2018-02-12 10:14:11 +01:00 |  | 
				
					
						| 
								
								
									 lain | 33a5d0a238 | Fix some test warnings. | 2018-02-12 09:33:01 +01:00 |  | 
				
					
						| 
								
								
									 lain | ce31f3a922 | Twitter Representers: Handle Mastodon attachments. | 2018-02-11 17:21:06 +01:00 |  | 
				
					
						| 
								
								
									 lambda | 61c16193de | Merge branch 'move-backend-images' into 'develop' Move avi.png & banner.png from /priv/static/static to /priv/static/images
See merge request pleroma/pleroma!60 | 2018-02-03 13:05:20 +00:00 |  | 
				
					
						| 
								
								
									 Hakaba Hitoyo | ea6d1b2b17 | move avi.png & banner.png from /priv/static/static to /priv/static/images | 2018-02-03 20:43:14 +09:00 |  |