| 
								
								
									 Roger Braun | 5fc6e9d467 | Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop | 2017-11-12 14:25:15 +01:00 |  | 
				
					
						| 
								
								
									 Roger Braun | d293ceb1b5 | Add Mastodon frontend. | 2017-11-12 14:23:05 +01:00 |  | 
				
					
						| 
								
								
									 lambda | 08bc316742 | Merge branch 'mastodon-notification-endpoints' into 'develop' MastoAPI: Add notification endpoints get, clear and dismiss.
Closes #42
See merge request pleroma/pleroma!13 | 2017-11-12 11:08:06 +00:00 |  | 
				
					
						| 
								
								
									 eal | fc7483cb3c | MastoAPI: Add update credentials endpoint. | 2017-11-12 00:27:09 +02:00 |  | 
				
					
						| 
								
								
									 eal | e6a78c6ed0 | MastoAPI: Add notification get, clear and dismiss. | 2017-11-10 15:24:52 +02:00 |  | 
				
					
						| 
								
								
									 eal | 6c0758e041 | TwitterAPI: Add blocks. | 2017-11-08 00:04:53 +02:00 |  | 
				
					
						| 
								
								
									 lambda | be67db5547 | Merge branch 'mastodon-emoji-endpoint' into 'develop' Add mastodon API endpoint for custom emoji.
