| 
								
								
									 Egor Kislitsyn | 48591aab98 | Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned-posts # Conflicts:
#	docs/config.md | 2019-01-09 16:56:31 +07:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 0015d43e13 | user: factor out illogical User.Info.superuser?/1. any actual callee will be dealing with a User struct to begin with, so
just check the child struct inside User.superuser?/1 with pattern matching. | 2019-01-09 06:44:50 +00:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 63dbd87568 | rename posttostatus | 2019-01-08 15:25:50 +07:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 380e9fba21 | add pinned posts | 2019-01-07 20:45:33 +07: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 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 279096228c | [#114] Made MastodonAPI and TwitterAPI user show actions return 404 for auth-inactive users unless requested by admin or moderator. | 2018-12-19 18:56:52 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 968d7490b6 | [#114] User.Info: renamed confirmation_updatetoconfirmation_changeset. | 2018-12-19 16:31:03 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 59fc5d15df | [#114] User.Info: renamed confirmation_updatetoconfirmation_change. | 2018-12-19 16:27:16 +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 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | a05cb10a95 | [#114] Email confirmation route, action, node setting, User.Info fields. | 2018-12-18 17:18:53 +03:00 |  | 
				
					
						| 
								
								
									 eal | 4c783e35c0 | Mastodon API: Fix PUT /api/web/settings | 2018-12-16 13:15:34 +02:00 |  | 
				
					
						| 
								
								
									 rinpatch | 2ae1128d9f | MastoAPI: Fix put_settings | 2018-12-06 17:42:07 +03:00 |  | 
				
					
						| 
								
								
									 lain | 7d5720f2e4 | Fix merge. | 2018-12-05 21:31:02 +01:00 |  | 
				
					
						| 
								
								
									 lain | 76d6b1c6ab | Merge remote-tracking branch 'origin' into follower-hiding | 2018-12-05 21:27:56 +01:00 |  | 
				
					
						| 
								
								
									 lain | 839526a913 | TwitterAPI: Add network hiding. | 2018-12-05 19:22:40 +01:00 |  | 
				
					
						| 
								
								
									 lain | 6be0ab1e55 | Hide network in ap. | 2018-12-02 17:35:32 +01:00 |  | 
				
					
						| 
								
								
									 lain | 91065e1968 | Fix background updating / handling. | 2018-12-02 11:20:38 +01:00 |  | 
				
					
						| 
								
								
									 lain | f18b86fd5f | More fixes for Info schema. | 2018-12-01 12:46:08 +01:00 |  | 
				
					
						| 
								
								
									 lain | 93f2dc19d9 | TwitterAPI: Fix banner and background update. | 2018-12-01 12:01:22 +01:00 |  | 
				
					
						| 
								
								
									 lain | 347df6421d | Fix masto api user updating. | 2018-12-01 10:40:01 +01:00 |  | 
				
					
						| 
								
								
									 lain | 1c67277c80 | Fix admin api. | 2018-12-01 09:03:16 +01:00 |  | 
				
					
						| 
								
								
									 lain | 48b95a9b95 | Assorted fixes. | 2018-11-30 17:08:02 +01:00 |  | 
				
					
						| 
								
								
									 lain | d407f662af | Fix TwitterApiController. | 2018-11-30 17:07:37 +01:00 |  | 
				
					
						| 
								
								
									 lain | e002858071 | Fix ostatus test. | 2018-11-27 18:37:46 +01:00 |  | 
				
					
						| 
								
								
									 lain | badbe2656c | More fixes. | 2018-11-27 18:12:03 +01:00 |  | 
				
					
						| 
								
								
									 lain | ec464ef20a | HTTP sig fixes. | 2018-11-27 17:42:45 +01:00 |  | 
				
					
						| 
								
								
									 lain | 0896cf4c0f | Fix most mastodon api bugs. | 2018-11-20 20:12:39 +01:00 |  | 
				
					
						| 
								
								
									 lain | 2887f4ff1d | Fix formatter tests. | 2018-11-20 19:07:01 +01:00 |  | 
				
					
						| 
								
								
									 lain | fbb70d25fe | Several twitter api fixes. | 2018-11-18 22:36:47 +01:00 |  | 
				
					
						| 
								
								
									 lain | 40d9d2098c | Fix user updating from AP. | 2018-11-18 22:15:03 +01:00 |  | 
				
					
						| 
								
								
									 lain | 4c918392c6 | Fix most User tests. | 2018-11-18 21:40:52 +01:00 |  | 
				
					
						| 
								
								
									 lain | e7cd6e9739 | Fix setting of keys. | 2018-11-18 19:33:43 +01:00 |  | 
				
					
						| 
								
								
									 lain | d5af41b577 | Fix note count update. | 2018-11-18 18:52:21 +01:00 |  | 
				
					
						| 
								
								
									 lain | 812f5b058a | Fix blocking. | 2018-11-18 18:40:31 +01:00 |  | 
				
					
						| 
								
								
									 lain | 756764266c | Formatting. | 2018-11-18 18:27:04 +01:00 |  | 
				
					
						| 
								
								
									 lain | b396dba425 | Fix follower count setting. | 2018-11-18 18:24:16 +01:00 |  | 
				
					
						| 
								
								
									 lain | 5c8f07f0a8 | Fix note counting. | 2018-11-18 18:17:56 +01:00 |  | 
				
					
						| 
								
								
									 lain | 50585d051b | Add User.Info module To validate and mutate the user.info field. | 2018-11-18 18:04:42 +01:00 |  |