glitchier-soc

Commit Graph

Author	SHA1	Message	Date
David Yip	c2f7676dfc	Merge remote-tracking branch 'tootsuite/master' into merge-upstream Conflicts: app/models/status.rb The conflict in the Status model was due to `3114ac9655`. It was resolved by accepting tootsuite's changes.	6 years ago
David Yip	4b7ceed3f0	Merge pull request #509 from ThibG/glitch-soc/fixes/router-history-navigation Use history.state to decide whether we should goBack() or go to / (fixes #247)	6 years ago
Marcin Mikołajczak	a5e289e273	🌍🇵🇱 (#7753 ) Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	6 years ago
Eugen Rochko	e28866b313	Bump version to 2.4.1rc3	6 years ago
Eugen Rochko	ecec45ff9b	Filter out blocked/muted people from profile timelines (#7747 ) Fix #7741	6 years ago
Yamagishi Kazutoshi	29f4196d87	Fix fetch of remote image with multiple Content-Type headers (#7749 )	6 years ago
Eugen Rochko	5d419119de	Preserve newlines in delete & redraft and desktop notifications (#7750 ) Fix #7748	6 years ago
Yamagishi Kazutoshi	7ed181c41c	Add missing dot for remote image (#7751 )	6 years ago
David Yip	63a5f8a4e4	Merge pull request #534 from glitch-soc/restructure-kw-as-word-lists Escape metacharacters in non-whole-word keyword mutes (#463, #533)	6 years ago
Shuhei Kitagawa	f0022a4ddc	Add missing tests for sessions controller (#7744 )	6 years ago
Renato "Lond" Cerqueira	19b653991d	Weblate translations 20180605 (#7743 ) * Translated using Weblate (Basque) Currently translated at 100.0% (66 of 66 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/eu/ * Translated using Weblate (Basque) Currently translated at 100.0% (76 of 76 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/eu/ * Translated using Weblate (Basque) Currently translated at 100.0% (66 of 66 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/eu/ * Translated using Weblate (Basque) Currently translated at 100.0% (303 of 303 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eu/ * Translated using Weblate (Basque) Currently translated at 100.0% (621 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eu/ * Translated using Weblate (Slovak) Currently translated at 95.4% (593 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Basque) Currently translated at 100.0% (303 of 303 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eu/ * Normalize translations ran yarn build:development && i18n-tasks normalize && yarn manage:translations && i18n-tasks remove-unused	6 years ago
Renato "Lond" Cerqueira	94077935ac	Add missing locale strings (#7742 ) ran yarn build:development && i18n-tasks normalize && yarn manage:translations && i18n-tasks remove-unused	6 years ago
Eugen Rochko	36528f28a5	Bump version to 2.4.1rc2	6 years ago
David Yip	9f9aa39eb5	Escape metacharacters in non-whole-word keyword mutes. Fixes #533 . Also addresses #463.	6 years ago
Eugen Rochko	16173535d9	Add redraft function (#7735 ) * Add redraft function Fix #7010 * Add explicit confirmation * Add explicit confirmation message	6 years ago
David Yip	3413105ec7	Merge pull request #530 from glitch-soc/restructure-kw-as-word-lists keyword mute: Store keywords in a list, not a regex	6 years ago
nightpool	0378f74430	Fix context performance by partially reverting #7083 (#7734 ) * Fix context performance by partially reverting #7083 * Fix code style issue * fix off-by-1 error in thread limits * code style fix	6 years ago
Yamagishi Kazutoshi	a936ccd126	Detect extname from Content-Type (#7733 )	6 years ago
Chikahiro Tokoro	a78445e117	fix RuboCop error (#7442 ) * fix RuboCop error RuboCop doesn't work by following error. ``` $ rubocop Error: The `Style/TrailingCommaInLiteral` cop no longer exists. Please use `Style/TrailingCommaInArrayLiteral` and/or `Style/TrailingCommaInHashLiteral` instead. (obsolete configuration found in .rubocop.yml, please update it) ``` it comes from RuboCop 0.53.0 [\[Fix #3394\] Separate Array & Hash Literal Comma configuration by garettarrowood · Pull Request #5307 · bbatsov/rubocop](https://github.com/bbatsov/rubocop/pull/5307) * ci(CodeClimate): specify RuboCop version 0.54 * https://docs.codeclimate.com/docs/rubocop#section-using-rubocop-s-newer-versions * [RuboCop 0.55.0 is not available yet](https://github.com/codeclimate/codeclimate-rubocop/issues/121) on CodeClimate rubocop channel	6 years ago
Yamagishi Kazutoshi	1a145c6af1	Skip processing when HEAD method returns 501 (#7730 )	6 years ago
Yamagishi Kazutoshi	963b82f5e5	Add vendor prefix for background-clip (#7727 )	6 years ago
Lynx Kotoura	e2b4e6f05e	Change border color of activity-stream (#7724 )	6 years ago
Yamagishi Kazutoshi	10a8ac8b80	Submit report using meta key (#7729 )	6 years ago
Yamagishi Kazutoshi	f4a6f6fb89	Remove unnecessary underline on accounts table (#7728 )	6 years ago
Eugen Rochko	ca9ac011a5	Display numbers in account header using shortNumberFormat for consistency (#7723 )	6 years ago
Akihiko Odaki	3114ac9655	Do not mark remote status sensitive even if spoiler text is present (#7395 ) Old statuses and statuses from Pawoo, which runs a modified version of Mastodon, may not have been marked sensitive even if spoiler text is present. Such statuses are still not marked sensitve if they are local or arrived before version upgrade. Marking recently fetched remote status sensitive contradicts the behavior. Considering what people expected when they authored such statuses, this change removes the sensitivity enforcement.	6 years ago
Lynx Kotoura	93d90d3237	Fix activity-stream-tabs colors and set text variables for text colors (#7722 )	6 years ago
Eugen Rochko	797c72329f	Fix missing column in select in mastodon:feeds:build task (#7720 )	6 years ago
Eugen Rochko	2af43c3dce	Fix bug in order of conversations in web UI (#7721 )	6 years ago
Shuhei Kitagawa	6dfc8999f7	Add tests for embeds controller (#7719 ) * Small refactoring of status_finder_spec * Add tests for embeds_controller	6 years ago
Eugen Rochko	d993629ca7	"Show" instead of "return to" after (remote)-following (#7718 ) Resolve #6326	6 years ago
David Yip	9e830f7f37	Merge remote-tracking branch 'origin/master' into gs-master	6 years ago
Eugen Rochko	650e3e346b	Remove trending hashtags (#7711 ) * Delete trends_controller.rb * Update routes.rb * Update trending_tags.rb * Update index.js * Update index.js * Update search_results.js * Update async-components.js * Update index.js * Delete trends.js * Delete trends.js * Delete trends_container.js * Delete trends.js * Update search_results.js * Update search_results_container.js	6 years ago
David Yip	d55d5ccc9d	keyword mute: Store keywords as a list This has a couple of advantages over the regex approach: - Keywords are individually addressable, which makes it easier to gather statistics (#363) - Keywords can be individually applied to different feeds, e.g. skipping mentions (#454) It does end up creating many more Regexp objects. I'm not yet sure if the difference is significant.	6 years ago
David Yip	37fe72ecf2	Merge pull request #529 from glitch-soc/tweak-491 Note that favourite confirmation applies to Glitch flavour only (#491)	6 years ago
David Yip	471b62a6a4	prefs: Note that favourite confirmation applies to Glitch flavour only (#491 )	6 years ago
David Yip	5ec2d25ef6	Merge pull request #528 from glitch-soc/merge-upstream Merge with tootsuite/master	6 years ago
David Yip	330a234d1f	Whoops, forgot to clean up a conflict.	6 years ago
David Yip	1a0491b3cf	Merge pull request #519 from ThibG/glitch-soc/fixes/status-node-null Prevent a rare crash when a status' root node is undefined	6 years ago
David Yip	827d1ea864	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 The above conflicts appear to be a text conflict introduced by glitch-soc's additional level of columns (i.e. moving a bunch of columns under the Misc option). They were resolved via accept-ours.	6 years ago
David Yip	3dc8af0016	Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master	6 years ago
Shuhei Kitagawa	1f622bff18	Add tests for migrations_controller (#7707 )	6 years ago
Yamagishi Kazutoshi	ca2a6b2071	Weblate translations (2018-06-02) (#7705 ) * Translated using Weblate (Korean) Currently translated at 100.0% (303 of 303 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ko/ * Translated using Weblate (Chinese (Hong Kong)) Currently translated at 99.6% (302 of 303 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/zh_Hant_HK/ * Translated using Weblate (Chinese (Hong Kong)) Currently translated at 99.1% (616 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/zh_Hant_HK/ * Translated using Weblate (Chinese (Hong Kong)) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/zh_Hant_HK/ * Translated using Weblate (Slovenian) Currently translated at 14.4% (90 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sl/ * Translated using Weblate (Slovak) Currently translated at 100.0% (303 of 303 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Japanese) Currently translated at 100.0% (303 of 303 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (303 of 303 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ * Translated using Weblate (Dutch) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (621 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Persian) Currently translated at 100.0% (303 of 303 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/ * Translated using Weblate (Occitan) Currently translated at 100.0% (303 of 303 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/oc/ * Translated using Weblate (Occitan) Currently translated at 100.0% (303 of 303 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/oc/ to check if with O or U * Translated using Weblate (Occitan) Currently translated at 98.0% (609 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/ * Translated using Weblate (Dutch) Currently translated at 100.0% (303 of 303 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Basque) Currently translated at 100.0% (621 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eu/ * Translated using Weblate (Basque) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/eu/ * Translated using Weblate (Korean) Currently translated at 100.0% (66 of 66 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ko/ * Translated using Weblate (Korean) Currently translated at 99.6% (619 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ko/ * Translated using Weblate (Basque) Currently translated at 100.0% (66 of 66 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/eu/ * Translated using Weblate (Basque) Currently translated at 100.0% (303 of 303 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eu/ * Translated using Weblate (Basque) Currently translated at 100.0% (621 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eu/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.6% (302 of 303 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.6% (619 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (Basque) Currently translated at 100.0% (76 of 76 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/eu/ * i18n-tasks normalize && yarn manage:translations	6 years ago
Eugen Rochko	3833c8b690	Use different algorithm for trending tags (#7697 )	6 years ago
Eugen Rochko	57ad751230	Fix margin between compose warning, reply indicator and textarea (#7701 )	6 years ago
Eugen Rochko	aa54c65ee2	Improve trends layout (#7700 ) * Allow collapsing trends, responsively hide trends * Add trends column	6 years ago
Yamagishi Kazutoshi	f64f9860c7	Add loading indicator for trending tags (#7693 )	6 years ago
Yamagishi Kazutoshi	fe98e276e1	Update ESLint for Code Climate (#7696 ) * Update babel-eslint to version 8.2.3 * Update eslint to version 4.19.1 * Update eslint-plugin-promise to version 3.8.0 * Update eslint-plugin-react to version 7.8.2 * Upgrade eslint-plugin-jsx-a11y to version 6.0.3 * yarn test:lint --fix	6 years ago
Yamagishi Kazutoshi	a87927437d	Fix duplicate key attributes (#7694 )	6 years ago
David Yip	c10df6cf00	Merge pull request #501 from ThibG/glitch-soc/features/red-bookmarks Make active bookmarks red (fixes #493)	6 years ago

1 2 3 4 5 ...

6804 Commits (c2f7676dfc1df1cd4ae110183f20d024a72f40e2) All Branches Search

6804 Commits (c2f7676dfc1df1cd4ae110183f20d024a72f40e2)

All Branches