| 
								
								
									 href | b12a904911 | Integration tests for mastodon websocket | 2018-12-17 17:09:06 +01:00 |  | 
				
					
						| 
								
								
									 lambda | 567359790e | Merge branch 'testfix/webfinger-jrd' into 'develop' WebFinger: Sends a 400 when resource param is missing, fix XRD typo in test
See merge request pleroma/pleroma!554 | 2018-12-17 09:19:27 +00:00 |  | 
				
					
						| 
								
								
									 Ekaterina Vaartis | ef6829382a | Clean captchas up periodically, not schedule it after theyre created | 2018-12-16 23:53:44 +03:00 |  | 
				
					
						| 
								
								
									 Ekaterina Vaartis | 73576ab64e | Fix captcha tests | 2018-12-16 23:01:44 +03:00 |  | 
				
					
						| 
								
								
									 href | f672555ad3 | Upgrade to Phoenix 1.4 | 2018-12-16 17:15:07 +01:00 |  | 
				
					
						| 
								
								
									 link0ff | 7c235b8874 | Add more Mix task tests in relay_test.exs and uploads_test.exs. Rename test/tasks/user.exs to test/tasks/user_test.exs. | 2018-12-16 18:08:31 +02:00 |  | 
				
					
						| 
								
								
									 eal | 28478a9c4f | Merge branch 'fix/masto-put-settings' into 'develop' Mastodon API: Fix PUT /api/web/settings
