9f9aa39eb5
Escape metacharacters in non-whole-word keyword mutes. Fixes #533 .
...
Also addresses #463 .
7 years ago
16173535d9
Add redraft function ( #7735 )
...
* Add redraft function
Fix #7010
* Add explicit confirmation
* Add explicit confirmation message
7 years ago
3413105ec7
Merge pull request #530 from glitch-soc/restructure-kw-as-word-lists
...
keyword mute: Store keywords in a list, not a regex
7 years ago
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
7 years ago
a936ccd126
Detect extname from Content-Type ( #7733 )
7 years ago
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
7 years ago
1a145c6af1
Skip processing when HEAD method returns 501 ( #7730 )
7 years ago
963b82f5e5
Add vendor prefix for background-clip ( #7727 )
7 years ago
e2b4e6f05e
Change border color of activity-stream ( #7724 )
7 years ago
10a8ac8b80
Submit report using meta key ( #7729 )
7 years ago
f4a6f6fb89
Remove unnecessary underline on accounts table ( #7728 )
7 years ago
a38c4c45da
Add apply-to-mentions option to keyword mute UI. #454 .
7 years ago
526f2f8e09
Add a FeedManager example demonstrating non-mention keywords. #454 .
7 years ago
a000085b9c
Fix spacing in some FeedManager examples.
7 years ago
2bb5842541
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.
7 years ago
ca9ac011a5
Display numbers in account header using shortNumberFormat for consistency ( #7723 )
7 years ago
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.
7 years ago
93d90d3237
Fix activity-stream-tabs colors and set text variables for text colors ( #7722 )
7 years ago
797c72329f
Fix missing column in select in mastodon:feeds:build task ( #7720 )
7 years ago
2af43c3dce
Fix bug in order of conversations in web UI ( #7721 )
7 years ago
6dfc8999f7
Add tests for embeds controller ( #7719 )
...
* Small refactoring of status_finder_spec
* Add tests for embeds_controller
7 years ago
d993629ca7
"Show" instead of "return to" after (remote)-following ( #7718 )
...
Resolve #6326
7 years ago
9e830f7f37
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
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
7 years ago
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.
7 years ago
37fe72ecf2
Merge pull request #529 from glitch-soc/tweak-491
...
Note that favourite confirmation applies to Glitch flavour only (#491 )
7 years ago
471b62a6a4
prefs: Note that favourite confirmation applies to Glitch flavour only ( #491 )
7 years ago
5ec2d25ef6
Merge pull request #528 from glitch-soc/merge-upstream
...
Merge with tootsuite/master
7 years ago
330a234d1f
Whoops, forgot to clean up a conflict.
7 years ago
1a0491b3cf
Merge pull request #519 from ThibG/glitch-soc/fixes/status-node-null
...
Prevent a rare crash when a status' root node is undefined
7 years ago
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.
7 years ago
3dc8af0016
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
7 years ago
1f622bff18
Add tests for migrations_controller ( #7707 )
7 years ago
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
7 years ago
3833c8b690
Use different algorithm for trending tags ( #7697 )
7 years ago
57ad751230
Fix margin between compose warning, reply indicator and textarea ( #7701 )
7 years ago
aa54c65ee2
Improve trends layout ( #7700 )
...
* Allow collapsing trends, responsively hide trends
* Add trends column
7 years ago
f64f9860c7
Add loading indicator for trending tags ( #7693 )
7 years ago
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
7 years ago
a87927437d
Fix duplicate key attributes ( #7694 )
7 years ago
c10df6cf00
Merge pull request #501 from ThibG/glitch-soc/features/red-bookmarks
...
Make active bookmarks red (fixes #493 )
7 years ago
bbe1731bb0
Merge pull request #471 from impiaaa/thread-icon
...
Add an extra icon to indicate that a status is part of a conversation
7 years ago
559ce5c098
Adjust spacing between status icons
7 years ago
c86cd2041d
Merge branch 'glitch' into thread-icon
7 years ago
5d2d05961c
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
7 years ago
7c50de2219
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
7 years ago
946091af45
Exclude unlisted, private and direct toots from affecting trends ( #7686 )
7 years ago
aa1f74cba6
Make the refresh trends button refresh trends ( #7685 )
7 years ago
a6ddd1aba2
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
7 years ago
93e6984be8
Make active bookmarks red ( fixes #493 )
7 years ago
David Yip
Eugen Rochko
nightpool
Yamagishi Kazutoshi
Chikahiro Tokoro
Lynx Kotoura
Akihiko Odaki
Shuhei Kitagawa
Spencer Alves
Mélanie Chauvel (ariasuni)
Thibaut Girka