glitchier-soc

Commit Graph

Author	SHA1	Message	Date
Eugen Rochko	b5726def55	Forward deletes on the same path as reply forwarding (#7058 ) * Forward deletes on the same path as reply forwarding * Remove trailing whitespace	7 years ago
Harmon	98146281e1	Remove duplicate frequently used emojis (#7064 )	7 years ago
Isatis	b08ab329f4	retrieve custom emoji list via API instead of before page load (#7047 )	7 years ago
Eugen Rochko	f1867a7388	Adjust privacy policy (#6666 ) * Adjust privacy policy to be more specific to Mastodon Fix #6613 * Change data retention of IP addresses from 5 years to 1 year * Add even more information * Remove all (now invalid) translations of the privacy policy * Add information about archive takeout, remove pointless consent section * Emphasis on DM privacy * Improve wording * Add line about data use for moderation purposes	7 years ago
David Yip	3ab6a8b8be	Merge remote-tracking branch 'origin/master' into gs-master Conflicts: spec/views/about/show.html.haml_spec.rb	7 years ago
David Yip	bda1782cd8	Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master	7 years ago
Marcin Mikołajczak	1c1042556d	i18n: Update Polish translation (#7037 ) * i18n: Update Polish translation Signed-off-by: Marcin Mikołajczak <me@m4sk.in> * i18n: Update Polish translation Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	7 years ago
beatrix	77b650b69c	Merge pull request #412 from ThibG/glitch-soc/cleanup Remove duplicate message entries (minor code cleanup)	7 years ago
beatrix	4ab58c3292	Merge pull request #413 from ThibG/glitch-soc/fixes/fix-account-card-style Update accounts SCSS for public pages	7 years ago
Thibaut Girka	d0e792e231	Update accounts SCSS for public pages	7 years ago
Thibaut Girka	75f2e9fd97	Remove duplicate message entries	7 years ago
Emelia Smith	7a81082704	Revert "Add double-tap zoom functionary to `ZoomableImage` (#6944 )" (#7035 ) Unfortunately the new hammer.js functionality wasn't correctly tested and didn't work across devices and browsers, as such, it's best to revert PR #6944 until we can revisit this functionality and make it work across all devices and browsers that are supported by Mastodon. This reverts commit `5021c4e9ca`.	7 years ago
Eugen Rochko	07176fed37	Add contact account to landing page ("Administered by") (#6984 )	7 years ago
Jenkins	6611100480	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
ThibG	d8d4217959	Fix french wording of reblogged toots in public views, matching the wording of reblogged_by (#7029 )	7 years ago
Nolan Lawson	6ff3b3e4db	Fix nil account issue in ProcessAccountService (#7019 )	7 years ago
Emelia Smith	2e59751823	Improve require_admin! and require_staff! filters (#7018 ) Previously these returns 302 redirects instead of 403s, which meant posting links to admin pages in slack caused them to unfurl, rather than stay as a link. Additionally, require_admin! doesn't appear to be actively used, on require_staff!	7 years ago
mayaeh	1c293086a1	i18n: Add Japanese translations for #7000 (#7022 ) * run yarn manage:translations. * run i18n-tasks add-missing ja. * Update Japanese translations.	7 years ago
Emelia Smith	e85cffb236	Feature: Report improvements (#6967 ) (#7000 ) * Implement Assignment of Reports (#6967) * Change translation of admin.report.comment.label to "Report Comment" for clarity As we'll soon add the ability for reports to have comments on them, this clarification makes sense. * Implement notes for Reports This enables moderators to leave comments about a report whilst they work on it * Fix display of report moderation notes * Allow reports to be reopened / marked as unresolved * Redirect to reports listing upon resolution of report * Implement "resolve with note" functionality * Add inverse relationship for report notes * Remove additional database querying when loading report notes * Fix tests for reports * Fix localisations for report notes / reports	7 years ago
David Yip	1f5bdd8445	Merge pull request #410 from ThibG/glitch-soc/fixes/compose-disable [Glitch] Fix: Prevent submission using same logic as submit button disabling	7 years ago
Thibaut Girka	ca9f022a80	[Glitch] Fix: Prevent submission using same logic as submit button disabling. Port `6a895e1ab3` to glitch-soc	7 years ago
Eugen Rochko	36eac8ba90	Do not default SMTP verify mode to "peer", default to "none" (#6996 )	7 years ago
unarist	2c51bc0ca5	Add missing rejection handling for Promises (#7008 ) * Add eslint-plugin-promise to detect uncaught rejections * Move alert generation for errors to actions/alert * Add missing rejection handling for Promises * Use catch() instead of onReject on then() Then it will catches rejection from onFulfilled. This detection can be disabled by `allowThen` option, though.	7 years ago
Emelia Smith	e7a1716701	Implement the ability for an Administrator or Moderator to remove an account avatar (#6998 )	7 years ago
Emelia Smith	4fd71accd4	Fix issues with sending direct messages from user profile (#6999 ) * Clear compose textarea when starting a new direct message Previous behaviour resulted in potentially misdirected direct messages. * Hide search when starting to compose a direct message	7 years ago
Yamagishi Kazutoshi	3f51c6efaa	Weblate translations (2018-04-02) (#7007 ) * Translated using Weblate (Galician) Currently translated at 100.0% (587 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (587 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Catalan) Currently translated at 100.0% (587 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Arabic) Currently translated at 76.4% (449 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Japanese) Currently translated at 99.8% (586 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Slovak) Currently translated at 92.3% (542 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Slovak) Currently translated at 92.3% (542 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (58 of 58 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ * Translated using Weblate (Polish) Currently translated at 98.9% (581 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pl/ * Translated using Weblate (French) Currently translated at 99.6% (585 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.8% (586 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (Catalan) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/ * Translated using Weblate (Persian) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/fa/ * Translated using Weblate (Persian) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/ * Translated using Weblate (French) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (Japanese) Currently translated at 99.8% (586 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Japanese) Currently translated at 99.8% (586 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Slovak) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Chinese (Traditional)) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/zh_Hant/ * Translated using Weblate (Chinese (Traditional)) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/zh_Hant/ * Translated using Weblate (Chinese (Traditional)) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/zh_Hant/ * Translated using Weblate (Chinese (Traditional)) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/zh_Hant/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (587 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eo/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ * Translated using Weblate (Chinese (Traditional)) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/zh_Hant/ * Translated using Weblate (Arabic) Currently translated at 76.6% (450 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (587 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eo/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ * Translated using Weblate (Slovak) Currently translated at 92.6% (544 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/sk/ * Translated using Weblate (Arabic) Currently translated at 82.9% (487 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Arabic) Currently translated at 98.6% (74 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/ar/ * Translated using Weblate (Slovak) Currently translated at 93.6% (550 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Slovak) Currently translated at 95.4% (560 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Japanese) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (Indonesian) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/id/ * Translated using Weblate (Korean) Currently translated at 100.0% (58 of 58 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ko/ * Translated using Weblate (Korean) Currently translated at 99.8% (586 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ko/ * Translated using Weblate (Korean) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ko/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ * Translated using Weblate (Arabic) Currently translated at 82.9% (487 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Arabic) Currently translated at 99.2% (278 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ * Translated using Weblate (Arabic) Currently translated at 87.3% (513 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Arabic) Currently translated at 99.6% (279 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ * bundle exec i18n-tasks normalize && yarn manage:translations * revert	7 years ago
Evgeny Petrov	b04f73ce66	Russian language updated (#7005 ) * Russian language updated * Small fixes for RU language * bundle exec i18n-tasks normalize	7 years ago
luzi82	24611d8deb	i18n: update zh-HK translation (#7004 ) * i18n: update zh-HK translation * i18n: update zh-HK translation * i18n-tasks normalize	7 years ago
David Yip	eb39db7f93	Merge remote-tracking branch 'origin/master' into gs-master Conflicts: app/javascript/mastodon/locales/en.json app/javascript/mastodon/locales/ja.json app/javascript/mastodon/locales/pl.json app/views/accounts/_header.html.haml	7 years ago
Eugen Rochko	f890d2a766	Support all ActivityPub actor types (#6997 ) Fix #6973	7 years ago
Eugen Rochko	33513753b9	Fix unpermitted parameters warning when generating pagination URLs (#6995 )	7 years ago
David Underwood	123a343d11	[WIP] Enable custom emoji on account pages and in the sidebar (#6124 ) Federate custom emojis with accounts	7 years ago
Yamagishi Kazutoshi	f464f98fd3	Update Ruby to version 2.4.4 (#6964 ) https://www.ruby-lang.org/en/news/2018/03/28/ruby-2-4-4-released/ > This release includes some bug fixes and some security fixes. > > - CVE-2017-17742: HTTP response splitting in WEBrick > - CVE-2018-6914: Unintentional file and directory creation with directory traversal in tempfile and tmpdir > - CVE-2018-8777: DoS by large request in WEBrick > - CVE-2018-8778: Buffer under-read in String#unpack > - CVE-2018-8779: Unintentional socket creation by poisoned NUL byte in UNIXServer and UNIXSocket > - CVE-2018-8780: Unintentional directory traversal by poisoned NUL byte in Dir > - Multiple vulnerabilities in RubyGems	7 years ago
Emelia Smith	6a895e1ab3	Fix: Prevent submission using same logic as submit button disabling. (#6993 ) This prevents submission through ctrl/cmd+enter when the submit button is disabled.	7 years ago
luzi82	993ce0e5a7	improve zh-HK localization by referring zh-TW and zh-CN (#6988 )	7 years ago
Marcin Mikołajczak	929f58f180	i18n: Update Polish translation (#6985 ) Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	7 years ago
mayaeh	b7d633c1bb	i18n: Add Japanese translations for domain blocks (#6979 ) * run yarn manage:translations * Update Japanese translations for domain blocks.	7 years ago
Daniel Hunsaker	3886bfb5eb	[Nanobox] Enable ElasticSearch support by default (#6977 ) Admins can still disable the feature by adding `ES_ENABLED=false` to their environment, if they prefer not to use it. Be sure to set the variable before you deploy!	7 years ago
unarist	fb3dc00dda	Ignore AbortError when cancelled sharing (#6978 ) `navigator.share()` rejects Promise if user cancelled sharing, and it may print it as an error on JavaScript console. This patch ignores it and prints other errors on the console.	7 years ago
Jenkins	f0bb3ff533	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
beatrix	01bad04efd	Merge pull request #408 from ThibG/glitch-soc/fixes/admin-js Add “public” pack to admin controller, as it is included in upstream …	7 years ago
beatrix	3304cb681d	Merge pull request #380 from ThibG/glitch-soc/features/domain-block-ui Port #6628 to glitch-soc flavour	7 years ago
David Yip	257146c960	Merge pull request #406 from ThibG/glitch-soc/fixes/menu-fixes Backport dropdown menu fixes from Mastodon	7 years ago
David Yip	9248d1e3a7	Merge pull request #407 from ThibG/glitch-soc/fixes/migration-page Fix migration page style	7 years ago
Thibaut Girka	b305e7452a	Add “public” pack to admin controller, as it is included in upstream admin layout Fixes CW unfolding in moderation	7 years ago
ThibG	e573bb0990	Fix compatibility with PeerTube (#6968 ) * Support fetching objects of convertible types by URL (fixes #6924) * Ignore invalid hashtags	7 years ago
Thibaut Girka	167a2ecde0	Fix migration page style	7 years ago
Thibaut Girka	48bcf4d6e8	[Glitch] Remove pointer events on the entire UI when a dropdown menu is open Port `913a38111f` to glitch-soc	7 years ago
ThibG	a6c129ddbd	Add some UI for user-defined domain blocks (#6628 ) * Keep list of blocked domains Might be overkill, but I'm trying to follow the same logic as for blocked users * Add basic domain block UI * Add the domain blocks UI to Getting Started * Fix undefined URL in `fetchDomainBlocks` * Update all known users' domain_blocking relationship instead of just one's	7 years ago
Thibaut Girka	2871a82fcc	[Glitch] Place dropdown menu top if it is closer to the bottom of the viewport Port `f6a8d835d3` to glitch-soc	7 years ago

1 2 3 4 5 ...

6196 Commits (c5dd4ed1d51a1189fa73d78cfec0f97a19a84a90) All Branches Search

6196 Commits (c5dd4ed1d51a1189fa73d78cfec0f97a19a84a90)

All Branches