| 
								
								
									 lain | 7382adf407 | Make TwAPI UserView more resilient to issues. Will work for missing users and badly migrated users. | 2019-01-07 12:41:31 +01:00 |  | 
				
					
						| 
								
								
									 scarlett | 52493467ac | Twitter API: Add a summary_html field. The intention here is to allow proper subject copying when it contains
emoji, obviously this will require minor frontend changes, though. | 2019-01-06 10:19:00 +00:00 |  | 
				
					
						| 
								
								
									 scarlett | 145d6fe6e9 | Merge branch 'emoji-in-summary' into 'develop' Strip HTML in and allow emoji in summaries.
See merge request pleroma/pleroma!631 | 2019-01-05 21:52:02 +00:00 |  | 
				
					
						| 
								
								
									 scarlett | 0787f0dfbe | Strip HTML in and allow emoji in summaries. | 2019-01-05 17:28:47 +00:00 |  | 
				
					
						| 
								
								
									 Rin Toshaka | 846082e54f | Different caches based on the module. Remove scrubber version since it is not relevant anymore | 2019-01-05 00:19:46 +01:00 |  | 
				
					
						| 
								
								
									 kaniini | 90e157ef80 | Merge branch 'features/admin-api-user-views' into 'develop' User/Account views: Add rights.admin
