lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								d53e36bf1e 
								
							 
						 
						
							
							
								
								Revert "Merge branch 'object-creation' into 'develop'"  
							
							... 
							
							
							
							This reverts merge request !802  
							
						 
						
							2019-02-11 08:07:39 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								6c8d15da11 
								
							 
						 
						
							
							
								
								Merge branch 'fix/credo-issues' into 'develop'  
							
							... 
							
							
							
							Fix credo issues
See merge request pleroma/pleroma!786  
							
						 
						
							2019-02-10 20:54:21 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								f8388be9c6 
								
							 
						 
						
							
							
								
								Do object insertion through Cachex  
							
							... 
							
							
							
							So we don't flood our postgres logs with errors. Should also make things
slightly faster. 
							
						 
						
							2019-02-09 22:01:08 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6a6a5b3251 
								
							 
						 
						
							
							
								
								de-group alias/es  
							
							
							
						 
						
							2019-02-09 16:31:17 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								98c8184c1f 
								
							 
						 
						
							
							
								
								Activity: get_create_activity_by_object_ap_id/1 → get_create_by_object_ap_id/1  
							
							
							
						 
						
							2019-01-21 08:00:41 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								44a1e69484 
								
							 
						 
						
							
							
								
								Add Twitter API for the pinned statuses  
							
							... 
							
							
							
							```
# Only return statuses that have been pinned
GET /api/statuses/user_timeline.json?pinned=true
# Pin
POST /api/statuses/pin/:id
# Unpin
POST /api/statuses/unpin/:id
``` 
							
						 
						
							2019-01-09 19:54:19 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								b73a1a33de 
								
							 
						 
						
							
							
								
								Merge branch 'captcha' into 'develop'  
							
							... 
							
							
							
							Make captcha (kocaptcha) stateless
See merge request pleroma/pleroma!585  
							
						 
						
							2019-01-03 17:04:27 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								980b5288ed 
								
							 
						 
						
							
							
								
								update copyright years to 2019  
							
							
							
						 
						
							2018-12-31 15:41:47 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								2791ce9a1f 
								
							 
						 
						
							
							
								
								add license boilerplate to pleroma core  
							
							
							
						 
						
							2018-12-23 20:56:42 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ekaterina Vaartis 
								
							 
						 
						
							
							
							
							
								
							
							
								336e37d98f 
								
							 
						 
						
							
							
								
								Make captcha (kocaptcha) stateless  
							
							... 
							
							
							
							Also rename seconds_retained to seconds_valid since that's how it is
