David Yip
42f2045c21
Merge remote-tracking branch 'STJrInuyasha/feature/direct-timeline' into gs-direct-timeline
2017-10-25 16:01:20 -05:00
Jenkins
cfc46d7334
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-10-25 16:17:14 +00:00
Jenkins
5f0268ab84
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-10-25 16:17:14 +00:00
Ratmir Karabut
51d4add08d
Update Russian translation ( #5517 )
...
* Add Russian translation (ru)
* Fix a missing comma
* Fix the wording for better consistency
* Update Russian translation
* Arrange Russian setting alphabetically
* Fix syntax error
* Update Russian translation
* Fix formatting error
* Update Russian translation
* Update Russian translation
* Update ru.jsx
* Fix syntax error
* Remove two_factor_auth.warning (appears obsolete)
* Add missing strings in ru.yml
A lot of new strings translated, especially for the newly added admin section
* Fix translation consistency
* Update Russian translation
* Update Russian translation (pluralizations)
* Update Russian translation
* Update Russian translation
* Update Russian translation (pin)
* Update Russian translation (account deletion)
* Fix extra line
* Update Russian translation (sessions)
* Update Russian translation
* Update Russian translation
* Fix merge conflicts (revert)
* Update Russian translation
* Update Russian translation (fix)
* Update Russian translation (fix quotes)
* Update Russian translation (fix quotes)
* Update Russian translation (fix)
* Update Russian translation
* Add quotes
* bundle exec i18n-tasks normalize
2017-10-26 00:21:58 +09:00
Ratmir Karabut
20fee786b1
Update Russian translation ( #5517 )
...
* Add Russian translation (ru)
* Fix a missing comma
* Fix the wording for better consistency
* Update Russian translation
* Arrange Russian setting alphabetically
* Fix syntax error
* Update Russian translation
* Fix formatting error
* Update Russian translation
* Update Russian translation
* Update ru.jsx
* Fix syntax error
* Remove two_factor_auth.warning (appears obsolete)
* Add missing strings in ru.yml
A lot of new strings translated, especially for the newly added admin section
* Fix translation consistency
* Update Russian translation
* Update Russian translation (pluralizations)
* Update Russian translation
* Update Russian translation
* Update Russian translation (pin)
* Update Russian translation (account deletion)
* Fix extra line
* Update Russian translation (sessions)
* Update Russian translation
* Update Russian translation
* Fix merge conflicts (revert)
* Update Russian translation
* Update Russian translation (fix)
* Update Russian translation (fix quotes)
* Update Russian translation (fix quotes)
* Update Russian translation (fix)
* Update Russian translation
* Add quotes
* bundle exec i18n-tasks normalize
2017-10-26 00:21:58 +09:00
Anna e só
93255b003f
l10n: PT-BR translation updated ( #5530 )
2017-10-25 23:11:03 +09:00
Anna e só
74777599cf
l10n: PT-BR translation updated ( #5530 )
2017-10-25 23:11:03 +09:00
Olivier Nicole
fe8646f078
Complete Esperanto translation ( #5520 )
2017-10-25 22:38:37 +09:00
Olivier Nicole
1ba3725473
Complete Esperanto translation ( #5520 )
2017-10-25 22:38:37 +09:00
David Yip
b8c462c42b
Remove nil check in Glitch::KeywordMute#=~.
...
@regex can no longer be nil, so we don't need to check it.
2017-10-24 19:03:59 -05:00
David Yip
e40fe4092d
Remove nil check in Glitch::KeywordMute#=~.
...
@regex can no longer be nil, so we don't need to check it.
2017-10-24 19:03:59 -05:00
David Yip
53c2ea1a86
Assume Glitch::KeywordMute#destroy! works and error out if it doesn't.
...
There's nothing useful we can display if the destroy action messes up,
so might as well assert it does and complain loudly if it doesn't.
2017-10-24 18:56:57 -05:00
David Yip
d9485e6497
Assume Glitch::KeywordMute#destroy! works and error out if it doesn't.
...
There's nothing useful we can display if the destroy action messes up,
so might as well assert it does and complain loudly if it doesn't.
2017-10-24 18:56:57 -05:00
David Yip
2da4eca986
Use edit template for displaying errors in update.
2017-10-24 18:56:44 -05:00
David Yip
d5c8ebe205
Use edit template for displaying errors in update.
2017-10-24 18:56:44 -05:00
David Yip
22f9b4f2c0
Also filter notifications containing muted keywords.
2017-10-24 18:51:27 -05:00
David Yip
d03b48cea0
Also filter notifications containing muted keywords.
2017-10-24 18:51:27 -05:00
David Yip
7caca589c1
Override Action View name inference in settings/keyword_mutes.
...
Glitch::KeywordMute's name is inferred as glitch_keyword_mutes, and in
templates this turns into e.g. settings/glitch/keyword_mutes. Going
along with this convention means a lot of file movement, though, and for
a UI that's as temporary and awkward as this one I think it's less
effort to slap a bunch of as: options everywhere.
We'll do the Right Thing when we build out the API and frontend UI.
2017-10-24 18:40:28 -05:00
David Yip
9226257a1b
Override Action View name inference in settings/keyword_mutes.
...
Glitch::KeywordMute's name is inferred as glitch_keyword_mutes, and in
templates this turns into e.g. settings/glitch/keyword_mutes. Going
along with this convention means a lot of file movement, though, and for
a UI that's as temporary and awkward as this one I think it's less
effort to slap a bunch of as: options everywhere.
We'll do the Right Thing when we build out the API and frontend UI.
2017-10-24 18:40:28 -05:00
David Yip
1d726a72c6
Fix example description.
...
This example actually checks matches at the end of a string.
2017-10-24 18:33:02 -05:00
David Yip
641f90e73a
Fix example description.
...
This example actually checks matches at the end of a string.
2017-10-24 18:33:02 -05:00
David Yip
05fecda52d
Switch to Regexp.union for building the mute expression.
...
Also make the keyword-building methods private: they always probably
should have been private, but now I have encoded enough fun and games
into them that it now seems wrong for them to *not* be private.
2017-10-24 18:31:34 -05:00
David Yip
f5a3283976
Switch to Regexp.union for building the mute expression.
...
Also make the keyword-building methods private: they always probably
should have been private, but now I have encoded enough fun and games
into them that it now seems wrong for them to *not* be private.
2017-10-24 18:31:34 -05:00
Ondřej Hruška
77cad0daf0
option to add title to <Button>, use for toot buttons ( #197 )
2017-10-24 19:08:07 +02:00
Ondřej Hruška
516eeeb43d
option to add title to <Button>, use for toot buttons ( #197 )
2017-10-24 19:08:07 +02:00
David Yip
86b0a24362
Merge pull request #196 from glitch-soc/fix-imports
...
Added app/javascript for imports
2017-10-23 23:34:43 -05:00
David Yip
664c9aa708
Merge pull request #196 from glitch-soc/fix-imports
...
Added app/javascript for imports
2017-10-23 23:34:43 -05:00
kibigo!
e8dc70ac81
Added app/javascript for imports
2017-10-23 20:22:48 -07:00
kibigo!
119d477c8b
Added app/javascript for imports
2017-10-23 20:22:48 -07:00
David Yip
763fd4b275
Only cache the regex text, not the regex itself.
...
It is possible to cache a Regexp object, but I'm not sure what happens
if e.g. that object remains in cache across two different Ruby versions.
Caching a string seems to raise fewer questions.
2017-10-23 19:31:59 -05:00
David Yip
8410d33b49
Only cache the regex text, not the regex itself.
...
It is possible to cache a Regexp object, but I'm not sure what happens
if e.g. that object remains in cache across two different Ruby versions.
Caching a string seems to raise fewer questions.
2017-10-23 19:31:59 -05:00
David Yip
2b753ac54f
Merge remote-tracking branch 'origin/master' into gs-master
2017-10-22 22:57:41 -05:00
David Yip
4f01e6e8d5
Merge remote-tracking branch 'origin/master' into gs-master
2017-10-22 22:57:41 -05:00
Matthew Walsh
897931099c
Changes to match other timelines in 2.0
2017-10-22 18:45:35 -07:00
Matthew Walsh
a76b024228
Changes to match other timelines in 2.0
2017-10-22 18:45:35 -07:00
Matthew Walsh
737ab88c86
Added a timeline for Direct statuses
...
* Lists all Direct statuses you've sent and received
* Displayed in Getting Started
* Streaming server support for direct TL
2017-10-22 18:35:14 -07:00
Matthew Walsh
3db80f75a6
Added a timeline for Direct statuses
...
* Lists all Direct statuses you've sent and received
* Displayed in Getting Started
* Streaming server support for direct TL
2017-10-22 18:35:14 -07:00
David Yip
e8314ee2a6
KeywordMute matcher: more closely mimic Regexp#=~ behavior.
...
Regexp#=~ returns nil if it does not match. An empty mute set does not
match any status, so KeywordMute::Matcher#=~ ought to return nil also.
2017-10-22 01:12:21 -05:00
David Yip
af8f06413e
KeywordMute matcher: more closely mimic Regexp#=~ behavior.
...
Regexp#=~ returns nil if it does not match. An empty mute set does not
match any status, so KeywordMute::Matcher#=~ ought to return nil also.
2017-10-22 01:12:21 -05:00
David Yip
4ab1534f6c
Address unused translation errors.
2017-10-22 01:05:56 -05:00
David Yip
1a60445a5f
Address unused translation errors.
2017-10-22 01:05:56 -05:00
David Yip
156ebf53f6
Use current_account from ApplicationController.
...
This avoids copy-pasting definitions of set_account.
2017-10-22 01:02:52 -05:00
David Yip
4c84513e04
Use current_account from ApplicationController.
...
This avoids copy-pasting definitions of set_account.
2017-10-22 01:02:52 -05:00
David Yip
3b2bf30644
Don't add \b to whole-word keywords that don't start with word characters.
...
Ditto for ending with \b.
Consider muting the phrase "(hot take)". I stipulate it is reasonable
to enter this with the default "match whole word" behavior. Under the
old behavior, this would be encoded as
\b\(hot\ take\)\b
However, if \b is before the first character in the string and the first
character in the string is not a word character, then the match will
fail. Ditto for after. In our example, "(" is not a word character, so
this will not match statuses containing "(hot take)", and that's a very
surprising behavior.
To address this, we only add leading and trailing \b to keywords that
start or end with word characters.
2017-10-22 00:38:54 -05:00
David Yip
4b68e82a19
Don't add \b to whole-word keywords that don't start with word characters.
...
Ditto for ending with \b.
Consider muting the phrase "(hot take)". I stipulate it is reasonable
to enter this with the default "match whole word" behavior. Under the
old behavior, this would be encoded as
\b\(hot\ take\)\b
However, if \b is before the first character in the string and the first
character in the string is not a word character, then the match will
fail. Ditto for after. In our example, "(" is not a word character, so
this will not match statuses containing "(hot take)", and that's a very
surprising behavior.
To address this, we only add leading and trailing \b to keywords that
start or end with word characters.
2017-10-22 00:38:54 -05:00
David Yip
8d69329b8e
keyword mutes: also check spoiler (CW) text and reblogged statuses.
2017-10-22 00:38:53 -05:00
David Yip
19826774f0
keyword mutes: also check spoiler (CW) text and reblogged statuses.
2017-10-22 00:38:53 -05:00
Marcin Mikołajczak
67992e1b7e
i18n: Update Polish Translation ( #5494 )
2017-10-22 08:34:39 +09:00
Marcin Mikołajczak
fdb0848e08
i18n: Update Polish Translation ( #5494 )
2017-10-22 08:34:39 +09:00
David Yip
b2ad79547c
Apply keyword mutes to reblogs.
2017-10-21 15:44:47 -05:00