about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2018-08-23i18n: fix Polish translation (#8380)Marcin Mikołajczak
2018-08-23i18n: Update Polish translation (#8378)Marcin Mikołajczak
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-08-23Do not crash if remote custom emoji does not define updated date (fixes ↵ThibG
#8376) (#8377)
2018-08-22Merge pull request #665 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2018-08-22Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-08-22Avoid deleted attributes when building a Status from action log (fixes ↵ThibG
#8371) (#8373)
2018-08-22Improve federated ID validation (#8372)Eugen Rochko
* Fix URI not being sufficiently validated with prefetched JSON * Add additional id validation to OStatus documents, when possible
2018-08-22Override CSP setting in the embed controller to allow framesThibaut Girka
2018-08-22Move CSP headers to the appropriate Rails configurationThibaut Girka
Also drop dev-static.glitch.social reference.
2018-08-22Fix locale packs loading in embed layoutThibaut Girka
2018-08-22Add glitch-soc local setting to display reply countersThibaut Girka
Defaults to false.
2018-08-22Move layout options to their own sectionThibaut Girka
2018-08-22[Glitch] Display replies count in web UIThibaut Girka
Port 4df9cabb22cbed8f9cd8af45325ecdcc7c72d6cb to glitch-soc
2018-08-22Allow use of plurals on about page stats. (#8363)M Somerville
2018-08-22Add favourites to archive takeout (#8351)Eugen Rochko
Remove experimental key export
2018-08-22Add hashtag trendline support to glitch-soc flavourThibaut Girka
Port Mastodon's hashtag stats thing to glitch-soc. This doesn't change how hashtags are ordered, and doesn't add a trending hashtags section, but it does change how hashtag searches are rendered, displaying a trend line alongside each hashtag.
2018-08-22Add pinned accounts editorThibaut Girka
2018-08-22Split list editor into components and containersThibaut Girka
2018-08-22Fix ColumnLink keys in getting_started_miscThibaut Girka
2018-08-22exclude-other-silenced-accounts (#7528)masarakki
2018-08-22Add confirmation step to account suspensions (#8353)Eugen Rochko
* Add confirmation page for suspensions * Suspension confirmation closes reports, linked from report UI * Fix tests
2018-08-22Get rid of Chewy order/limit warning (#8355)Eugen Rochko
2018-08-21Add missing indices for ON DELETE CASCADE constraints (#8332)Eugen Rochko
Fix #8327
2018-08-21Merge pull request #660 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2018-08-21Weblate translations (2018-08-22) (#8346)Yamagishi Kazutoshi
* Translated using Weblate (Greek) Currently translated at 99.8% (667 of 668 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Persian) Currently translated at 100.0% (309 of 309 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/ * Translated using Weblate (Persian) Currently translated at 99.7% (666 of 668 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fa/ * Translated using Weblate (Dutch) Currently translated at 100.0% (668 of 668 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Arabic) Currently translated at 95.2% (636 of 668 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Dutch) Currently translated at 100.0% (668 of 668 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.7% (666 of 668 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (Polish) Currently translated at 99.7% (666 of 668 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pl/ * Translated using Weblate (Czech) Currently translated at 99.8% (667 of 668 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ * Translated using Weblate (Czech) Currently translated at 100.0% (309 of 309 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/ * Translated using Weblate (French) Currently translated at 100.0% (309 of 309 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (French) Currently translated at 100.0% (309 of 309 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (Galician) Currently translated at 99.8% (667 of 668 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Occitan) Currently translated at 99.8% (667 of 668 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/ * Translated using Weblate (Ukrainian) Currently translated at 96.5% (645 of 668 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/uk/ * Translated using Weblate (Ukrainian) Currently translated at 69.3% (68 of 98 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/uk/ * Translated using Weblate (Ukrainian) Currently translated at 43.9% (36 of 82 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/uk/ * Translated using Weblate (Czech) Currently translated at 99.8% (667 of 668 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ * Translated using Weblate (Basque) Currently translated at 100.0% (309 of 309 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eu/ * Translated using Weblate (Basque) Currently translated at 98.9% (661 of 668 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eu/ * Translated using Weblate (Basque) Currently translated at 97.5% (80 of 82 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/eu/ * Translated using Weblate (Czech) Currently translated at 100.0% (309 of 309 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/ * Translated using Weblate (Arabic) Currently translated at 95.2% (636 of 668 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Japanese) Currently translated at 99.7% (666 of 668 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Japanese) Currently translated at 99.8% (667 of 668 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Japanese) Currently translated at 100.0% (309 of 309 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (Arabic) Currently translated at 92.6% (76 of 82 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ * Translated using Weblate (Arabic) Currently translated at 97.1% (649 of 668 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Arabic) Currently translated at 100.0% (309 of 309 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ * Translated using Weblate (Arabic) Currently translated at 97.0% (650 of 670 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Greek) Currently translated at 99.8% (669 of 670 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Japanese) Currently translated at 99.7% (668 of 670 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Galician) Currently translated at 99.8% (669 of 670 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Galician) Currently translated at 100.0% (309 of 309 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/ * Translated using Weblate (Japanese) Currently translated at 99.8% (669 of 670 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Finnish) Currently translated at 88.5% (593 of 670 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fi/ * Translated using Weblate (Occitan) Currently translated at 99.8% (669 of 670 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/ * Translated using Weblate (Persian) Currently translated at 100.0% (82 of 82 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fa/ * Translated using Weblate (Persian) Currently translated at 99.7% (668 of 670 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fa/ * Translated using Weblate (Japanese) Currently translated at 99.7% (670 of 672 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Arabic) Currently translated at 96.7% (650 of 672 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Arabic) Currently translated at 100.0% (309 of 309 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ * Translated using Weblate (Swedish) Currently translated at 100.0% (309 of 309 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sv/ * Translated using Weblate (Czech) Currently translated at 99.8% (672 of 673 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ * Translated using Weblate (Japanese) Currently translated at 99.7% (671 of 673 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Danish) Currently translated at 84.5% (569 of 673 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/da/ * Translated using Weblate (Danish) Currently translated at 77.4% (48 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/da/ * Translated using Weblate (Arabic) Currently translated at 97.0% (654 of 674 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Arabic) Currently translated at 97.0% (655 of 675 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Japanese) Currently translated at 99.7% (673 of 675 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Czech) Currently translated at 99.8% (674 of 675 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ * Translated using Weblate (Greek) Currently translated at 99.8% (674 of 675 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (309 of 309 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ * Translated using Weblate (French) Currently translated at 96.8% (654 of 675 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (Esperanto) Currently translated at 99.7% (673 of 675 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eo/ * Translated using Weblate (Danish) Currently translated at 84.5% (571 of 675 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/da/ * Translated using Weblate (Danish) Currently translated at 84.8% (573 of 675 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/da/ * Translated using Weblate (Occitan) Currently translated at 99.7% (673 of 675 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/ * Translated using Weblate (Danish) Currently translated at 100.0% (309 of 309 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/da/ * Translated using Weblate (Danish) Currently translated at 88.7% (55 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/da/ * Translated using Weblate (Italian) Currently translated at 100.0% (309 of 309 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/it/ * Translated using Weblate (Danish) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/da/ * Translated using Weblate (Danish) Currently translated at 85.1% (575 of 675 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/da/ * Translated using Weblate (Hebrew) Currently translated at 45.4% (307 of 675 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/he/ * Translated using Weblate (Danish) Currently translated at 100.0% (309 of 309 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/da/ * Translated using Weblate (Russian) Currently translated at 98.0% (303 of 309 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ru/ * Translated using Weblate (Hebrew) Currently translated at 97.4% (301 of 309 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/he/ * Translated using Weblate (Danish) Currently translated at 100.0% (82 of 82 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/da/ * Translated using Weblate (Arabic) Currently translated at 97.1% (656 of 675 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Danish) Currently translated at 86.8% (586 of 675 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/da/ * Translated using Weblate (Italian) Currently translated at 83.2% (562 of 675 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/it/ * Translated using Weblate (Danish) Currently translated at 100.0% (309 of 309 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/da/ * Translated using Weblate (Danish) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/da/ * Translated using Weblate (Danish) Currently translated at 93.8% (92 of 98 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/da/ * Translated using Weblate (Galician) Currently translated at 100.0% (675 of 675 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Italian) Currently translated at 83.4% (563 of 675 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/it/ * Translated using Weblate (Arabic) Currently translated at 97.6% (659 of 675 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Dutch) Currently translated at 100.0% (675 of 675 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Arabic) Currently translated at 97.7% (660 of 675 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Arabic) Currently translated at 93.9% (77 of 82 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ * Translated using Weblate (Dutch) Currently translated at 100.0% (675 of 675 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (309 of 309 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.8% (674 of 675 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (Arabic) Currently translated at 97.7% (660 of 675 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Danish) Currently translated at 86.9% (587 of 675 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/da/ * Translated using Weblate (Arabic) Currently translated at 100.0% (309 of 309 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ * Translated using Weblate (Danish) Currently translated at 97.9% (96 of 98 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/da/ * yarn manage:translations * i18n-tasks normalize
2018-08-21Merge branch 'master' into glitch-soc/masterThibaut Girka
Conflicts: config/routes.rb Added the “endorsements” route from upstream.
2018-08-21Revert to using Paperclip's filesystem storage, and fix dangling records in ↵ThibG
remove_remote (#8339) * Fix uncaching worker * Revert to using Paperclip's filesystem backend instead of fog-local fog-local has lots of concurrency issues, causing failure to delete files, dangling file records, and spurious errors UncacheMediaWorker
2018-08-21Get rid of all batch order warnings (#8334)Eugen Rochko
2018-08-21Remove annoying Notification#cache_ids scope warning (#8333)Eugen Rochko
2018-08-20reorder simple form ul to list vertically (fixes #8236) (#8322)NecroTechno
* reorder simple form ul to list vertically (fixes #8236) * remove browser specific prefixes
2018-08-20Upgrade doorkeeper to 4.4.2 (#8321)ThibG
2018-08-20[Glitch] Add hotkey for follow requestsThibaut Girka
Port 25f6f41052b52a765a74e9e16d7411750ae46221 to glitch-soc
2018-08-20Make the privacy dropdown button not look strange when using top placementThibaut Girka
Inspired by 8fe1f8d4cecb9f2f749c1e1e77b2439dd640ddc5
2018-08-20[Glitch] Skip pagination logic entirely for pinned tootsThibaut Girka
2018-08-20Make non-link ColumnLinks behave as linksThibaut Girka
2018-08-20Add API endpoint to list featured accounts (fixes #8315) (#8317)ThibG
2018-08-20Skip pagination logic entirely for pinned toots (fixes #8302) (#8310)ThibG
2018-08-20Increase reach of Delete->Actor activities (#8305)Eugen Rochko
Fix #7316
2018-08-20Add hotkey for follow requests (#8307)Annika Backstrom
2018-08-19Don't filter own tootsThibaut Girka
2018-08-20Fix a variable for a Finnish translation (#8299)Oskari Noppa
2018-08-19Don't filter own toots (fixes #8289) (#8298)ThibG
2018-08-19Make dropdown animations respect their placement (#8292)cpsdqs
* Make dropdown animations respect their placement Also fix the corner radius on the privacy dropdown button when using top placement * Fix code style issue
2018-08-20i18n: Update Polish translation (#8290)Marcin Mikołajczak
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-08-19Adapt github issue template to glitch-socThibaut Girka
We don't have releases, so it don't make sense to mention. On the other hand, a lot of our code is from upstream, so encourage people to check whether it is a bug in glitch-soc or upstream.
2018-08-19Focus CW field when enabling it, focus compose textarea when disabling itThibaut Girka
Port a99179d31ff0013987f362ffe15cb3450b29ed08 and 09147186b79f80cf3ef3aa8ba7e6e5e032faa255 to glitch-soc
2018-08-19Unuse ActiveRecord::Base#cache_key (#8185)abcang
* Unuse ActiveRecord::Base#cache_key * Enable cache_versioning * Call cache_collection
2018-08-19Fix report text color. (#8288)mayaeh
2018-08-19Keep scheduler jobs unique until they're done (#8287)Eugen Rochko
2018-08-19Merge pull request #652 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
generated by cgit-pink (git 2.37.1) at 2024-11-28 13:53:51 +0000