See merge request pleroma/pleroma!557 | 2018-12-16 11:21:26 +00:00 |  | 
				
					
						| 
								
								
									 eal | 4c783e35c0 | Mastodon API: Fix PUT /api/web/settings | 2018-12-16 13:15:34 +02:00 |  | 
				
					
						| 
								
								
									 vaartis | 2e72d49e37 | Rename captcha_test.ex to exs | 2018-12-16 07:35:45 +00:00 |  | 
				
					
						| 
								
								
									 link0ff | 36f1af232a | Add tests for Mix tasks | 2018-12-16 02:14:23 +02:00 |  | 
				
					
						| 
								
								
									 Ekaterina Vaartis | c859cd1d61 | Fix style | 2018-12-15 23:39:23 +03:00 |  | 
				
					
						| 
								
								
									 Ekaterina Vaartis | 5f96c2d216 | Add a test for kocaptcha | 2018-12-15 23:38:19 +03:00 |  | 
				
					
						| 
								
								
									 Ekaterina Vaartis | e8537208bd | Add a captcha mock for tests | 2018-12-15 22:38:39 +03:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | cddab5700b | WebFinger: Sends a 400 when resource param is missing, fix XRD typo in test | 2018-12-15 17:56:12 +01:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 5af91020f8 | Web.WebFinger.WebFingerControllerTest: test against XML and JRD webfinger endpoints | 2018-12-15 16:17:44 +01:00 |  | 
				
					
						| 
								
								
									 href | e74f384b68 | Merge branch 'fix/issue_433' into 'develop' [#433] fix markdown formatting
See merge request pleroma/pleroma!545 | 2018-12-14 20:30:35 +00:00 |  | 
				
					
						| 
								
								
									 href | bfe27c1b55 | Merge branch '114_email_invites' into 'develop' [#114] Email invites
See merge request pleroma/pleroma!541 | 2018-12-14 20:22:24 +00:00 |  | 
				
					
						| 
								
								
									 Maksim Pechnikov | ea72ac549b | fix case when tags is invalid | 2018-12-14 23:16:12 +03:00 |  | 
				
					
						| 
								
								
									 Maksim Pechnikov | d3ec09bb38 | fix tags | 2018-12-14 22:09:04 +03:00 |  | 
				
					
						| 
								
								
									 Maksim Pechnikov | baead4ea4b | fix markdown formatting | 2018-12-14 16:03:58 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 07e93f9940 | [#114] Improved tests. | 2018-12-14 13:52:04 +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 |  | 
				
					
						| 
								
								
									 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 |  | 
				
					
						| 
								
								
									 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 |  | 
				
					
						| 
								
								
									 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 |  | 
				
					
						| 
								
								
									 href | 7d9ddbe689 | Allow underscores in usernames. Fixes #429. | 2018-12-12 18:57:33 +01:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 4e7d98922e | [#114] Added tests for "POST /api/account/password_reset". | 2018-12-12 17:04:52 +03:00 |  | 
				
					
						| 
								
								
									 Maksim Pechnikov | 89b3729afa | fix warnings | 2018-12-12 09:09:19 +03:00 |  | 
				
					
						| 
								
								
									 lambda | 0863ec2737 | Merge branch 'fix_empty_bio_crash' into 'develop' Fixes #415. Do not crash during registration when hasn't filled bio field
Closes #415
See merge request pleroma/pleroma!529 | 2018-12-10 19:08:35 +00:00 |  | 
				
					
						| 
								
								
									 lambda | ff10b9927b | Merge branch 'support/bugfix_272' into 'develop' [#272] fix hashtags in api
See merge request pleroma/pleroma!510 | 2018-12-10 19:05:16 +00:00 |  | 
				
					
						| 
								
								
									 lain | c81c74d847 | Treat warnings as errors outside of tests. | 2018-12-10 19:13:53 +01:00 |  | 
				
					
						| 
								
								
									 raeno | 9ba4a1c5fe | Fixes #415. Properly handle nil and empty string by User.parse_bio | 2018-12-10 01:01:43 +04:00 |  | 
				
					
						| 
								
								
									 Maksim Pechnikov | 9442588ae9 | fix hashtags in api response | 2018-12-09 11:24:46 +03:00 |  | 
				
					
						| 
								
								
									 href | bdc8112e40 | Media proxy: fix url encoding | 2018-12-07 21:57:59 +01:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 6ed5044c4e | [#394] Refactoring (using Ecto.Multi; "untag" route change). | 2018-12-07 11:04:39 +03: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 | abbf347dc7 | [#394] View tests fix. | 2018-12-06 20:38:52 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 22830c8fc9 | [#394] Formatting fix. | 2018-12-06 20:13:07 +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 |  | 
				
					
						| 
								
								
									 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 |  | 
				
					
						| 
								
								
									 kaniini | 48a0315646 | Merge branch 'follower-hiding' into 'develop' Network hiding
Closes #356
See merge request pleroma/pleroma!490 | 2018-12-05 21:41:53 +00:00 |  | 
				
					
						| 
								
								
									 lain | 76d6b1c6ab | Merge remote-tracking branch 'origin' into follower-hiding | 2018-12-05 21:27:56 +01:00 |  | 
				
					
						| 
								
								
									 lain | 3ea4476445 | MastodonAPI: Show users their own network. | 2018-12-05 21:25:06 +01:00 |  | 
				
					
						| 
								
								
									 Vald | 3c8ffe7ed3 | resolved activity view test | 2018-12-06 01:54:04 +05:30 |  | 
				
					
						| 
								
								
									 Vald | 028904c333 | lint | 2018-12-06 01:46:53 +05:30 |  | 
				
					
						| 
								
								
									 Vald | 911a877576 | resolved api and controller test failures | 2018-12-06 01:46:30 +05:30 |  | 
				
					
						| 
								
								
									 lain | fdac215091 | TwitterAPI: Show users their own network. | 2018-12-05 21:14:06 +01:00 |  | 
				
					
						| 
								
								
									 Vald | 743a09132b | linting | 2018-12-06 01:28:52 +05:30 |  | 
				
					
						| 
								
								
									 Vald | 812b20d49f | resolved formatter_test failures | 2018-12-06 01:27:08 +05:30 |  | 
				
					
						| 
								
								
									 lain | 839526a913 | TwitterAPI: Add network hiding. | 2018-12-05 19:22:40 +01:00 |  | 
				
					
						| 
								
								
									 Maksim Pechnikov | c524c50509 | fix/273 | 2018-12-05 17:32:06 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | ba345e4c29 | [#210] Formatting fix. | 2018-12-05 13:43:00 +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 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 53797d19c5 | [#210] Test update (replaced bang- with non-bang method). | 2018-12-05 11:56:31 +03:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 0f061bea0c | tests: add regression test for bug #408 | 2018-12-05 03:41:32 +00:00 |  | 
				
					
						| 
								
								
									 Maksim Pechnikov | a9e3e387c9 | add test | 2018-12-04 20:37:13 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 44ab3dbe2c | [#210] Refactoring. | 2018-12-04 19:45:09 +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 |  | 
				
					
						| 
								
								
									 Maksim Pechnikov | 50e72f6c48 | remove httpoison_mock | 2018-12-04 18:09:22 +03:00 |  | 
				
					
						| 
								
								
									 Maksim Pechnikov | dd8aee332c | formatting the code | 2018-12-04 17:48:55 +03:00 |  | 
				
					
						| 
								
								
									 Maksim Pechnikov | 5c6d47614d | all tests passed | 2018-12-04 17:44:15 +03:00 |  | 
				
					
						| 
								
								
									 Maksim Pechnikov | a9e4a97586 | update test | 2018-12-04 14:04:06 +03:00 |  | 
				
					
						| 
								
								
									 Maksim Pechnikov | 7ec64ac33f | update test | 2018-12-04 14:04:06 +03:00 |  | 
				
					
						| 
								
								
									 Maksim Pechnikov | 80bfdb4e7d | update test | 2018-12-04 14:04:06 +03:00 |  | 
				
					
						| 
								
								
									 Maksim Pechnikov | 6cfdc11e32 | update test | 2018-12-04 14:04:06 +03:00 |  | 
				
					
						| 
								
								
									 Maksim Pechnikov | c508d41c34 | add http requests mock | 2018-12-04 14:04:06 +03:00 |  | 
				
					
						| 
								
								
									 Maksim Pechnikov | 87109482f3 | status_code -> status | 2018-12-04 14:04:06 +03:00 |  | 
				
					
						| 
								
								
									 Maksim Pechnikov | ec34de0c1f | WebSub fix test | 2018-12-04 14:03:32 +03:00 |  | 
				
					
						| 
								
								
									 lambda | 88b05aeabb | Merge branch 'fix/parse-user-bio' into 'develop' Parse user's bio on register
See merge request pleroma/pleroma!492 | 2018-12-03 16:31:00 +00:00 |  | 
				
					
						| 
								
								
									 Maxim Filippov | 4b70e5eae9 | Parse bio for MastodonAPI | 2018-12-03 18:59:50 +03:00 |  | 
				
					
						| 
								
								
									 Maxim Filippov | 8148943368 | Format files | 2018-12-02 22:08:53 +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 | 2a639de9b3 | MastodonApi: Implement hide_network. | 2018-12-02 17:48:00 +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 | c443c9bd72 | Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into validate-user-info | 2018-12-01 09:55:46 +01:00 |  | 
				
					
						| 
								
								
									 lain | 1c67277c80 | Fix admin api. | 2018-12-01 09:03:16 +01:00 |  | 
				
					
						| 
								
								
									 href | e9982c521b | Upload filter: anonymize filename It replaces the original filename with a randomly generated string. | 2018-11-30 19:33:34 +01:00 |  | 
				
					
						| 
								
								
									 kaniini | ca24ad2a2b | Merge branch 'feature/reverse-proxy' into 'develop' reverse proxy / uploads
See merge request pleroma/pleroma!470 | 2018-11-30 18:15:44 +00:00 |  | 
				
					
						| 
								
								
									 href | 253da275bd | Pleroma.Config.delete/1 | 2018-11-30 18:27:27 +01:00 |  | 
				
					
						| 
								
								
									 href | 65e7307d68 | Upload: bring back base_url | 2018-11-30 18:02:50 +01:00 |  | 
				
					
						| 
								
								
									 href | 1d537bc74f | remove eal i like you eal don't take it personally<3 | 2018-11-30 18:02:49 +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 | 48b95a9b95 | Assorted fixes. | 2018-11-30 17:08:02 +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 |  | 
				
					
						| 
								
								
									 lain | 6ac5d48575 | More fixes | 2018-11-29 00:25:43 +01:00 |  | 
				
					
						| 
								
								
									 KokaKiwi | 87098d1676 | Streamer: Don't send unwanted DMs to list streams | 2018-11-27 20:50:19 +01:00 |  |