glitchier-soc

Commit Graph

Author	SHA1	Message	Date
ThibG	8852fff3a4	Merge pull request #675 from ThibG/glitch-soc/merge-upstream Merge upstream changes	6 years ago
Thibaut Girka	53b7bb9d04	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: app/controllers/api/v1/mutes_controller.rb config/locales/simple_form.pl.yml	6 years ago
M Somerville	81697997a3	Include MOV in upload button tooltip. (#8480 )	6 years ago
Renato "Lond" Cerqueira	efdfea3f3c	Weblate translations (2018-08-27) (#8483 ) * Translated using Weblate (French) Currently translated at 100.0% (312 of 312 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (Corsican) Currently translated at 100.0% (312 of 312 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/co/ * Translated using Weblate (Greek) Currently translated at 100.0% (312 of 312 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Danish) Currently translated at 100.0% (312 of 312 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/da/ * Translated using Weblate (Corsican) Currently translated at 99.7% (682 of 684 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/co/ * Translated using Weblate (Danish) Currently translated at 86.1% (589 of 684 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/da/ * Translated using Weblate (French) Currently translated at 99.4% (680 of 684 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (Japanese) Currently translated at 99.7% (682 of 684 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Corsican) Currently translated at 100.0% (312 of 312 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/co/ * Translated using Weblate (French) Currently translated at 100.0% (312 of 312 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (Japanese) Currently translated at 100.0% (312 of 312 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (Czech) Currently translated at 100.0% (312 of 312 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/ * Translated using Weblate (Czech) Currently translated at 99.7% (682 of 684 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ * Translated using Weblate (Czech) Currently translated at 100.0% (312 of 312 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/ * Translated using Weblate (Czech) Currently translated at 98.6% (675 of 684 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ * Translated using Weblate (Czech) Currently translated at 99.8% (683 of 684 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ * Translated using Weblate (Arabic) Currently translated at 0.1% (1 of 684 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Polish) Currently translated at 98.9% (677 of 684 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pl/ * Translated using Weblate (Polish) Currently translated at 100.0% (312 of 312 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pl/ * Translated using Weblate (Polish) Currently translated at 98.7% (81 of 82 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pl/ * Translated using Weblate (Persian) Currently translated at 100.0% (312 of 312 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/ * Normalize translations ran yarn build:development && i18n-tasks normalize && yarn manage:translations && i18n-tasks remove-unused	6 years ago
M Somerville	b31449cd77	Better singulars of account followers/toots. (#8471 )	6 years ago
Jakub Mendyk	f3a12ddfd0	Make Api::V1::MutesController paginate properly (#8472 ) Fixes #8463	6 years ago
Marcin Mikołajczak	b534249a8d	Add more hotkeys to legend (#8469 ) Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	6 years ago
Eugen Rochko	cabdbb7f9c	Add CLI task for rotating keys (#8466 ) * If an Update is signed with known key, skip re-following procedure Because it means the remote actor did not lose their database * Add CLI method for rotating keys bin/tootctl accounts rotate [USERNAME] Generates a new RSA key per account and sends out an Update activity signed with the old key. * Key rotation: Space out Update fan-outs every 5 minutes per 1000 accounts * Skip suspended accounts in key rotation	6 years ago
Eugen Rochko	8adf485c0f	Bump interactions count when a follow happens (#8468 )	6 years ago
Eugen Rochko	c597249124	Add thor to Gemfile directly (#8467 ) It's a common dependency, but just in case	6 years ago
Quint Guvernator	da13fa5021	Fix low-hanging rubocop gripes (#8458 ) * rubocop: quit being so picky * rubocop: miscellany * rubocop: prefer present to blank	6 years ago
ThibG	af934b9071	Merge pull request #674 from ThibG/glitch-soc/merge-upstream Merge upstream changes	6 years ago
Thibaut Girka	be20eb4b2f	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
Eugen Rochko	a791bac153	Add aria-label to notifications (#8460 ) Fix #8192	6 years ago
Eugen Rochko	b9c3788485	Fix NUM_DAYS in rake mastodon:media:remove_remote and print warning (#8462 ) Remove old deprecated rake tasks	6 years ago
Eugen Rochko	55c856c522	Delay e-mail notifications by 2 minutes (#8438 ) Fix #8430	6 years ago
Eugen Rochko	b378b4c5c7	Add CLI interface for importing custom emoji (#8437 ) bin/tootctl emoji import PATH_TO_TAR Fix #8435	6 years ago
Jakub Mendyk	5129f6f2aa	Add messages informing that collections are empty (fixes #4115 ) (#8418 ) * Add messages informing that collections are empty Adds empty messages to blocked users, domain blocks, favourited statuses, users that favourited toot, follow requests, followers of given user, user's being followed by given user, lists, muted users, toots' boosts. Switched from using ScrollContainer to ScrollableList and/or added empty message's text. Fixes #4115 * Update localization files with strings for #4115 * Fix whitespace issues pointed out by codeclimate	6 years ago
Thibaut Girka	5eb3b8522e	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
Tad Thorley	104d089df1	Update _bio.html.haml (#8449 ) On my local instance (https://ruby.social) we have a custom emoji for octocat (:octocat:). I would love to be able to use the emoji in the metadata for my profile. Instead of: \| github \| https://github.com/phaedryx It could be: \| :octocat: \| https://github.com/phaedryx (using a single emoji makes it easier to read the urls)	6 years ago
Eugen Rochko	6c9be61f57	Fix regression from #8439 (#8455 ) Missing no-reduce-motion/reduce-motion body class	6 years ago
Thibaut Girka	36393e1d2b	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: app/views/layouts/application.html.haml Edited: app/helpers/application_helper.rb app/views/admin/domain_blocks/new.html.haml Conflict wasn't really one, just two changes too close to one another. Edition was to adapt the class names for themes to class names for skins and flavours. Also edited app/views/admin/domain_blocks/new.html.haml to strip the duplicate admin pack inclusion thing.	6 years ago
ThibG	2903f8f36b	Merge pull request #671 from ThibG/glitch-soc/merge-upstream Merge upstream changes	6 years ago
Eugen Rochko	f37fafe30b	Add health endpoint to streaming API (#8441 ) GET /api/v1/streaming/health Answers with OK. Fix #8337	6 years ago
PatrickRWells	5c42e8b51b	Fix CW issues in static view on Safari (Fixes #8354 ) (#8446 ) * Fix CW issues in static view on Safari (8354) * Fixed formatting issues * Trailing space	6 years ago
Eugen Rochko	b4ba4b1b5d	Spread out crawling randomly to avoid DDoSing the link (#8445 ) * Spread out crawling randomly to avoid DDoSing the link Fix #4486 * Remove trailing whitespace	6 years ago
M Somerville	df06f53f9b	Specify allowed media in upload button tooltip. (#8443 )	6 years ago
Eugen Rochko	3305484028	Revert "Default puma to running on localhost only." (#8444 ) * Revert "Default puma to running on localhost only. (#8429)" This reverts commit `2a59c6a5e7`.	6 years ago
Eugen Rochko	22e46ebad8	Add theme identifier to body classes for easier custom CSS styling (#8439 ) Add forgotten custom CSS admin setting strings	6 years ago
Eugen Rochko	cd049454be	Wait until relationship is loaded before showing follow button (#8440 ) Fix #8410	6 years ago
Alexander	cfe3cd58d6	fix pam authentication for certain hostnames (#8412 )	6 years ago
M Somerville	2a59c6a5e7	Default puma to running on localhost only. (#8429 )	6 years ago
Eugen Rochko	93537c5560	Disable retries on all scheduled tasks (#8413 )	6 years ago
Yamagishi Kazutoshi	800325f452	Weblate translations (2018-08-25) (#8420 ) * Translated using Weblate (Georgian) Currently translated at 99.8% (674 of 675 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ka/ * Translated using Weblate (Korean) Currently translated at 100.0% (310 of 310 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ko/ * Translated using Weblate (Korean) Currently translated at 96.8% (654 of 675 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ko/ * Translated using Weblate (Japanese) Currently translated at 100.0% (310 of 310 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (Danish) Currently translated at 100.0% (98 of 98 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/da/ * Translated using Weblate (Danish) Currently translated at 100.0% (310 of 310 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/da/ * Translated using Weblate (Danish) Currently translated at 87.2% (589 of 675 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/da/ * Translated using Weblate (Galician) Currently translated at 100.0% (680 of 680 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Czech) Currently translated at 100.0% (310 of 310 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/ * Translated using Weblate (Czech) Currently translated at 99.4% (676 of 680 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ * Translated using Weblate (Danish) Currently translated at 88.0% (599 of 680 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/da/ * Translated using Weblate (Arabic) Currently translated at 97.6% (664 of 680 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Japanese) Currently translated at 99.7% (678 of 680 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Occitan) Currently translated at 99.5% (677 of 680 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/ * Translated using Weblate (Arabic) Currently translated at 97.9% (668 of 682 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Persian) Currently translated at 99.7% (680 of 682 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fa/ * Translated using Weblate (Dutch) Currently translated at 99.8% (681 of 682 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Occitan) Currently translated at 99.8% (681 of 682 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/ * Translated using Weblate (Japanese) Currently translated at 0.0% (0 of 682 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Japanese) Currently translated at 0.1% (1 of 682 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Japanese) Currently translated at 0.1% (676 of 682 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Japanese) Currently translated at 99.8% (681 of 682 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Galician) Currently translated at 100.0% (682 of 682 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Greek) Currently translated at 99.8% (681 of 682 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (310 of 310 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 98.8% (674 of 682 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (Danish) Currently translated at 89.2% (609 of 682 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/da/ * Translated using Weblate (French) Currently translated at 100.0% (82 of 82 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fr/ * Translated using Weblate (French) Currently translated at 100.0% (310 of 310 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (French) Currently translated at 99.8% (681 of 682 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (Japanese) Currently translated at 99.8% (681 of 682 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Japanese) Currently translated at 99.8% (681 of 682 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Korean) Currently translated at 100.0% (310 of 310 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ko/ * Translated using Weblate (Occitan) Currently translated at 100.0% (310 of 310 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/oc/ * yarn manage:translations * i18n-tasks normalize && i18n-tasks remove-unused * revert * Add defaultMessage	6 years ago
M Somerville	95bd0d4528	Support ActivityStreams’ summaryMap. (#8422 ) In the same way as contentMap and nameMap.	6 years ago
M Somerville	2bba6e582d	Rename S3_CLOUDFRONT_HOST to S3_ALIAS_HOST. (#8423 ) Still check for S3_CLOUDFRONT_HOST for existing installs.	6 years ago
M Somerville	29da56cf75	Hide reject media checkbox when not relevant. (#8426 )	6 years ago
Eugen Rochko	793eea2982	Add improved CLI interface for removing remote media (#8411 ) ./bin/tootctl media remove --days 7 --background Make the old rake task point to it	6 years ago
MIYAGI Hikaru	b4fc810bc3	Revice Japanese translation of `deleted_status` (#8419 ) レポート関連の翻訳にある`deleted_status`は、ステータスが削除された残骸を示すものなので、動作ではなく名詞として翻訳する方がより適切です。	6 years ago
M Somerville	ac092d03e7	Add missing video descriptions (#8416 ) * Pass through video description as necessary. * Add title to video, matching aria-label.	6 years ago
Sylvhem	869a3af3c0	Reword the "Delete and rewrite" warning (#8415 ) * Change "Delete and rewrite" warning Reword the "Delete and rewrite" warning to make it clear that replies are not deleted. * Update the French translation Update the French translation to reflect the changes made to the "Delete and rewrite" warning.	6 years ago
Eugen Rochko	b37ae64578	Upgrade Doorkeeper to 5.0.0 (#8409 ) See doorkeeper-gem/doorkeeper#1137	6 years ago
MIYAGI Hikaru	a083604d1d	Support UNIX domain socket for streaming service without using PORT (#8217 ) * Support UNIX domain socket for streaming service without using PORT The use of UNIX domain socket for streaming service was not officially supported, but it was made unofficial to use by setting a path to PORT. From now on, SOCKET will be used just like setting for puma. * Hundle relative path	6 years ago
Thibaut Girka	246c313d45	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: app/controllers/application_controller.rb Changed instance theme selection by instance flavour selection.	6 years ago
Eugen Rochko	a2cabf3f4a	Add admin custom CSS setting (#8399 ) Fix #3894	6 years ago
Eugen Rochko	23752639b2	Bump version to 2.5.0rc1 (#8356 )	6 years ago
Eugen Rochko	2f34b747b3	Allow mods to disable login, improve message when login disabled (#8329 ) * Allow moderators to disable/enable login * Instead of rejecting login, show forbidden error when login disabled Avoid confusion because when login is rejected, the message is that the account is not activated, which is wrong. * Fix tests	6 years ago
Thibaut Girka	0ddf439999	Only apply CSP in production mode	6 years ago
Thibaut Girka	48db3b3c99	Tighten CSP while allowing CDN hosts	6 years ago
Thibaut Girka	478f70a0e6	Update poylfills (fixes #662 )	6 years ago

1 2 3 4 5 ...

7325 Commits (8852fff3a43ea4ac26aef5c7f0d72f3db3b421a0) All Branches Search

7325 Commits (8852fff3a43ea4ac26aef5c7f0d72f3db3b421a0)

All Branches