See merge request pleroma/pleroma!8 | 2017-11-07 20:01:15 +00:00 |  | 
				
					
						| 
								
								
									 eal | c6210183e1 | Add mastodon API endpoint for custom emoji. | 2017-11-07 21:55:01 +02:00 |  | 
				
					
						| 
								
								
									 eal | f85566324e | Allow profile fetching for authenticated users only. | 2017-11-07 00:33:44 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | c6b9b777da | MastoAPI: Add list of blocked users. | 2017-11-03 08:51:17 +01:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 5bf92e50be | MastoAPI: Add blocking. | 2017-11-03 08:38:05 +01:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 502cb38cd6 | Move user search to User module. | 2017-10-30 19:23:16 +01:00 |  | 
				
					
						| 
								
								
									 Mark Felder | efe12e1a73 | Fix /api/v1/accounts/search by splitting account search into its own function | 2017-10-30 03:37:07 +00:00 |  | 
				
					
						| 
								
								
									 eal | 813d2eaaf0 | Add mastodon API endpoint for follow | 2017-10-28 17:09:32 +03:00 |  | 
				
					
						| 
								
								
									 eal | fe7804e42d | Add an API endpoint for emoji. | 2017-10-19 22:51:56 +03:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 6af164f27b | Add password reset. | 2017-10-19 17:37:24 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 422d0f324f | MastodonAPI: Add user favorites endpoint. | 2017-09-17 13:09:49 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 6d5bd4dcc0 | TwitterAPI: Use correct endpoint for tag timeline. | 2017-09-17 13:03:46 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 255a681782 | TwitterAPI: Add tag timeline. | 2017-09-17 11:45:16 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 5d1f8dcd1c | TwitterAPI: Add search. | 2017-09-16 14:33:47 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 9f0a2a714b | Add basic search. | 2017-09-16 10:42:24 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | c20530e708 | Add configuration option for registrations. | 2017-09-15 14:39:32 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 3ca853fb61 | MastoAPI: Follower-related changes | 2017-09-14 18:30:05 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | fc85c9f086 | Add tag timelines. | 2017-09-14 13:22:09 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | b0363e8055 | MastoAPI: Add favourited_by/reblogged_by. | 2017-09-14 09:50:49 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 641c24cdd4 | Add media upload endpoint. | 2017-09-14 08:08:32 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | d168ef5a9e | MastoAPI: Add accounts getting. | 2017-09-13 17:36:02 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 49929321c7 | Add relationships to masto api. | 2017-09-13 15:55:10 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 61adf676d5 | Add basic mastodon notification support. | 2017-09-11 18:53:19 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 7616b202ea | Add user timelines to Masto Api. | 2017-09-10 17:49:13 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 8672d4d12b | Add context to mastodonAPI. | 2017-09-10 15:00:13 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | d66d69c3b4 | Small hack to make notifications return empty for now. | 2017-09-09 19:19:13 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | d625d8db7d | Add unfav to Mastodon API. | 2017-09-09 18:30:02 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 454dc18570 | Add favoriting to Mastodon API. | 2017-09-09 18:09:37 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 66e4c710d4 | Add reblogging to MastodonAPI. | 2017-09-09 17:48:57 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 4dc517a0bb | Add deletion to masto api. | 2017-09-09 13:56:51 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | be04f725e9 | Add more Mastodon API methods. | 2017-09-09 13:15:01 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 2652d9e4ed | Slight cleanup. | 2017-09-07 08:58:10 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 2a298d70f9 | Add very basic oauth and mastodon api support. | 2017-09-06 19:06:25 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 1f9a5272e1 | Add delete to TwAPI. | 2017-09-04 20:48:14 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 6c3a0ffae4 | Add banner and background updating. | 2017-08-29 17:18:33 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 5142a8efbb | Add profile update. | 2017-08-29 15:14:00 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | d1f86ad69f | Basic masto-style info. | 2017-08-24 14:15:16 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 8a97bebc53 | More meta info fixes. | 2017-08-24 14:07:05 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 7ccdebe180 | Small meta info fixes. | 2017-08-24 13:36:28 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | e477608b7e | add correct content type for catch-all | 2017-08-22 14:22:36 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | a027b0027c | Add friends endpoint. | 2017-07-20 20:35:30 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 94a394e3a8 | Add followers endpoint. | 2017-07-20 20:29:15 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | e343c0c9c4 | Add way to update most recent notification id. | 2017-07-02 15:01:59 +02:00 |  | 
				
					
						| 
								
								
									 dtluna | 08e53df91e | Move util functions to UtilController | 2017-06-20 17:55:57 +03:00 |  | 
				
					
						| 
								
								
									 Roger Braun | eb18b9ebba | Enable user timelines. | 2017-06-12 17:12:55 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 80705c7a20 | Redirect to frontend on html notice path. | 2017-05-31 17:48:22 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 03b7b2fa24 | Also show activities in OStatus. | 2017-05-19 15:53:02 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 36448d6483 | Add externalprofile to TwAPI. | 2017-05-10 18:44:57 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | fcd34096db | Add one more alias for twapi twkn. | 2017-05-06 22:26:36 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | c48c381e90 | Merge branch 'develop' into dtluna/pleroma-refactor/1 | 2017-05-05 11:46:59 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 9c42453e06 | Return note objects as ostatus post activities. | 2017-05-03 09:54:17 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 32a95d73da | Add twkn timeline. | 2017-05-02 14:12:43 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 92a8944dfe | Redirect to user feed instead of directly serving it. | 2017-05-01 18:05:02 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | d187a4965f | Return feed for xml requests of the user. | 2017-05-01 14:07:41 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 1422e7aa84 | Handle incoming websub subscriptions. | 2017-04-28 15:45:10 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 451d18af63 | Add proper callback route for websub confirmation. | 2017-04-28 09:51:47 +02:00 |  | 
				
					
						| 
								
								
									 dtluna | 6cf7c13228 | Refactor code to comply with credo suggestions | 2017-04-27 16:18:50 +03:00 |  | 
				
					
						| 
								
								
									 Roger Braun | ab0114fbaa | Return salmon path for users, basic incoming salmon handling. | 2017-04-24 18:46:34 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 1c00eb4a90 | Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into ostatus | 2017-04-21 18:42:28 +02: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 |  | 
				
					
						| 
								
								
									 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 |  | 
				
					
						| 
								
								
									 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 |  | 
				
					
						| 
								
								
									 Roger Braun | ce6cc84a4a | Add basic webfinger. | 2017-04-17 13:44:41 +02: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 | eb9358c8d6 | Add basic Avatar updating code. | 2017-04-16 16:06:19 +02:00 |  | 
				
					
						| 
								
								
									 dtluna | 4b4ece2c74 | Add user timeline fetching without credentials | 2017-04-16 16:44:30 +03: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 | ce1eef9c98 | Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/help-test | 2017-04-16 13:25:38 +03:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 5dac3727f1 | Add registration to the TwAPI controller. | 2017-04-16 11:01:24 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 4799dc6991 | Add retweeting to TwAPI controller. | 2017-04-15 14:09:54 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | c83f279a7d | Add unliking to TwAPI controller. | 2017-04-14 18:27:17 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 90b38fd51b | Fix uploads and favorites in twidere / twittnuker. | 2017-04-14 16:13:34 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 5cb446a148 | Add favoriting to TwAPI controller. | 2017-04-13 17:22:44 +02:00 |  | 
				
					
						| 
								
								
									 dtluna | 443381d0a0 | Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/user-timeline | 2017-04-13 17:15:02 +03:00 |  | 
				
					
						| 
								
								
									 dtluna | 84c2012810 | Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/help-test | 2017-04-13 15:15:09 +03:00 |  | 
				
					
						| 
								
								
									 Roger Braun | f3e7771fd6 | Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into develop | 2017-04-12 17:47:56 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 129e30f465 | Add basic config endpoint. | 2017-04-12 17:47:05 +02:00 |  | 
				
					
						| 
								
								
									 lambadalambda | bf22b1547c | Merge branch 'feature/home-timeline' into 'develop' Add home timeline
