about summary refs log tree commit diff
path: root/app
AgeCommit message (Collapse)Author
2019-11-30[Glitch] Add hotkey for opening media filesThibG
Port a690b3e470ed85cc6f3f8fa7aec57d04b60a4705 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-11-30[Glitch] Fix pending upload count not being decremented on errorThibG
Port 667708f5b00ee8b7795eacd9c20d29f77c8ae602 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-11-30[Glitch] Fix OCR with delete & redraftThibG
Port e7a7f88df7a763be6dad3a982829ef5a1b1dea09 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-11-30Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-11-29Fix counter sizing (#12446)Sasha Sorokin
Counter size is currently set to strict 33.3% width, but with it counter may break in other languages than English. For example it is already broken on Gargron's profile on mastodon.social using Russian locale. This commit changes "width" to "min-width", so counters still displayed correctly, but if they need more width to fit text, they are now allowed to take as many width as they need.
2019-11-29Improve notifications page (#12497)Sasha Sorokin
Currently notifications page seems a bit cluttered with no clear separation between e-mail and filtering settings. This commit tries to address them by adding clear separation with headers, hints and removing continuously reused texts for events checkboxes.
2019-11-29Add hotkey for opening media files (#12498)ThibG
* [WiP] Add hotkey to open media * Give focus to play/pause button when opening video modal
2019-11-29Fix pending upload count not being decremented on error (#12499)ThibG
The arguments were passed to the wrong function… also, there is no need to have a conditional decrementation: failure to upload means we marked an upload as pending, in all cases.
2019-11-28Fix n+1 query for bookmarks on statuses (#12494)Eugen Rochko
2019-11-28Fix proofs API being inaccessible in secure mode (#12495)Eugen Rochko
2019-11-27Link move target accountThibaut Girka
2019-11-27Show acct of target accountThibaut Girka
2019-11-27Add moved account warningThibaut Girka
2019-11-27Do not consider moved accounts as non-functionalThibaut Girka
This might be somewhat controversial, but putting a redirection up makes the account unusable, which works against use cases such as using the moved account as backup in case the new one temporarily fails (sure, the redirection can be temporarily removed, but it is a hassle)
2019-11-26Fix empty poll options not being filtered on remote poll update (#12484)ThibG
If a poll contains empty options (which is apparently possible on Pleroma), it is created without them. However, the poll update code doesn't filter empty options, and thus: 1. Clear known votes, as it assumes the set of options has changed 2. Errors out because it tries adding empty options, which fails validation This commit fixes that by filtering them out the same way they are filtered out at poll creation time.
2019-11-25Fix OCR with delete & redraft (#12465)ThibG
2019-11-23[Glitch] Fix blur behind closed registration messageThibG
Port SCSS changes from 42b3b019e01ee0c290a510483a2400e85cc250f1 to glitch flavour Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-11-23[Glitch] Change media description label to be context-sensitiveThibG
Port e86234b1e90975de6e507a86549f0eb4600c723b to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-11-23Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-11-22Fix an eslint warning (#12426)Dimitri Merejkowsky
2019-11-22Fix blur behind closed registration message (#12442)ThibG
* Fix closed registration message blur * Adjust overlay margins to account for blur Fixes #12425
2019-11-21Fix OEmbed discovery not handling different URL variants in query (#12439)Eugen Rochko
Fix #12433
2019-11-21Simplify SQL query when performing account search amongst followings (#12302)ThibG
2019-11-21Fix FetchLinkCardServices crashing on a tags without a target (#12159)ThibG
* Add test for links without targets * Fix FetchLinkCardServices crashing on a tags without a target
2019-11-21Change media description label to be context-sensitive (#12270)ThibG
“Describe for the visually impaired” makes no sense when the uploaded media is an audio file.
2019-11-21Change domain block behavior to update user records before deleting data ↵ThibG
(#12247) When suspending or silencing a domain, one probably wants the silence or suspend parts to take effect as soon as possible. Deleting media files can take a while (possibly days), so perform silencing as soon as possible, and clean up media afterwards.
2019-11-21Fix whitelist federation for subdomains (#12435)noiob
2019-11-20[Glitch] Fix unread toot indicator not honoring onlyMedia in public and ↵ThibG
community timelines Port 0d6da8892a675962f8e7fe1f1edc960c4a0ce36d to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-11-20Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - README.md discarded upstream changes - app/controllers/api/v1/bookmarks_controller.rb finally merged upstream, some code style fixes and slightly changed pagination code - app/controllers/application_controller.rb changed upstream to always return HTML error pages slight conflict caused by theming code - app/models/bookmark.rb finally merged upstream, no real conflict - spec/controllers/api/v1/bookmarks_controller_spec.rb finally merged upstream, slightly changed pagination code
2019-11-20Fix account dropdown not opening due to regression from #12377 (#12430)Eugen Rochko
2019-11-19Add relationship-based options to status dropdowns (#12377)Eugen Rochko
Move bookmark action in inline statuses from action bar to dropdown
2019-11-17Add cache for OEmbed endpoints to avoid extra HTTP requests (#12403)Eugen Rochko
* add youtube oembed endpoint * add check for oembed endpoint * change unless for a more readable if * clear blank lines * endpoint via https * Fix string literal in condition * use cache for endpoints * use cache for endpoints * clean up and adding check * clean up and remove redundant return * add html check * add false to return * use double quotes * use double quotes * Clean up
2019-11-17Support min_id-based pagination for bookmarks (#12381)Gomasy
* Support min_id-based pagination for bookmarks * Fix spec
2019-11-16make it not return http 400 when passing and empty source argument (#12259)Jennifer Glauche
* make it not return http 400 when passing and empty source argument * create a spec for the empty source hash bug * compact checks for nil, empty? parameters * use nil.blank? instead checking for nil
2019-11-13Add kn, mr, ur to available locales (#12379)Eugen Rochko
2019-11-13New Crowdin translations (#12146)Eugen Rochko
* New translations en.json (Tamil) [ci skip] * New translations en.json (Bengali) [ci skip] * New translations en.json (Portuguese, Brazilian) [ci skip] * New translations en.yml (Portuguese, Brazilian) [ci skip] * New translations en.json (Tamil) [ci skip] * New translations en.json (Tamil) [ci skip] * New translations devise.en.yml (Bengali) [ci skip] * New translations en.json (Tamil) [ci skip] * New translations devise.en.yml (Bengali) [ci skip] * New translations simple_form.en.yml (Bengali) [ci skip] * New translations devise.en.yml (Bengali) [ci skip] * New translations devise.en.yml (Bengali) [ci skip] * New translations devise.en.yml (Bengali) [ci skip] * New translations en.json (Thai) [ci skip] * New translations en.json (Tamil) [ci skip] * New translations en.json (Persian) [ci skip] * New translations en.yml (Persian) [ci skip] * New translations devise.en.yml (Tamil) [ci skip] * New translations devise.en.yml (Tamil) [ci skip] * New translations devise.en.yml (Tamil) [ci skip] * New translations en.json (Occitan) [ci skip] * New translations simple_form.en.yml (Occitan) [ci skip] * New translations en.json (Tamil) [ci skip] * New translations en.json (Occitan) [ci skip] * New translations en.yml (Occitan) [ci skip] * New translations en.json (Tamil) [ci skip] * New translations simple_form.en.yml (Tamil) [ci skip] * New translations en.json (Tamil) [ci skip] * New translations simple_form.en.yml (Tamil) [ci skip] * New translations activerecord.en.yml (Tamil) [ci skip] * New translations en.json (Tamil) [ci skip] * New translations en.json (Tamil) [ci skip] * New translations en.json (Arabic) [ci skip] * New translations en.yml (Arabic) [ci skip] * New translations simple_form.en.yml (Arabic) [ci skip] * New translations en.json (Finnish) [ci skip] * New translations en.json (Danish) [ci skip] * New translations en.json (Kannada) [ci skip] * New translations en.yml (Kannada) [ci skip] * New translations simple_form.en.yml (Kannada) [ci skip] * New translations activerecord.en.yml (Kannada) [ci skip] * New translations devise.en.yml (Kannada) [ci skip] * New translations doorkeeper.en.yml (Kannada) [ci skip] * New translations en.json (Marathi) [ci skip] * New translations en.yml (Marathi) [ci skip] * New translations simple_form.en.yml (Marathi) [ci skip] * New translations activerecord.en.yml (Marathi) [ci skip] * New translations devise.en.yml (Marathi) [ci skip] * New translations doorkeeper.en.yml (Marathi) [ci skip] * New translations en.json (Marathi) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations en.yml (Hindi) [ci skip] * New translations simple_form.en.yml (Hindi) [ci skip] * New translations activerecord.en.yml (Hindi) [ci skip] * New translations devise.en.yml (Hindi) [ci skip] * New translations doorkeeper.en.yml (Hindi) [ci skip] * New translations en.json (Marathi) [ci skip] * New translations en.json (Urdu (Pakistan)) [ci skip] * New translations en.yml (Urdu (Pakistan)) [ci skip] * New translations simple_form.en.yml (Urdu (Pakistan)) [ci skip] * New translations activerecord.en.yml (Urdu (Pakistan)) [ci skip] * New translations devise.en.yml (Urdu (Pakistan)) [ci skip] * New translations doorkeeper.en.yml (Urdu (Pakistan)) [ci skip] * New translations activerecord.en.yml (Marathi) [ci skip] * New translations doorkeeper.en.yml (Marathi) [ci skip] * New translations doorkeeper.en.yml (Marathi) [ci skip] * New translations en.json (Marathi) [ci skip] * New translations simple_form.en.yml (Finnish) [ci skip] * New translations en.json (Marathi) [ci skip] * New translations en.json (Marathi) [ci skip] * New translations en.json (Marathi) [ci skip] * New translations en.json (Tamil) [ci skip] * New translations en.json (Marathi) [ci skip] * New translations en.json (Marathi) [ci skip] * New translations en.json (Marathi) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations en.yml (Persian) [ci skip] * New translations simple_form.en.yml (Persian) [ci skip] * New translations devise.en.yml (Bengali) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations devise.en.yml (Bengali) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations en.json (Malayalam) [ci skip] * New translations en.yml (Malayalam) [ci skip] * New translations simple_form.en.yml (Malayalam) [ci skip] * New translations activerecord.en.yml (Malayalam) [ci skip] * New translations devise.en.yml (Malayalam) [ci skip] * New translations doorkeeper.en.yml (Malayalam) [ci skip] * New translations en.yml (Slovak) [ci skip] * New translations en.json (Slovak) [ci skip] * New translations en.yml (Slovak) [ci skip] * New translations simple_form.en.yml (Slovak) [ci skip] * New translations devise.en.yml (Slovak) [ci skip] * New translations en.json (Slovak) [ci skip] * New translations simple_form.en.yml (Slovak) [ci skip] * New translations doorkeeper.en.yml (Slovak) [ci skip] * New translations en.yml (Bengali) [ci skip] * New translations en.json (Ukrainian) [ci skip] * New translations simple_form.en.yml (Ukrainian) [ci skip] * New translations en.json (Norwegian Nynorsk) [ci skip] * New translations en.yml (Bengali) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations devise.en.yml (Ukrainian) [ci skip] * New translations simple_form.en.yml (Ukrainian) [ci skip] * New translations en.json (Norwegian Nynorsk) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations en.json (Norwegian Nynorsk) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations en.json (Norwegian Nynorsk) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations en.json (Malayalam) [ci skip] * New translations en.yml (Indonesian) [ci skip] * New translations en.json (Norwegian Nynorsk) [ci skip] * New translations simple_form.en.yml (Tamil) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations en.yml (Malayalam) [ci skip] * New translations en.yml (Indonesian) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations en.yml (Indonesian) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations en.json (Italian) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations en.yml (Hindi) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations en.json (Marathi) [ci skip] * New translations en.json (Marathi) [ci skip] * New translations devise.en.yml (Tamil) [ci skip] * New translations en.json (Marathi) [ci skip] * New translations devise.en.yml (Tamil) [ci skip] * New translations en.json (Marathi) [ci skip] * New translations en.yml (Galician) [ci skip] * New translations simple_form.en.yml (Galician) [ci skip] * New translations simple_form.en.yml (Chinese Simplified) [ci skip] * New translations doorkeeper.en.yml (Chinese Simplified) [ci skip] * New translations en.json (Hungarian) [ci skip] * New translations en.yml (Hungarian) [ci skip] * New translations simple_form.en.yml (Japanese) [ci skip] * New translations en.yml (Chinese Simplified) [ci skip] * New translations en.json (Bengali) [ci skip] * New translations en.json (Basque) [ci skip] * New translations en.json (Spanish, Argentina) [ci skip] * New translations en.json (Russian) [ci skip] * New translations en.yml (Persian) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations en.yml (Catalan) [ci skip] * New translations en.yml (Greek) [ci skip] * New translations en.yml (Swedish) [ci skip] * New translations en.yml (Swedish) [ci skip] * New translations en.json (Estonian) [ci skip] * New translations en.yml (Estonian) [ci skip] * New translations en.yml (Spanish, Argentina) [ci skip] * New translations en.yml (Estonian) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations devise.en.yml (Estonian) [ci skip] * New translations en.yml (Bengali) [ci skip] * New translations en.yml (Indonesian) [ci skip] * New translations en.yml (Bengali) [ci skip] * New translations en.yml (Kazakh) [ci skip] * New translations en.yml (Bengali) [ci skip] * New translations en.yml (Finnish) [ci skip] * New translations doorkeeper.en.yml (Finnish) [ci skip] * New translations en.json (Malayalam) [ci skip] * New translations doorkeeper.en.yml (Finnish) [ci skip] * New translations en.json (Malayalam) [ci skip] * New translations en.yml (Tamil) [ci skip] * New translations en.yml (Tamil) [ci skip] * New translations en.yml (Tamil) [ci skip] * New translations en.json (Malayalam) [ci skip] * New translations simple_form.en.yml (Estonian) [ci skip] * New translations en.json (Malayalam) [ci skip] * New translations devise.en.yml (Malayalam) [ci skip] * New translations en.yml (Estonian) [ci skip] * New translations simple_form.en.yml (Estonian) [ci skip] * New translations simple_form.en.yml (Malayalam) [ci skip] * New translations en.yml (Turkish) [ci skip] * New translations devise.en.yml (Portuguese, Brazilian) [ci skip] * New translations simple_form.en.yml (Portuguese, Brazilian) [ci skip] * New translations devise.en.yml (Portuguese, Brazilian) [ci skip] * New translations simple_form.en.yml (Portuguese, Brazilian) [ci skip] * New translations en.yml (Hungarian) [ci skip] * New translations en.yml (Swedish) [ci skip] * New translations en.yml (Swedish) [ci skip] * New translations en.yml (Swedish) [ci skip] * New translations en.yml (Swedish) [ci skip] * New translations en.yml (Swedish) [ci skip] * New translations en.yml (Corsican) [ci skip] * New translations en.yml (French) [ci skip] * New translations en.json (Esperanto) [ci skip] * New translations simple_form.en.yml (Slovak) [ci skip] * New translations devise.en.yml (Slovak) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations devise.en.yml (Tamil) [ci skip] * New translations en.yml (Tamil) [ci skip] * New translations doorkeeper.en.yml (Tamil) [ci skip] * New translations doorkeeper.en.yml (Tamil) [ci skip] * New translations doorkeeper.en.yml (Slovak) [ci skip] * New translations en.yml (Spanish) [ci skip] * New translations en.yml (Estonian) [ci skip] * New translations en.yml (Estonian) [ci skip] * New translations en.yml (Estonian) [ci skip] * New translations en.yml (Estonian) [ci skip] * New translations en.yml (Estonian) [ci skip] * New translations en.json (Chinese Simplified) [ci skip] * New translations devise.en.yml (Chinese Simplified) [ci skip] * New translations en.yml (Chinese Simplified) [ci skip] * New translations devise.en.yml (Chinese Simplified) [ci skip] * New translations en.yml (Chinese Simplified) [ci skip] * New translations en.yml (Chinese Simplified) [ci skip] * New translations en.yml (Chinese Simplified) [ci skip] * New translations en.yml (Chinese Simplified) [ci skip] * New translations simple_form.en.yml (Chinese Simplified) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations en.yml (Basque) [ci skip] * New translations en.yml (Czech) [ci skip] * New translations en.yml (Danish) [ci skip] * New translations en.yml (Danish) [ci skip] * New translations en.yml (Ukrainian) [ci skip] * New translations devise.en.yml (Ukrainian) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations en.json (Malayalam) [ci skip] * New translations en.json (Malayalam) [ci skip] * New translations en.json (Malayalam) [ci skip] * New translations en.yml (Bengali) [ci skip] * New translations en.yml (Bengali) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations en.yml (Galician) [ci skip] * New translations en.json (Tamil) [ci skip] * New translations en.json (Russian) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations doorkeeper.en.yml (Russian) [ci skip] * New translations en.json (Estonian) [ci skip] * New translations en.yml (Chinese Simplified) [ci skip] * New translations doorkeeper.en.yml (Chinese Simplified) [ci skip] * New translations en.yml (French) [ci skip] * New translations en.json (Bengali) [ci skip] * i18n-tasks normalize * yarn manage:translations
2019-11-13Add bookmarks (#7107)ThibG
* Add backend support for bookmarks Bookmarks behave like favourites, except they aren't shared with other users and do not have an associated counter. * Add spec for bookmark endpoints * Add front-end support for bookmarks * Introduce OAuth scopes for bookmarks * Add bookmarks to archive takeout * Fix migration * Coding style fixes * Fix rebase issue * Update bookmarked_statuses to latest UI changes * Update bookmark actions to properly reflect status changes in state * Add bookmarks item to single-column layout * Make active bookmarks red
2019-11-13Change to always returns html document in error pages (#12214)Yamagishi Kazutoshi
2019-11-11Fix broken admin audit log in whitelist mode (#12303)ThibG
2019-11-11Fix unread toot indicator not honoring onlyMedia in public and community ↵ThibG
timelines (#12330) * Fix unread toot indicator not honoring onlyMedia in public and community timelines * Fixup: `unread` already accounts for new content in pending items
2019-11-11Fix already-known remote private toots not being searchable by URL (#12336)ThibG
* Fix already-known remote private toots not being searchable by URL Whenever an URL search fails, and an account is provided, try getting a private status matching that URL from database. * Fix searching by `id` field instead of `uri`
2019-11-07Fix type mismatch (#12324)Darius Kazemi
This was [causing an issue with feed regeneartion in tootctl](https://github.com/hometown-fork/hometown/issues/24), and @davefp fixed the issue.
2019-11-07[Glitch] Minor improvements to poll composing UIThibaut Girka
Port 7cdb8c10e97fe9e22411efef4986e6393247e0ee to glitch-soc
2019-11-07[Glitch] Fix WebUI allowing to upload more items than the limitThibG
Port 66684c489c3c0bde752d107b02fc3bd6cbcacf04 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-11-07Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - `app/javascript/mastodon/features/compose/components/poll_form.js` conflict because of the poll option limit being different than upstream's
2019-11-07Fix relationship caches being broken as result of a follow request (#12299)ThibG
2019-11-07Fix WebUI allowing to upload more items than the limit (#12300)ThibG
Until this patch, drag'n'drop and copy-paste allowed to start uploading as long as the number of *finished* uploads was below the limit.
2019-11-07Minor improvements to poll composing UI (#12319)ThibG
- Disable the “add option” button instead of hiding it - Allow poll option inputs to scale to full width
2019-11-07Fix various issues with account migration (#12301)ThibG
* Fix being able to follow oneself by moving to an account that was following the old one * Add specs * Add spec to catch MoveWorker issue with local followers following both accounts * Fix move worker breaking when a local account follows both source and target accounts * Fix migration from remote to local account not sending Undo Follow * Fix show_reblogs not being preserved for moved account's followers
2019-11-06[Glitch] Fix notification message for own pollThibaut Girka
Port a4301b52026827ad1cd90bfc77fabda92785a4c3 and be93318c0538ccfc41997301800dc347ad0f4271 to glitch-soc