now. Put it down from 180 to 20 seconds. The answer data is now
stored in an encrypted text transfered to the client and back, so no
ETS is needed 
							
						 
						
							2018-12-21 09:55:47 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								3371a45884 
								
							 
						 
						
							
							
								
								[ #114 ] Formatting fix.  
							
							
							
						 
						
							2018-12-18 17:30:30 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								b86057cc7f 
								
							 
						 
						
							
							
								
								[ #114 ] Refactored User.register_changeset to init confirmation data.  
							
							... 
							
							
							
							Introduced User.register/1 to encapsulate User record creation and post-registration actions. 
							
						 
						
							2018-12-18 17:22:42 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								1de0aa2f10 
								
							 
						 
						
							
							
								
								[ #114 ] Account confirmation email, registration as unconfirmed (config-based), auth prevention for unconfirmed.  
							
							
							
						 
						
							2018-12-18 17:21:05 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ekaterina Vaartis 
								
							 
						 
						
							
							
							
							
								
							
							
								23549d3952 
								
							 
						 
						
							
							
								
								Formatting fixes  
							
							
							
						 
						
							2018-12-15 22:08:26 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ekaterina Vaartis 
								
							 
						 
						
							
							
							
							
								
							
							
								28c43a417e 
								
							 
						 
						
							
							
								
								Add an ability to disabled captcha  
							
							
							
						 
						
							2018-12-15 03:12:47 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ekaterina Vaartis 
								
							 
						 
						
							
							
							
							
								
							
							
								a2399c1c7c 
								
							 
						 
						
							
							
								
								Add base CAPTCHA support (currently only kocaptcha)  
							
							
							
						 
						
							2018-12-15 03:12:44 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								908943352f 
								
							 
						 
						
							
							
								
								[ #114 ] Refactored password_reset (moved to TwitterAPI). Added homepage links to password reset result pages.  
							
							
							
						 
						
							2018-12-13 13:17:49 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								074fa790ba 
								
							 
						 
						
							
							
								
								fix compile warnings  
							
							
							
						 
						
							2018-12-09 20:50:08 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								3e90f688f1 
								
							 
						 
						
							
							
								
								[ #210 ] Mastodon: actor storing for media uploads, ownership check to update_media.  
							
							... 
							
							
							
							Refactoring. 
							
						 
						
							2018-12-06 10:26:17 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								848151f7cb 
								
							 
						 
						
							
							
								
								[ #210 ] [TwitterAPI] Made actor be stored for uploads. Added ownership check  
							
							... 
							
							
							
							to `update_media` action. Added controller tests for `upload` and `update_media` actions.
Refactoring. 
							
						 
						
							2018-12-05 13:37:06 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								ce98d5eb9b 
								
							 
						 
						
							
							
								
								Parse user's bio on register  
							
							
							
						 
						
							2018-12-02 22:03:53 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								c443c9bd72 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into validate-user-info  
							
							
							
						 
						
							2018-12-01 09:55:46 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b19597f602 
								
							 
						 
						
							
							
								
								reverse proxy / uploads  
							
							
							
						 
						
							2018-11-30 18:00:47 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								fbb70d25fe 
								
							 
						 
						
							
							
								
								Several twitter api fixes.  
							
							
							
						 
						
							2018-11-18 22:36:47 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5bb88fd174 
								
							 
						 
						
							
							
								
								Runtime configuration  
							
							... 
							
							
							
							Related to #85 
Everything should now be configured at runtime, with the exception of
the `Pleroma.HTML` scrubbers (the scrubbers used can be
changed at runtime, but their configuration is compile-time) because
it's building a module with a macro. 
							
						 
						
							2018-11-06 19:41:15 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								5c6ec2d9fc 
								
							 
						 
						
							
							
								
								twitter/mastodon api: always use mediaproxy URLs in attachments  
							
							... 
							
							
							
							if using local media, the mediaproxy will not replace the URL anyway. 
							
						 
						
							2018-10-29 15:19:32 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								7b3fff9af8 
								
							 
						 
						
							
							
								
								{mastodon api, twitter api}: make the follow handshake timeout configurable  
							
							
							
						 
						
							2018-10-07 01:05:59 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								e69faf550c 
								
							 
						 
						
							
							
								
								user: add wait_and_refresh() for async three-way handshake case  
							
							
							
						 
						
							2018-10-05 23:40:49 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								0f70e83e8c 
								
							 
						 
						
							
							
								
								Better error handling in TwitterApiController.  
							
							
							
						 
						
							2018-06-03 19:11:22 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thog 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6f39ecc41b 
								
							 
						 
						
							
							
								
								Support Undo like activities ( Fix   #139 )  
							
							
							
						 
						
							2018-05-19 22:14:15 +02: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 
								
							 
						 
						
							
							
							
							
								
							
							
								636f0fa402 
								
							 
						 
						
							
							
								
								Clean up unused aliases and imports  
							
							
							
						 
						
							2018-05-04 21:25:31 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								ab4aa5720a 
								
							 
						 
						
							
							
								
								Fix a bunch of unused variable warnings  
							
							
							
						 
						
							2018-05-04 20:59:01 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Francis Dinh 
								
							 
						 
						
							
							
							
							
								
							
							
								0df1a4efc8 
								
							 
						 
						
							
							
								
								Fix comment grammar  
							
							
							
						 
						
							2018-04-25 00:46:06 -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 
								
							 
						 
						
							
							
							
							
								
							
							
								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 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								360c51f1f5 
								
							 
						 
						
							
							
								
								Use context_ids directly if we have them.  
							
							
							
						 
						
							2018-04-02 15:28:35 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								802736679c 
								
							 
						 
						
							
							
								
								Remove unused ActivityRepresenter module.  
							
							
							
						 
						
							2018-03-30 16:50:30 +02:00