| 
								
								
									 Roger Braun | a2b79ce7d1 | Add outgoin federation to twitter api. Doesn't really belong there, find a different place for it. Should
federate on every activity insertion. | 2017-04-22 12:08:20 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 77cb260628 | add basic federation to websub. | 2017-04-22 12:07:51 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 39dc74f967 | Add callback to websub subscription. | 2017-04-22 12:05:48 +02:00 |  | 
				
					
						| 
								
								
									 dtluna | 28b203d08f | Add Undo of Follow Activity insertion | 2017-04-21 19:54:21 +03:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 1c00eb4a90 | Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into ostatus | 2017-04-21 18:42:28 +02:00 |  | 
				
					
						| 
								
								
									 dtluna | a9b3f99d48 | Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/follow-unfollow-by-screen-name | 2017-04-21 18:36:03 +03:00 |  | 
				
					
						| 
								
								
									 Roger Braun | f51a672ac4 | Return object id in Ostatus create activties. | 2017-04-21 04:22:02 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 424e0e7779 | Add Websub verification. | 2017-04-21 03:59:11 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 9afc672009 | Quick fix for activities without 'to'. | 2017-04-21 01:01:58 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 1e88f102c4 | Fix specs, add some user info. | 2017-04-21 00:51:09 +02:00 |  | 
				
					
						| 
								
								
									 lambadalambda | e987be2de7 | Merge branch 'bugfix/mentions-timeline' into 'develop' Mentions timeline bugfix
See merge request !11 | 2017-04-21 05:17:25 -04:00 |  | 
				
					
						| 
								
								
									 dtluna | 7a018a8d3b | Add /statuses/mentions_timeline route | 2017-04-21 00:29:08 +03:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 1b9cc721a0 | Websub controller beginnings. | 2017-04-20 17:47:33 +02:00 |  | 
				
					
						| 
								
								
									 lambadalambda | 27c53242a3 | Merge branch 'feature/mentions-timeline' into 'develop' Add statuses/mentions endpoint
Closes #2
See merge request !10 | 2017-04-20 10:21:16 -04:00 |  | 
				
					
						| 
								
								
									 dtluna | 3a56d7318f | Add statuses/mentions endpoint | 2017-04-20 15:18:54 +03:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 5e7ceeba94 | Merge branch 'ostatus' of ssh.gitgud.io:lambadalambda/pleroma into ostatus | 2017-04-20 10:16:41 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | cc330421fd | Better activities in ostatus. | 2017-04-20 10:16:06 +02:00 |  | 
				
					
						| 
								
								
									 dtluna | b248fc7dfb | Refactor unfollow/2 | 2017-04-20 10:57:37 +03:00 |  | 
				
					
						| 
								
								
									 dtluna | 01901d9835 | Merge branch 'feature/unfollow-by-screen-name' of ssh.gitgud.io:dtluna/pleroma into feature/follow-unfollow-by-screen-name | 2017-04-20 10:46:27 +03:00 |  | 
				
					
						| 
								
								
									 dtluna | d952b6cd7b | Merge branch 'feature/follow-by-screen-name' of ssh.gitgud.io:dtluna/pleroma into feature/follow-unfollow-by-screen-name | 2017-04-20 10:39:18 +03:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 9167a2ebe3 | Send frontend through phoenix. | 2017-04-19 15:25:18 +02:00 |  | 
				
					
						| 
								
								
									 lambadalambda | eda742c78b | Merge branch 'feature/user-timeline' into 'develop' Feature/user timeline
See merge request !8 | 2017-04-19 05:50:24 -04:00 |  | 
				
					
						| 
								
								
									 Roger Braun | d23f3e3cf3 | Add webfinger and basic feed support. | 2017-04-18 18:41:51 +02:00 |  | 
				
					
						| 
								
								
									 dtluna | 470f5f7cd6 | Add user timeline spec test | 2017-04-17 16:31:19 +03:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 36e883cd4b | Add basic Ostatus user representer. | 2017-04-17 14:12:36 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | ce6cc84a4a | Add basic webfinger. | 2017-04-17 13:44:41 +02:00 |  | 
				
					
						| 
								
								
									 lambadalambda | ac9817bdb0 | Merge branch 'bugfix/repeated-follow-unfollow' into 'develop' Add error messages for repeated follows and unfollows
See merge request !7 | 2017-04-17 05:46:59 -04:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 6a0e69a8a3 | Fix syntax error. | 2017-04-17 11:43:44 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | a185ea63af | Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into develop | 2017-04-17 11:37:21 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 6bfd521974 | Switch cache implementation for size limiting. | 2017-04-17 11:36:17 +02:00 |  | 
				
					
						| 
								
								
									 dtluna | 369be708b2 | Remove unnecesary queries | 2017-04-16 17:42:15 +03:00 |  | 
				
					
						| 
								
								
									 dtluna | f6e632d25b | Remove unnecesary asserts | 2017-04-16 17:39:34 +03:00 |  | 
				
					
						| 
								
								
									 lambadalambda | 9a8f05e96d | Merge branch 'feature/help-test' into 'develop' Add help/test resource
See merge request !3 | 2017-04-16 10:25:38 -04:00 |  | 
				
					
						| 
								
								
									 dtluna | ef5033d7a7 | Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into bugfix/repeated-follow-unfollow | 2017-04-16 17:18:34 +03:00 |  | 
				
					
						| 
								
								
									 dtluna | f6547f7b7f | Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/unfollow-by-screen-name | 2017-04-16 17:13:42 +03:00 |  | 
				
					
						| 
								
								
									 dtluna | 82914e1e4d | Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/follow-by-screen-name | 2017-04-16 17:12:28 +03:00 |  | 
				
					
						| 
								
								
									 dtluna | 85bd480be3 | Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/help-test | 2017-04-16 17:10:25 +03:00 |  | 
				
					
						| 
								
								
									 dtluna | 5229b01944 | Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/user-timeline | 2017-04-16 17:08:17 +03:00 |  | 
				
					
						| 
								
								
									 Roger Braun | e158e32124 | Update frontend. | 2017-04-16 16:07:14 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | eb9358c8d6 | Add basic Avatar updating code. | 2017-04-16 16:06:19 +02:00 |  | 
				
					
						| 
								
								
									 dtluna | 63f04b314d | Fix typo | 2017-04-16 17:05:48 +03:00 |  | 
				
					
						| 
								
								
									 dtluna | 4b4ece2c74 | Add user timeline fetching without credentials | 2017-04-16 16:44:30 +03:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 03a9c11d25 | Display the users avatar if he has one set. | 2017-04-16 15:40:50 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | d7e3b72c6a | Add avatar objects to user, fix specs. | 2017-04-16 15:28:28 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 7617a593b9 | Support data uris in uploads. | 2017-04-16 14:23:30 +02:00 |  | 
				
					
						| 
								
								
									 dtluna | 7a0046d127 | Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/user-timeline | 2017-04-16 13:32:56 +03:00 |  | 
				
					
						| 
								
								
									 dtluna | 9a8c348aed | Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/unfollow-by-screen-name | 2017-04-16 13:28:23 +03:00 |  | 
				
					
						| 
								
								
									 dtluna | ce1eef9c98 | Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/help-test | 2017-04-16 13:25:38 +03:00 |  | 
				
					
						| 
								
								
									 Roger Braun | b179b3413e | Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into develop | 2017-04-16 11:52:04 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | b41f3eff84 | Preserve newlines in messages. | 2017-04-16 11:51:00 +02:00 |  |