| 
								
								
									 href | 980131b4db | Merge branch 'pleroma-feature/compat/push-subscriptions' into 'develop' Improve web push
Closes #393, #422, and #452
See merge request pleroma/pleroma!524 | 2018-12-14 18:50:44 +00:00 |  | 
				
					
						| 
								
								
									 href | 91236c60c7 | Merge branch 'feature/file-size-checking' into 'develop' [#36] Add warnings when file upload fails
See merge request pleroma/pleroma!523 | 2018-12-14 13:00:24 +00:00 |  | 
				
					
						| 
								
								
									 href | 331396cbcd | Properly disable Web Push if no VAPID key is set | 2018-12-14 13:05:51 +01:00 |  | 
				
					
						| 
								
								
									 href | 30dc81667c | Merge branch '114_user_registration_emails' into 'develop' [#114] User registration emails
Closes #114
See merge request pleroma/pleroma!531 | 2018-12-14 09:16:03 +00:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | f81213910f | [#114] Addressed MR comments. Removed functionality to be extracted to other MRs. | 2018-12-14 12:09:55 +03:00 |  | 
				
					
						| 
								
								
									 eal | 61ad2ce422 | TwitterAPI: Include favorited post in json | 2018-12-14 08:24:18 +02:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 18b9467d1a | [#114] Removed email_inviteimplementation (to be addressed separately). | 2018-12-13 16:22:42 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 00744c6b03 | [#114] Initial implementation of user email invitations. | 2018-12-13 14:30:48 +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 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | bfff2399ff | [#114] Routes and config for confirm_emailandemail_invite(Twitter API). | 2018-12-12 20:15:43 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | e3a21bcd45 | [#114] Addressed warnings. Fix of withstatement clause inpassword_reset. | 2018-12-12 17:14:31 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | f5afb11032 | [#114] Initial implementation of user password reset emails (user-initiated). | 2018-12-12 17:04:39 +03:00 |  | 
				
					
						| 
								
								
									 scarlett | 213176c3c3 | Add new frontend options to server-side config. | 2018-12-10 23:15:01 +00:00 |  | 
				
					
						| 
								
								
									 Maksim Pechnikov | 074fa790ba | fix compile warnings | 2018-12-09 20:50:08 +03:00 |  | 
				
					
						| 
								
								
									 Rin Toshaka | 15616eda5e | Make uploadlimit an object that stores upload limits for avatars, banners, backgrounds, general content | 2018-12-08 21:48:49 +01:00 |  | 
				
					
						| 
								
								
									 Rin Toshaka | 578051809f | Add uploadlimit to Twitter API config | 2018-12-07 20:03:30 +01:00 |  | 
				
					
						| 
								
								
									 lambda | 94d8f1ab30 | Merge branch '394_user_tags' into 'develop' [#394] User tags
Closes #394
See merge request pleroma/pleroma!508 | 2018-12-07 18:25:38 +00:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 7a2162bbcb | [#394] User view (Twitter & Mastadon API): wrapped "tags" in "pleroma" map. | 2018-12-06 22:26:25 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 7bcb6a183a | [#394] Refactoring. | 2018-12-06 20:23:16 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 7b19487389 | [#394] Added users.tagsand admin routes to tag and untag users. Added tests. | 2018-12-06 20:06:50 +03:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 4944498133 | Merge branch 'develop' into feature/compat/push-subscriptions # Conflicts:
#	lib/pleroma/application.ex
#	lib/pleroma/plugs/oauth_plug.ex | 2018-12-06 20:15:16 +07:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 8b4397c704 | Merge branch 'develop' into feature/compat/push-subscriptions # Conflicts:
#	lib/mix/tasks/sample_config.eex
#	lib/pleroma/web/twitter_api/controllers/util_controller.ex
#	mix.exs
#	mix.lock | 2018-12-06 19:55:58 +07:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 04a48286e6 | Add web push support | 2018-12-06 19:29:04 +07:00 |  | 
				
					
						| 
								
								
									 kaniini | ccf0b46dd6 | Merge branch '210_twitter_api_uploads_alt_text' into 'develop' [#210] TwitterAPI: alt text support for uploaded images. Mastodon API uploads security fix.
See merge request pleroma/pleroma!496 | 2018-12-06 07:36:21 +00: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 |  | 
				
					
						| 
								
								
									 lain | 76d6b1c6ab | Merge remote-tracking branch 'origin' into follower-hiding | 2018-12-05 21:27:56 +01:00 |  | 
				
					
						| 
								
								
									 lain | fdac215091 | TwitterAPI: Show users their own network. | 2018-12-05 21:14:06 +01:00 |  | 
				
					
						| 
								
								
									 lain | 839526a913 | TwitterAPI: Add network hiding. | 2018-12-05 19:22:40 +01: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 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | be187f82f7 | [#210] Further refactoring. | 2018-12-05 11:48:50 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 48e6193bf2 | [#210] Refactoring. | 2018-12-04 19:24:41 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 826fc446d5 | [#210] TwitterAPI: implemented /api/media/metadata/create to allow uploads description (alt text) setting. | 2018-12-04 18:35:57 +03:00 |  | 
				
					
						| 
								
								
									 Maxim Filippov | ce98d5eb9b | Parse user's bio on register | 2018-12-02 22:03:53 +03:00 |  | 
				
					
						| 
								
								
									 lain | 8c9a4e8b40 | TwitterAPI: Implement hide_network. | 2018-12-02 18:14:13 +01:00 |  | 
				
					
						| 
								
								
									 lain | 93f2dc19d9 | TwitterAPI: Fix banner and background update. | 2018-12-01 12:01:22 +01: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 | 02d3dc6869 | Uploads fun, part. 2 | 2018-11-30 18:02:37 +01:00 |  | 
				
					
						| 
								
								
									 href | b19597f602 | reverse proxy / uploads | 2018-11-30 18:00:47 +01:00 |  | 
				
					
						| 
								
								
									 lain | d0ec2812bd | Merge remote-tracking branch 'origin' into validate-user-info | 2018-11-30 17:34:20 +01:00 |  | 
				
					
						| 
								
								
									 lain | d407f662af | Fix TwitterApiController. | 2018-11-30 17:07:37 +01:00 |  | 
				
					
						| 
								
								
									 lain | a6812bc9df | Remove "most recent notification" endpoint. | 2018-11-30 16:47:37 +01:00 |  | 
				
					
						| 
								
								
									 href | bc5cf2c192 | Improved version string | 2018-11-20 17:55:03 +01:00 |  | 
				
					
						| 
								
								
									 lain | fbb70d25fe | Several twitter api fixes. | 2018-11-18 22:36:47 +01:00 |  | 
				
					
						| 
								
								
									 lain | f87b315618 | TwitterAPI: Fix dm_timeline displaying only half of the conversation. | 2018-11-16 19:47:36 +01:00 |  | 
				
					
						| 
								
								
									 lain | 7b170cd616 | Add Pleroma user search api for PleromaFE. | 2018-11-14 20:33:23 +01:00 |  | 
				
					
						| 
								
								
									 lain | ea9a776d7b | TwitterApi: Add direct message endpoint | 2018-11-13 20:08:50 +01:00 |  | 
				
					
						| 
								
								
									 scarlett | cb6fd73861 | Twitter API: Fall back to user.nickname if user has no name | 2018-11-12 15:52:13 +00:00 |  | 
				
					
						| 
								
								
									 kaniini | 4d627a5117 | Merge branch 'feature/qvitter-notifications-dismiss' into 'develop' qvitter notifications: add new "read notifications" API
See merge request pleroma/pleroma!431 | 2018-11-07 22:33:06 +00:00 |  | 
				
					
						| 
								
								
									 kaniini | b451a92d78 | Merge branch 'runtime-config' into 'develop' Runtime configuration
See merge request pleroma/pleroma!430 | 2018-11-07 22:32:34 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | b2105a3131 | twitterapi: add notification read endpoint | 2018-11-06 23:25:07 +00:00 |  |