See merge request !6 | 2017-04-12 11:30:46 -04:00 |  | 
				
					
						| 
								
								
									 dtluna | a7e74ee012 | Add user timeline | 2017-04-10 20:08:14 +03:00 |  | 
				
					
						| 
								
								
									 dtluna | 6f99765fba | Add home timeline | 2017-04-10 18:26:14 +03:00 |  | 
				
					
						| 
								
								
									 dtluna | 59a406d94c | Add test for help/test resource | 2017-04-10 16:00:57 +03:00 |  | 
				
					
						| 
								
								
									 dtluna | 9383c0aada | Add help/test resource | 2017-04-10 15:54:53 +03:00 |  | 
				
					
						| 
								
								
									 dtluna | 48b6ae2314 | Add GET route for verify_credentials | 2017-04-10 15:41:21 +03:00 |  | 
				
					
						| 
								
								
									 Roger Braun | e7dc39e40c | Basic file uploading via TwAPI. | 2017-03-29 02:07:56 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | d2cdcc097b | Add conversation fetching to TwAPI controller. | 2017-03-28 17:22:44 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | e4de0ddc77 | Add single status fetching to TwAPI. | 2017-03-24 01:16:28 +01:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 30650e5bc6 | Add unfollowing to TwAPI. | 2017-03-23 13:13:09 +01:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 75e51b190d | Add following TwAPI endpoint. | 2017-03-23 12:09:27 +01:00 |  | 
				
					
						| 
								
								
									 Roger Braun | e2e0cd75b7 | Add friends timeline. | 2017-03-22 17:25:59 +01:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 569d9bac17 | Add fetching for recipients. | 2017-03-22 14:45:17 +01:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 2db28df4cf | Add public timeline TwAPI. | 2017-03-21 21:09:20 +01:00 |  | 
				
					
						| 
								
								
									 Roger Braun | ad303783af | Add status posting via TwAPI. | 2017-03-21 18:17:35 +01:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 093fd1832d | Add Twitter API verify_credentials endpoint. | 2017-03-20 21:30:44 +01:00 |  | 
				
					
						| 
								
								
									 Roger Braun | a93f3421a7 | Phoenix skeleton | 2017-03-17 17:09:58 +01:00 |  |