| 
								
								
									 raeno | 46486595ff | Handle "users/:id" links as well. Fix comments in MR. | 2018-12-14 19:55:40 +01:00 |  | 
				
					
						| 
								
								
									 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 |  | 
				
					
						| 
								
								
									 Maksim Pechnikov | bc6262d250 | fixed typo | 2018-12-14 21:21:37 +03:00 |  | 
				
					
						| 
								
								
									 href | 0ee51992a8 | Enable warning_as_errors for tests | 2018-12-14 18:14:40 +01:00 |  | 
				
					
						| 
								
								
									 href | 84b9a9d497 | TwitterAPI.ActivityView: Ignore unhandled activities | 2018-12-14 18:09:59 +01:00 |  | 
				
					
						| 
								
								
									 href | 412df2cd38 | Warn if push is disabled.. | 2018-12-14 16:19:28 +01:00 |  | 
				
					
						| 
								
								
									 Haelwenn | ef10e08efe | Update config.md | 2018-12-14 15:06:04 +00:00 |  | 
				
					
						| 
								
								
									 Maksim Pechnikov | baead4ea4b | fix markdown formatting | 2018-12-14 16:03:58 +03: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 | 0b4c61e8d5 | Fix warning | 2018-12-14 13:56:42 +01:00 |  | 
				
					
						| 
								
								
									 href | ec0e613eca | Pleroma.Activity.mastodon_notification_type/1 | 2018-12-14 13:22:10 +01:00 |  | 
				
					
						| 
								
								
									 href | 331396cbcd | Properly disable Web Push if no VAPID key is set | 2018-12-14 13:05:51 +01:00 |  | 
				
					
						| 
								
								
									 href | 6822916183 | Typos | 2018-12-14 13:05:51 +01:00 |  | 
				
					
						| 
								
								
									 href | b1bcd97a0f | Push: respect alerts settings | 2018-12-14 13:05:49 +01:00 |  | 
				
					
						| 
								
								
									 href | d8984b7bf8 | Push: add missing notification_type field | 2018-12-14 13:05:48 +01:00 |  | 
				
					
						| 
								
								
									 href | 7facbb2b8d | Push.Subscription: convert base64 to base64 urlsafe | 2018-12-14 13:05:47 +01:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 324933a0ac | improve push message format (compatibility with mastodon) | 2018-12-14 13:05:46 +01:00 |  | 
				
					
						| 
								
								
									 lambda | 3b65f31606 | Update config.md | 2018-12-14 13:05:44 +01:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 658edb166f | fix and improve web push; add configuration docs | 2018-12-14 13:05:29 +01:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 69fd63e248 | [#114] Added invitesEnabledtometadataof nodeinfo. | 2018-12-14 14:13:13 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 66380b0641 | [#114] Removed confirm_emailaction stub (to be addressed in a separate MR). | 2018-12-14 14:01:00 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 07e93f9940 | [#114] Improved tests. | 2018-12-14 13:52:04 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 9666376f5f | [#114] Readded invites_enabledconfig setting, updated readme. | 2018-12-14 12:37:06 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | a89e3b4b60 | [#114] Moved email_invite action to AdminAPIController, adjusted tests. | 2018-12-14 12:28:23 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 3cbf16a5fe | [#114] Added UserInviteToken creation, adjusted invitation email link to include it. | 2018-12-14 12:28:22 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | cc83d7ffe7 | [#114] Naive implementation of email invitations. | 2018-12-14 12:28:14 +03: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 |  | 
				
					
						| 
								
								
									 lambda | 262cc6d44b | Merge branch 'fix/double-rt-or-fav' into 'develop' Prevent accidental double RTs or favorites
See merge request pleroma/pleroma!542 | 2018-12-14 08:26:08 +00:00 |  | 
				
					
						| 
								
								
									 lambda | 82dbd2d64f | Merge branch 'fix/qvitter-fav-object' into 'develop' TwitterAPI: Include favorited post in json
Closes #405
See merge request pleroma/pleroma!543 | 2018-12-14 08:25:02 +00:00 |  | 
				
					
						| 
								
								
									 lambda | 36b0af7601 | Merge branch '2018-12-13-update-frontend' into 'develop' update frontend
See merge request pleroma/pleroma!544 | 2018-12-14 08:23:56 +00:00 |  | 
				
					
						| 
								
								
									 eal | 61ad2ce422 | TwitterAPI: Include favorited post in json | 2018-12-14 08:24:18 +02:00 |  | 
				
					
						| 
								
								
									 eal | 1ca080c862 | Prevent accidental double RTs or favorites | 2018-12-14 07:56:49 +02:00 |  | 
				
					
						| 
								
								
									 raeno | c5c3ad90d0 | Fix tests. Remove oembed template | 2018-12-14 03:00:50 +01:00 |  | 
				
					
						| 
								
								
									 raeno | b5de7c4c4d | Remove oembed for now, will submit it in another MR. Fix warnings | 2018-12-13 22:34:15 +01:00 |  | 
				
					
						| 
								
								
									 raeno | 018516d3f3 | Refactor ostatus_controller, extract metatags redirection to Redirector itself. Set 'html' as default type for ostatus links | 2018-12-13 22:21:14 +01:00 |  | 
				
					
						| 
								
								
									 raeno | 49c4f7d604 | Set Pleroma.instance.domain when config is generated | 2018-12-13 22:17:53 +01:00 |  | 
				
					
						| 
								
								
									 raeno | 9b3a6cdb07 | Extract opengraph/oembed into separate module | 2018-12-13 22:17:53 +01:00 |  | 
				
					
						| 
								
								
									 raeno | d903e34cac | Add opengraph/twitter_card:summary support. Add config to toggle on/off specific metadata | 2018-12-13 22:17:53 +01:00 |  | 
				
					
						| 
								
								
									 raeno | 8902942128 | WIP. Implement oembed route and handle both json/xml for "Note" type activity | 2018-12-13 22:17:53 +01:00 |  | 
				
					
						| 
								
								
									 raeno | 21afdf6d99 | Insert meta tags into static index.html on the fly for OStatus#notice | 2018-12-13 22:17:53 +01:00 |  | 
				
					
						| 
								
								
									 lain | 72945b5b32 | update frontend | 2018-12-13 21:04:39 +01:00 |  | 
				
					
						| 
								
								
									 lambda | b19ee62252 | Merge branch 'username-underscores' into 'develop' Allow underscores/dashes in usernames.
Closes #429
See merge request pleroma/pleroma!537 | 2018-12-13 15:13:24 +00:00 |  | 
				
					
						| 
								
								
									 lambda | a5a10988e8 | Merge branch 'fix/mix-tasks-set-user-info' into 'develop' Fix mix task User
See merge request pleroma/pleroma!539 | 2018-12-13 15:10:50 +00:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 9e689de063 | [#114] Removed email_inviteimplementation (to be addressed separately). | 2018-12-13 16:24:30 +03: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 |  | 
				
					
						| 
								
								
									 href | 7214d57463 | Extended nicknames: allow dashes. | 2018-12-12 21:48:54 +01:00 |  | 
				
					
						| 
								
								
									 link0ff | 51dd294c48 | Allow to set both admin and moderator at the same time in mix task User | 2018-12-12 22:45:40 +02:00 |  |