| 
								
								
									 lain | 8b9a0dd4a7 | User: Don't error out when following a user that's already followed. This leads to a few situations where it is impossible to follow a user. | 2019-06-05 12:06:45 +02:00 |  | 
				
					
						| 
								
								
									 Egor | b9cdf6d3b9 | Use User.get_cached*everywhere | 2019-04-22 07:20:43 +00:00 |  | 
				
					
						| 
								
								
									 Ekaterina Vaartis | aef3a3ca46 | Fix tests that used finmoji | 2019-04-20 11:34:00 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | 627e5a0a49 | Merge branch 'develop' into feature/database-compaction | 2019-04-17 12:22:32 +03:00 |  | 
				
					
						| 
								
								
									 kaniini | 73df3046e0 | Merge branch 'feature/788-separate-email-addresses' into 'develop' Feature/788 separate email addresses
Closes #788
See merge request pleroma/pleroma!1040 | 2019-04-16 18:44:07 +00:00 |  | 
				
					
						| 
								
								
									 rinpatch | 5d73dca064 | Remove inReplyToStatusId | 2019-04-15 11:50:36 +03:00 |  | 
				
					
						| 
								
								
									 Alex S | c5d0fffeaf | naming fix | 2019-04-13 14:55:42 +07: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 |  | 
				
					
						| 
								
								
									 Alex S | fe511a6c65 | Merge branch 'develop' into feature/788-separate-email-addresses | 2019-04-10 18:06:54 +07:00 |  | 
				
					
						| 
								
								
									 Alex S | fe13a1d78c | adding notify_email setting for trigger emails | 2019-04-10 17:57:41 +07:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 9c1b36856b | s/Pleroma.UserEmail/Pleroma.Emails.UserEmail/ | 2019-04-10 06:33:20 +02:00 |  | 
				
					
						| 
								
								
									 Alex S | fee50636d0 | removing not needed invite update | 2019-04-08 20:08:16 +07:00 |  | 
				
					
						| 
								
								
									 Alex S | 012bb5dcc9 | renaming expire_at -> expires_at keyword style change | 2019-04-08 16:01:28 +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 | 20c619f85f | replace Repo.get_by(User, nickname: nickname)withUser.get_by_nickname(nickname)in tests | 2019-04-02 17:58:32 +07:00 |  | 
				
					
						| 
								
								
									 William Pitcock | fea3696799 | common api: move context functions from twitterapi | 2019-03-21 23:24:04 +00:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | c42d34b2ec | [Credo] fix Credo.Check.Readability.MaxLineLength | 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 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 8bb7e19b38 | test: de-group alias/es | 2019-02-11 03:44:15 +01:00 |  | 
				
					
						| 
								
								
									 lain | 505a084058 | Still do caching in tests. | 2019-02-03 18:28:14 +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 |  | 
				
					
						| 
								
								
									 William Pitcock | 85a5be6220 | tests: fixup | 2019-01-16 04:09:01 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 3c08d229db | tests: add legal boilerplate | 2018-12-23 20:57:10 +00:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | b096e30cff | [#114] Added email confirmation resend action. Added tests for registration, authentication, email confirmation, confirmation resending.
Made admin methods create confirmed users. | 2018-12-18 17:22:46 +03:00 |  | 
				
					
						| 
								
								
									 Maksim Pechnikov | 89b3729afa | fix warnings | 2018-12-12 09:09:19 +03:00 |  | 
				
					
						| 
								
								
									 raeno | 9ba4a1c5fe | Fixes #415. Properly handle nil and empty string by User.parse_bio | 2018-12-10 01:01:43 +04: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 |  | 
				
					
						| 
								
								
									 Vald | 911a877576 | resolved api and controller test failures | 2018-12-06 01:46:30 +05:30 |  | 
				
					
						| 
								
								
									 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 |  | 
				
					
						| 
								
								
									 William Pitcock | f7e15d3257 | tests: fix a lot of the remaining test failures | 2018-12-04 04:52:09 +00: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 | fbb70d25fe | Several twitter api fixes. | 2018-11-18 22:36:47 +01:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 719a8a1f82 | tests: flip testing to/cc for mentions | 2018-11-08 19:17:15 +00: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 |  | 
				
					
						| 
								
								
									 William Pitcock | f569b67cda | tests: update for html changes | 2018-05-27 13:03:34 +00:00 |  | 
				
					
						| 
								
								
									 Francis Dinh | 72b93d13f8 | Hook up block/unblock to TwitterAPI | 2018-05-22 05:41:17 -04:00 |  | 
				
					
						| 
								
								
									 lain | 802736679c | Remove unused ActivityRepresenter module. | 2018-03-30 16:50:30 +02:00 |  | 
				
					
						| 
								
								
									 lain | 4afbef39f4 | Format the code. | 2018-03-30 15:01:53 +02:00 |  | 
				
					
						| 
								
								
									 Francis Dinh | 9556c8f6e7 | Forgot to fix one of the links in a test | 2018-03-27 02:08:46 -04:00 |  | 
				
					
						| 
								
								
									 Francis Dinh | 5ba2f4b6d8 | Update tests to reflect hashtag link changes | 2018-03-27 02:07:07 -04:00 |  | 
				
					
						| 
								
								
									 lain | eb7ce61ca5 | Fix hashtags. | 2018-03-24 11:03:10 +01:00 |  | 
				
					
						| 
								
								
									 lain | 4ea2a41014 | Fix more specs. | 2018-02-25 17:48:31 +01:00 |  | 
				
					
						| 
								
								
									 lain | 26ccb768d3 | Make test output easier to read. | 2018-02-12 10:14:11 +01:00 |  | 
				
					
						| 
								
								
									 eal | b3e7d7ae6d | Fetch external profile in the background. | 2018-01-16 15:31:03 +02:00 |  |