me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
6973 commits 2 branches 0 tags 429 MiB
Commit graph

6973 commits

This branch
This branch
All branches
Author SHA1 Message Date
Lynx Kotoura
2d2002436c Adjust emoji-mart-anchor-bar for environments that use display scaling (#7772) 2018-06-09 22:20:57 +02:00
Eugen Rochko
39930a8432 Fix has_one association on Web::PushSubscription (#7767) 
* Fix has_one association on Web::PushSubscription

* Fix code style issues
 2018-06-09 21:11:14 +02:00
Eugen Rochko
a26c884f25 Ensure emoji-mart dependency is updated (#7771) 
Regression from bf508b9 since version string was not updated
 2018-06-09 21:10:53 +02:00
David Yip
bcc27d9234 Merge pull request #538 from ThibG/glitch-soc/fixes/obsolote-constants 
Delete references to removed constants (fixes #537)
 2018-06-09 11:42:56 -05:00
Thibaut Girka
5af047df32 Delete references to removed constants (fixes #537) 2018-06-09 18:14:23 +02:00
David Yip
34ac79cb68 Merge pull request #506 from ThibG/glitch-soc/fixes/static-500 
Hardcode default skin/theme in error layout (fixes #373)
 2018-06-09 10:39:55 -05:00
SerCom_KC
77c94ffe82 Update Chinese (Simplified) translations (#7769) 
* i18n: (zh-CN) #7718

* i18n: (zh-CN) #7735

* i18n: (zh-CN) #7676
 2018-06-09 17:07:23 +02:00
Eugen Rochko
cbec0de81e Migrate old web push subscriptions to ensure deliveries (#7764) 2018-06-09 13:33:04 +02:00
Renato "Lond" Cerqueira
bf508b9f74 Fix issues with updated emoji mart (#7761) 
* Changes behavior from search light to keep custom search
The new version of emoji-mart needs the search function to constantly
receive the custom emoji array. This changes the behavior back to the
previous one in the search light method to keep the emoji autocomplete
as before

* Change test order
The order was breaking the tests

* Fix codeclimate issues

* Update to emoji mart to version without issue in picker

Fixes #7760
 2018-06-08 13:28:04 +02:00
David Yip
c114937660 Merge pull request #535 from glitch-soc/merge-upstream 
Merge upstream
 2018-06-08 00:33:09 -05:00
Yamagishi Kazutoshi
3e2eddaba7 Weblate translations (2018-06-08) (#7759) 
* Translated using Weblate (Galician)

Currently translated at 100.0% (621 of 621 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/

* 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 (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 (Dutch)

Currently translated at 100.0% (304 of 304 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/

* 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 (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 (Japanese)

Currently translated at 99.6% (619 of 621 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/

* Translated using Weblate (Japanese)

Currently translated at 100.0% (304 of 304 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/

* Translated using Weblate (Catalan)

Currently translated at 99.8% (620 of 621 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/

* Translated using Weblate (Catalan)

Currently translated at 100.0% (304 of 304 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/

* Translated using Weblate (Persian)

Currently translated at 100.0% (304 of 304 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/

* Translated using Weblate (Galician)

Currently translated at 100.0% (621 of 621 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/

* Translated using Weblate (Portuguese (Brazil))

Currently translated at 99.6% (303 of 304 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/

* Translated using Weblate (French)

Currently translated at 99.6% (303 of 304 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/

* Translated using Weblate (Basque)

Currently translated at 100.0% (304 of 304 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eu/

* Translated using Weblate (Basque)

Currently translated at 100.0% (304 of 304 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/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 (Persian)

Currently translated at 99.6% (619 of 621 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fa/

* Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (304 of 304 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/

* Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (304 of 304 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/

* Translated using Weblate (Portuguese (Brazil))

Currently translated at 99.8% (620 of 621 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/

* Translated using Weblate (Greek)

Currently translated at 66.3% (412 of 621 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/

* Translated using Weblate (Slovak)

Currently translated at 100.0% (304 of 304 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/

* 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% (304 of 304 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eu/

* yarn manage:translations && i18n-tasks normalize && i18n-tasks remove-unused
 2018-06-08 04:50:52 +02:00
Eugen Rochko
5aa5b86bf1 Do not accept ActivityPub follow requests from blocked user (#7756) 
* Do not accept ActivityPub follow requests from blocked user

Fix #7745

* Deliver auto-rejection immediately when follow-requested by blocked account

* Fix trailing whitespace
 2018-06-08 00:14:06 +02:00
Eugen Rochko
e1054a747e Add "Edit profile" link to public profile page, increase bottom padding (#7754) 2018-06-07 22:40:55 +02:00
Renato "Lond" Cerqueira
ae0b751a30 Update to emojimart 2.6.1 (#7746) 
* Update to emojimart 2.6.1
WIP using local updated version. Sheet comes from emoji-data@4.0.4,
file sheet_twitter_32_indexed_256.png.

* Update to 2.6.1 and uncompress data if needed

* Remove changes that were not needed

* Fix yarn lock file

* Match emojiToShowFilter behavior to new version of emoji-mart

* Fix codeclimate issue

* Match custom emoji behavior to new version of emoji-mart

* Replace emoji without shortcode in tests

* Fix code climate issues
 2018-06-07 19:40:23 +02:00
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.
 2018-06-07 05:13:49 -05:00
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)
 2018-06-06 23:56:48 -05:00
Marcin Mikołajczak
a5e289e273 🌍🇵🇱 (#7753) 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2018-06-07 13:37:43 +09:00
Eugen Rochko
e28866b313 Bump version to 2.4.1rc3 2018-06-06 21:27:06 +02:00
Eugen Rochko
ecec45ff9b Filter out blocked/muted people from profile timelines (#7747) 
Fix #7741
 2018-06-06 21:13:30 +02:00
Yamagishi Kazutoshi
29f4196d87 Fix fetch of remote image with multiple Content-Type headers (#7749) 2018-06-06 20:50:07 +02:00
Eugen Rochko
5d419119de Preserve newlines in delete & redraft and desktop notifications (#7750) 
Fix #7748
 2018-06-06 20:49:53 +02:00
Yamagishi Kazutoshi
7ed181c41c Add missing dot for remote image (#7751) 2018-06-06 20:49:39 +02:00
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)
 2018-06-05 21:38:04 -05:00
Shuhei Kitagawa
f0022a4ddc Add missing tests for sessions controller (#7744) 2018-06-06 10:23:22 +09:00
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
 2018-06-05 20:28:29 +02:00
Renato "Lond" Cerqueira
94077935ac Add missing locale strings (#7742) 
ran yarn build:development && i18n-tasks normalize && yarn
    manage:translations && i18n-tasks remove-unused
 2018-06-06 03:11:03 +09:00
Eugen Rochko
36528f28a5 Bump version to 2.4.1rc2 2018-06-05 11:53:30 +00:00
David Yip
9f9aa39eb5 Escape metacharacters in non-whole-word keyword mutes. Fixes #533. 
Also addresses #463.
 2018-06-05 02:49:28 -05:00
Eugen Rochko
16173535d9 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
3413105ec7 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
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
 2018-06-04 22:20:12 +02:00
Yamagishi Kazutoshi
a936ccd126 Detect extname from Content-Type (#7733) 2018-06-04 18:58:36 +02:00
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
 2018-06-04 14:49:10 +02:00
Yamagishi Kazutoshi
1a145c6af1 Skip processing when HEAD method returns 501 (#7730) 2018-06-04 13:42:53 +02:00
Yamagishi Kazutoshi
963b82f5e5 Add vendor prefix for background-clip (#7727) 2018-06-04 13:24:20 +02:00
Lynx Kotoura
e2b4e6f05e Change border color of activity-stream (#7724) 2018-06-04 13:13:31 +02:00
Yamagishi Kazutoshi
10a8ac8b80 Submit report using meta key (#7729) 2018-06-04 13:09:52 +02:00
Yamagishi Kazutoshi
f4a6f6fb89 Remove unnecessary underline on accounts table (#7728) 2018-06-04 13:09:36 +02:00
David Yip
a38c4c45da Add apply-to-mentions option to keyword mute UI. #454. 2018-06-04 02:51:28 -05:00
David Yip
526f2f8e09 Add a FeedManager example demonstrating non-mention keywords. #454. 2018-06-03 23:04:00 -05:00
David Yip
a000085b9c Fix spacing in some FeedManager examples. 2018-06-03 23:02:01 -05:00
David Yip
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.
 2018-06-03 23:00:50 -05:00
Eugen Rochko
ca9ac011a5 Display numbers in account header using shortNumberFormat for consistency (#7723) 2018-06-04 05:15:50 +02:00
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.
 2018-06-04 04:46:14 +02:00
Lynx Kotoura
93d90d3237 Fix activity-stream-tabs colors and set text variables for text colors (#7722) 2018-06-04 04:39:42 +02:00
Eugen Rochko
797c72329f Fix missing column in select in mastodon:feeds:build task (#7720) 2018-06-04 04:21:15 +02:00
Eugen Rochko
2af43c3dce Fix bug in order of conversations in web UI (#7721) 2018-06-04 04:19:16 +02:00
Shuhei Kitagawa
6dfc8999f7 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
d993629ca7 "Show" instead of "return to" after (remote)-following (#7718) 
Resolve #6326
 2018-06-04 03:00:36 +02:00
David Yip
9e830f7f37 Merge remote-tracking branch 'origin/master' into gs-master 2018-06-03 19:44:05 -05:00