Closes #472
See merge request pleroma/pleroma!589 | 2018-12-31 15:49:34 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 980b5288ed | update copyright years to 2019 | 2018-12-31 15:41:47 +00:00 |  | 
				
					
						| 
								
								
									 Rin Toshaka | 7e09c2bd7d | Move scrubber cache-related functions to Pleroma.HTML | 2018-12-31 08:19:48 +01:00 |  | 
				
					
						| 
								
								
									 Rin Toshaka | dec23500d8 | Resolve merge conflict | 2018-12-30 21:00:40 +01:00 |  | 
				
					
						| 
								
								
									 Rin Toshaka | 535fddd286 | Friendship ended with Postgresql now Cachex is my best friend | 2018-12-30 19:33:36 +01:00 |  | 
				
					
						| 
								
								
									 Rin Toshaka | d9f40b05b3 | Added get_stripped_html_for_object. Renamed a few things | 2018-12-30 16:51:16 +01:00 |  | 
				
					
						| 
								
								
									 Rin Toshaka | 19f9889fbe | I am not sure what's going on anymore so I'll just commit and reset all the other files to HEAD | 2018-12-29 17:45:50 +01:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 0a41786624 | [#467] Refactored valid / invalid user rendering. | 2018-12-28 22:47:42 +03:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | b43d630f30 | Web.TwitterAPI.UserView: Add rights.admin | 2018-12-28 17:38:32 +01:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 0d1788ce44 | [#471] Factored out User.visible_for?/2. | 2018-12-28 14:35:25 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | e6aeb1d4a5 | [#471] Prevented rendering of inactive local accounts. | 2018-12-27 15:46:18 +03:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 2791ce9a1f | add license boilerplate to pleroma core | 2018-12-23 20:56:42 +00:00 |  | 
				
					
						| 
								
								
									 lambda | 005b4194ff | Merge branch 'bugfix/trans_fix_url_videos' into 'develop' Fix "url" of Videos in transmogrifier
Closes #367
See merge request pleroma/pleroma!459 | 2018-12-23 14:46:58 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 34a4ed22c4 | twitter api: add "Video" to supported activity types list | 2018-12-23 14:00:54 +00:00 |  | 
				
					
						| 
								
								
									 lambda | a3e33fa177 | Merge branch 'hotfix/activity-without-content' into 'develop' Twitter ActivityView: fix crash with activity without content
See merge request pleroma/pleroma!572 | 2018-12-23 13:17:25 +00:00 |  | 
				
					
						| 
								
								
									 href | f58f20abbb | Twitter ActivityView: fix crash when activity content is nil | 2018-12-18 15:34:27 +01:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | aed0f90287 | [#114] Added pleroma.confirmation_pendingto user views, adjusted view tests. | 2018-12-18 17:22:45 +03:00 |  | 
				
					
						| 
								
								
									 lambda | 3d980daa49 | Merge branch '459_fix_user_profile_crash' into 'develop' Fix update_profile failing due to OAuth token record in assigns instead of string
Closes #459
See merge request pleroma/pleroma!561 | 2018-12-17 20:16:15 +00:00 |  | 
				
					
						| 
								
								
									 Maksim Pechnikov | 92a5133c42 | fix text field | 2018-12-17 22:53:16 +03:00 |  | 
				
					
						| 
								
								
									 raeno | cc87880488 | Support both OAuth token record and token string in UserView | 2018-12-17 16:02:26 +01:00 |  | 
				
					
						| 
								
								
									 lambda | cc6689cc20 | Merge branch 'fix/views-ignore-unhandled-activites' into 'develop' TwitterAPI.ActivityView: Ignore unhandled activities
See merge request pleroma/pleroma!547 | 2018-12-15 15:23:51 +00:00 |  | 
				
					
						| 
								
								
									 href | 84b9a9d497 | TwitterAPI.ActivityView: Ignore unhandled activities | 2018-12-14 18:09:59 +01:00 |  | 
				
					
						| 
								
								
									 Maksim Pechnikov | baead4ea4b | fix markdown formatting | 2018-12-14 16:03:58 +03:00 |  | 
				
					
						| 
								
								
									 eal | 61ad2ce422 | TwitterAPI: Include favorited post in json | 2018-12-14 08:24:18 +02: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 | 7bcb6a183a | [#394] Refactoring. | 2018-12-06 20:23:16 +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 |  | 
				
					
						| 
								
								
									 William Pitcock | 02288b5f1c | twitterapi: fix bad rebase | 2018-12-04 04:52:09 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 3b8e5bcbeb | fix most tests | 2018-12-04 04:52:09 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 95a458f392 | twitterapi: more object normalization work | 2018-12-04 04:52:09 +00:00 |  | 
				
					
						| 
								
								
									 lain | fbb70d25fe | Several twitter api fixes. | 2018-11-18 22:36:47 +01:00 |  | 
				
					
						| 
								
								
									 scarlett | cb6fd73861 | Twitter API: Fall back to user.nickname if user has no name | 2018-11-12 15:52:13 +00:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 3c7d4ff271 | Pleroma.Web.TwitterAPI.ActivityView: Harden TwitterAPI against remnant of prismo | 2018-11-01 15:07:27 +01:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 24ba08de13 | twitter api: add support for rendering Page objects | 2018-11-01 10:01:35 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 1ed25c963a | twitterapi: activity view: add the other in_reply_to fields | 2018-10-25 04:04:04 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | fee43ae5e7 | twitterapi: activity view: implement in_reply_to_screen_name using the new graph walking helper | 2018-10-25 02:59:04 +00:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 82b57ebad1 | [Pleroma.Web.TwitterAPI.UserView]: Add mastodon-fields in "fields" | 2018-09-28 10:44:45 +02:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 56577d8b48 | twitter api: add no_rich_text option to userview for account prefs | 2018-09-22 03:24:40 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 2f5b026548 | twitter api: add support for user-specified html policy | 2018-09-22 02:53:01 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | e82ce2a4b3 | formatting | 2018-09-10 00:28:40 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | ac486fc59b | everywhere: use Pleroma.HTML module instead of HtmlSanitizeEx directly | 2018-09-10 00:14:47 +00:00 |  | 
				
					
						| 
								
								
									 kaniini | b7923aa304 | Merge branch 'hotfix_broken_likes' into 'develop' hotfix for broken like completely breaking the notifications API
See merge request pleroma/pleroma!284 | 2018-09-02 12:37:00 +00:00 |  | 
				
					
						| 
								
								
									 Henry Jameson | 0f1c629d65 | better solution, added test. | 2018-08-27 17:07:26 +03:00 |  | 
				
					
						| 
								
								
									 Henry Jameson | 9b046d2a84 | fixed notifications API completely breaking if there's a like for missing (deleted) post. | 2018-08-22 16:10:59 +03:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 643f373514 | Run mix format | 2018-08-22 12:09:01 +02:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | d5bdd55b5d | [Pleroma.Web.TwitterAPI.UserView]: Do not fail if user.bio is nil | 2018-08-22 01:47:25 +02:00 |  | 
				
					
						| 
								
								
									 ensra | 5debd7b5cc | Twitter API: Support Mastodon-style bios (multi-line, with links, and user mentions) | 2018-08-21 14:03:36 +01:00 |  | 
				
					
						| 
								
								
									 eal | 37b802682c | HTML-sanitize usernames before emojifying. | 2018-08-09 13:07:03 +03:00 |  | 
				
					
						| 
								
								
									 eal | ed9738e031 | Add tests for emoji in user profiles Also use the correct field in TwitterAPI... | 2018-08-08 09:24:50 +03:00 |  | 
				
					
						| 
								
								
									 eal | cee63ad3f7 | TwitterAPI user view: add screen_name_html and description_html. | 2018-08-08 08:38:25 +03:00 |  | 
				
					
						| 
								
								
									 William Pitcock | b832df1e15 | formatting | 2018-07-12 16:12:54 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 152a526237 | twitter api: refactor activity html generation, add support for Articles | 2018-07-12 16:11:42 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 3b799f22b7 | twitterapi: activity view: expose message summary text | 2018-07-12 16:11:36 +00:00 |  | 
				
					
						| 
								
								
									 lambda | fe4387077a | Merge branch 'feature/default-scope' into 'develop' default scope setting
See merge request pleroma/pleroma!239 | 2018-07-12 05:59:12 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 971bb4f2bd | activity interpretation: formatting | 2018-06-27 13:38:19 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 121c1f6230 | twitter api: refactor activity html generation, add support for Articles | 2018-06-27 13:37:53 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | dcdf7b6686 | twitter api: user view: show default message scope if known | 2018-06-27 13:15:50 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | ba8dab7542 | twitterapi: user view: return if an account is locked or not | 2018-06-11 22:15:53 +00:00 |  | 
				
					
						| 
								
								
									 lain | ff007af0c2 | Return visilility in twitter api, too. | 2018-05-20 18:01:24 +02:00 |  | 
				
					
						| 
								
								
									 Mark Felder | aaacebd906 | Fix unused variables, imports, and aliases | 2018-05-04 21:42:20 +00:00 |  | 
				
					
						| 
								
								
									 Mark Felder | 943820ae29 | More unused variables | 2018-05-04 21:16:02 +00:00 |  | 
				
					
						| 
								
								
									 lain | a61e8ac154 | Formatting. | 2018-04-20 13:10:57 +02:00 |  | 
				
					
						| 
								
								
									 eal | fa37acfcc7 | TwitterAPI: Add Qvitter notification endpoint. | 2018-04-19 21:46:59 +03:00 |  | 
				
					
						| 
								
								
									 lain | b3b7ab5d9a | Load all users at once in timelines. | 2018-04-02 16:35:41 +02:00 |  | 
				
					
						| 
								
								
									 lain | 360c51f1f5 | Use context_ids directly if we have them. | 2018-04-02 15:28:35 +02:00 |  | 
				
					
						| 
								
								
									 lain | bc31bee7c4 | Generates contexts and ids on insertion time. | 2018-04-02 15:17:09 +02:00 |  | 
				
					
						| 
								
								
									 lain | a4db3a732f | Pre-fetch conversation ids. | 2018-04-02 14:46:56 +02:00 |  | 
				
					
						| 
								
								
									 lain | 7ab94ae22d | TwitterApiController: Use ActivityView. | 2018-03-30 16:30:16 +02:00 |  | 
				
					
						| 
								
								
									 lain | e90f8f6c4b | TwApi ActivityView: Add delete activities. | 2018-03-30 15:32:43 +02:00 |  | 
				
					
						| 
								
								
									 lain | 1f32ba052c | TwApi ActivityView: Add follows. | 2018-03-30 15:17:13 +02:00 |  | 
				
					
						| 
								
								
									 lain | 4afbef39f4 | Format the code. | 2018-03-30 15:01:53 +02:00 |  | 
				
					
						| 
								
								
									 lain | c1d529ee94 | TwApi ActivityView: Add announces. | 2018-03-30 14:46:36 +02:00 |  | 
				
					
						| 
								
								
									 lain | 1f1caab138 | TwApi ActivityView: Add Like rendering. | 2018-03-30 13:49:09 +02:00 |  | 
				
					
						| 
								
								
									 lain | df8fc72491 | Don't go through all available emoji. object carry their emoji information. | 2018-03-28 09:56:32 +02:00 |  | 
				
					
						| 
								
								
									 lain | e30752bc79 | Add basic activity view. | 2018-03-27 22:24:19 +02:00 |  | 
				
					
						| 
								
								
									 lain | 5bc810c452 | Add moderator function. | 2018-02-20 18:44:50 +01:00 |  | 
				
					
						| 
								
								
									 eal | ab83e0de6d | TwitterAPI: Add is_local to user view. | 2018-02-01 21:41:19 +02:00 |  | 
				
					
						| 
								
								
									 eal | 14b086eec2 | Add a default profile picture and banner. This removes the placehold.it dependency. | 2018-01-15 22:18:17 +02:00 |  | 
				
					
						| 
								
								
									 href | 72f7baa654 | Merge remote-tracking branch 'upstream/develop' into media-proxy | 2017-12-05 14:12:15 +01:00 |  | 
				
					
						| 
								
								
									 Lain Iwakura | 5c40986120 | Basic backend chat. | 2017-12-04 19:10:15 +01:00 |  | 
				
					
						| 
								
								
									 href | 5f35fdcf5d | media proxy: good enough wip | 2017-11-28 20:50:34 +01:00 |  | 
				
					
						| 
								
								
									 Thog | 59770c3f5c | Fix all compilation warnings | 2017-11-19 02:22:07 +01:00 |  | 
				
					
						| 
								
								
									 eal | f7fc048aeb | TwitterAPI user view: add follows_you. | 2017-11-08 19:13:03 +02:00 |  | 
				
					
						| 
								
								
									 eal | 4656cb9b99 | TwitterAPI user view: add blocks. | 2017-11-08 13:02:00 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 6af164f27b | Add password reset. | 2017-10-19 17:37:24 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 50409326a8 | Refactor posting and make character limit configurable. | 2017-09-15 14:17:36 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 6c3a0ffae4 | Add banner and background updating. | 2017-08-29 17:18:33 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 94a394e3a8 | Add followers endpoint. | 2017-07-20 20:29:15 +02:00 |  | 
				
					
						| 
								
								
									 dtluna | 069daf644d | Replace UserRepresenter with UserView | 2017-06-20 00:12:37 +03:00 |  |