rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								ac04311b3f 
								
							 
						 
						
							
							
								
								Fix search in TwitterAPI  
							
							
							
						 
						
							2019-04-18 10:24:06 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								184ae60b21 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/pleroma-email-naming' into 'develop'  
							
							... 
							
							
							
							Make the filename and module name of Pleroma.Emails.* orthogonal
See merge request pleroma/pleroma!1029  
							
						 
						
							2019-04-12 10:41:09 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9c1b36856b 
								
							 
						 
						
							
							
								
								s/Pleroma.UserEmail/Pleroma.Emails.UserEmail/  
							
							
							
						 
						
							2019-04-10 06:33:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1791ee8ec4 
								
							 
						 
						
							
							
								
								s/Pleroma.Mailer/Pleroma.Emails.Mailer/  
							
							
							
						 
						
							2019-04-10 06:33:19 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								a53d591ac5 
								
							 
						 
						
							
							
								
								code style  
							
							
							
						 
						
							2019-04-06 20:47:05 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								47b07cec49 
								
							 
						 
						
							
							
								
								token -> invite renaming  
							
							
							
						 
						
							2019-04-06 20:24:22 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								be54e40890 
								
							 
						 
						
							
							
								
								twitter api registration  
							
							... 
							
							
							
							fix for twitter api tests 
							
						 
						
							2019-04-06 17:18:59 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								88d3cb44c3 
								
							 
						 
						
							
							
								
								replace Repo.get_by(User, nickname: nickname) with User.get_by_nickname(nickname)  
							
							
							
						 
						
							2019-04-02 17:47:02 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								4212527928 
								
							 
						 
						
							
							
								
								change Repo.get(Activity, id) => Activity.get_by_id(id)  
							
							
							
						 
						
							2019-04-02 16:50:31 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								fea3696799 
								
							 
						 
						
							
							
								
								common api: move context functions from twitterapi  
							
							
							
						 
						
							2019-03-21 23:24:04 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								e416c344dd 
								
							 
						 
						
							
							
								
								Unify unfollow, accept and reject follow requests using CommonAPI  
							
							
							
						 
						
							2019-03-13 20:28:36 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c3d41b2b6e 
								
							 
						 
						
							
							
								
								[Credo] make all variables use snake_case  
							
							
							
						 
						
							2019-03-13 04:26:56 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a3a9cec483 
								
							 
						 
						
							
							
								
								[Credo] fix Credo.Check.Readability.AliasOrder  
							
							
							
						 
						
							2019-03-13 04:26:54 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								594694607c 
								
							 
						 
						
							
							
								
								Unify Mastodon and Twitter follow implementations using CommonAPI  
							
							
							
						 
						
							2019-03-04 01:00:37 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									11backslashes 
								
							 
						 
						
							
							
							
							
								
							
							
								efa506b874 
								
							 
						 
						
							
							
								
								delegate user retrieval to the User module  
							
							
							
						 
						
							2019-02-24 13:23:47 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor 
								
							 
						 
						
							
							
							
							
								
							
							
								bff9eb5ef7 
								
							 
						 
						
							
							
								
								Reports  
							
							
							
						 
						
							2019-02-20 16:51:25 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									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