monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,897 Commits 1 Branch 0 Tags 261 MiB
Commit Graph

6897 Commits

Author SHA1 Message Date
Eugen Rochko fab65fb7e5
Bump version to 2.4.1rc2 2018-06-05 11:53:30 +00:00
David Yip a640c322c1
Escape metacharacters in non-whole-word keyword mutes. Fixes #533. 
Also addresses #463.
 2018-06-05 02:49:28 -05:00
Eugen Rochko bd0791d800
Add redraft function (#7735) 
* Add redraft function

Fix #7010

* Add explicit confirmation

* Add explicit confirmation message
 2018-06-05 00:17:38 +02:00
David Yip f009fef40b
Merge pull request #530 from glitch-soc/restructure-kw-as-word-lists 
keyword mute: Store keywords in a list, not a regex
 2018-06-04 15:58:23 -05:00
nightpool 5fb013878f 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
 2018-06-04 22:20:12 +02:00
Yamagishi Kazutoshi dc73241bd9 Detect extname from Content-Type (#7733) 2018-06-04 18:58:36 +02:00
Chikahiro Tokoro 1637d24af4 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
 2018-06-04 14:49:10 +02:00
Yamagishi Kazutoshi e3fb528d12 Skip processing when HEAD method returns 501 (#7730) 2018-06-04 13:42:53 +02:00
Yamagishi Kazutoshi e0354aba7c Add vendor prefix for background-clip (#7727) 2018-06-04 13:24:20 +02:00
Lynx Kotoura bb0edbd988 Change border color of activity-stream (#7724) 2018-06-04 13:13:31 +02:00
Yamagishi Kazutoshi 64d7a63f18 Submit report using meta key (#7729) 2018-06-04 13:09:52 +02:00
Yamagishi Kazutoshi c0fc4e9935 Remove unnecessary underline on accounts table (#7728) 2018-06-04 13:09:36 +02:00
David Yip 97d2df77aa
Add apply-to-mentions option to keyword mute UI. #454. 2018-06-04 02:51:28 -05:00
David Yip cf28049f0a
Add a FeedManager example demonstrating non-mention keywords. #454. 2018-06-03 23:04:00 -05:00
David Yip a40e322f4b
Fix spacing in some FeedManager examples. 2018-06-03 23:02:01 -05:00
David Yip 26573ad7e6
Thread scopes through #matches?. #454. 
Also add an apply_to_mentions attribute on Glitch::KeywordMute, which is
used to calculate scope.  Next up: additions to the test suite to
demonstrate how scoping works.
 2018-06-03 23:00:50 -05:00
Eugen Rochko 1bbe81030c
Display numbers in account header using shortNumberFormat for consistency (#7723) 2018-06-04 05:15:50 +02:00
Akihiko Odaki 5bf5003384 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.
 2018-06-04 04:46:14 +02:00
Lynx Kotoura 73923ea6c4 Fix activity-stream-tabs colors and set text variables for text colors (#7722) 2018-06-04 04:39:42 +02:00
Eugen Rochko c7405fda11
Fix missing column in select in mastodon:feeds:build task (#7720) 2018-06-04 04:21:15 +02:00
Eugen Rochko e18390cfe6
Fix bug in order of conversations in web UI (#7721) 2018-06-04 04:19:16 +02:00
Shuhei Kitagawa 22caa32ba2 Add tests for embeds controller (#7719) 
* Small refactoring of status_finder_spec

* Add tests for embeds_controller
 2018-06-04 10:35:56 +09:00
Eugen Rochko 6b2f4f8c09
"Show" instead of "return to" after (remote)-following (#7718) 
Resolve #6326
 2018-06-04 03:00:36 +02:00
David Yip c55263027a
Merge remote-tracking branch 'origin/master' into gs-master 2018-06-03 19:44:05 -05:00
Eugen Rochko 0deb9fa6b9
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
 2018-06-04 02:18:18 +02:00
David Yip 37d495eeeb
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.
 2018-06-03 18:12:55 -05:00
David Yip 0f979c3460
Merge pull request #529 from glitch-soc/tweak-491 
Note that favourite confirmation applies to Glitch flavour only (#491)
 2018-06-03 04:22:20 -05:00
David Yip d757c8a644
prefs: Note that favourite confirmation applies to Glitch flavour only (#491) 2018-06-03 03:40:27 -05:00
David Yip 5dd2a78034
Merge pull request #528 from glitch-soc/merge-upstream 
Merge with tootsuite/master
 2018-06-03 03:01:09 -05:00
David Yip 8343f56b2c
Whoops, forgot to clean up a conflict. 2018-06-03 02:35:54 -05:00
David Yip cfdbb36bdf
Merge pull request #519 from ThibG/glitch-soc/fixes/status-node-null 
Prevent a rare crash when a status' root node is undefined
 2018-06-02 16:19:06 -05:00
David Yip 3550470c18
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.
 2018-06-02 16:15:36 -05:00
David Yip a641d1b5b8
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master 2018-06-02 16:08:31 -05:00
Shuhei Kitagawa 00512ecf87 Add tests for migrations_controller (#7707) 2018-06-02 18:52:16 +09:00
Yamagishi Kazutoshi 89c86ee521 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
 2018-06-02 03:03:08 +02:00
Eugen Rochko 6e6c0e9613
Use different algorithm for trending tags (#7697) 2018-06-01 19:19:44 +02:00
Eugen Rochko 8d6e4e0485
Fix margin between compose warning, reply indicator and textarea (#7701) 2018-06-01 19:19:30 +02:00
Eugen Rochko 73c0c36e7b
Improve trends layout (#7700) 
* Allow collapsing trends, responsively hide trends

* Add trends column
 2018-06-01 19:18:37 +02:00
Yamagishi Kazutoshi 69b45350fe Add loading indicator for trending tags (#7693) 2018-06-01 14:22:42 +02:00
Yamagishi Kazutoshi bfa12239e8 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
 2018-06-01 14:03:19 +02:00
Yamagishi Kazutoshi 15ce60f610 Fix duplicate key attributes (#7694) 2018-06-01 14:02:49 +02:00
David Yip 9ad5de8a3a
Merge pull request #501 from ThibG/glitch-soc/features/red-bookmarks 
Make active bookmarks red (fixes #493)
 2018-06-01 00:36:48 -05:00
David Yip 0aba716fe1
Merge pull request #471 from impiaaa/thread-icon 
Add an extra icon to indicate that a status is part of a conversation
 2018-06-01 00:35:13 -05:00
Spencer Alves e5f25a73f2 Adjust spacing between status icons 2018-05-31 21:55:44 -07:00
Spencer Alves 7d2e6429c2 Merge branch 'glitch' into thread-icon 2018-05-31 21:33:16 -07:00
Eugen Rochko fb1ae0152d
Wrong exception class: ActiveRecord::RecordNotUnique, not PG::UniqueViolation (#7688) 
* Wrong exception class: ActiveRecord::RecordNotUnique, not PG::UniqueViolation

It's completely not obvious but PG::UniqueViolation is just a string inside the exception message, not the actual class of the exception

* Favourite does not have target_account_id
 2018-05-31 17:22:33 +02:00
Eugen Rochko 19b4c666f7
Improve account index migration (#7684) 
* Improve account index migration

- Display more progress in stdout
- Catch PG::UniqueViolation when re-attributing favourites
- Skip callbacks and validations when re-attributing other relationships

* Use in_batches to reduce table lock-up during account merge

* Use #say_with_time to benchmark each deduplication
 2018-05-31 17:09:09 +02:00
Eugen Rochko 1e938b966e
Exclude unlisted, private and direct toots from affecting trends (#7686) 2018-05-31 16:47:28 +02:00
Eugen Rochko 0ce5339a7b
Make the refresh trends button refresh trends (#7685) 2018-05-31 16:46:02 +02:00
Mélanie Chauvel (ariasuni) 691107263c Put the CW field between the toot we are replying to and the toot field (#7508) 
* Remove Collapsable and use CSS instead

* Put the CW field between the toot we are replying to and the toot field

* Use same spacing between all fields in the composing column
 2018-05-31 15:16:31 +02:00