]> cat aescling's git repositories - mastodon.git/log
mastodon.git
7 years ago[Glitch] Remove links to bridge.joinmastodon.org (non-functional)
Thibaut Girka [Sun, 23 Dec 2018 10:43:47 +0000 (11:43 +0100)]
[Glitch] Remove links to bridge.joinmastodon.org (non-functional)

Port bb62827c16dbf35c70da2dc801f602df3c76fcca to glitch-soc

7 years agoRemove file added by error
Thibaut Girka [Sun, 23 Dec 2018 10:43:25 +0000 (11:43 +0100)]
Remove file added by error

7 years ago[Glitch] Fix unnecessary loadMore calls when the end of a timeline has been reached
Thibaut Girka [Sun, 23 Dec 2018 10:40:52 +0000 (11:40 +0100)]
[Glitch] Fix unnecessary loadMore calls when the end of a timeline has been reached

Port 8389b496ba9f8b5fa04a34ccc14c8e4195e03ea3 to glitch flavour

7 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Sun, 23 Dec 2018 10:28:28 +0000 (11:28 +0100)]
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- config/routes.rb
  Upstream changed some admin routes, conflict was because of an added :show
  action for statuses on our side. Kept it.

7 years agoSanitize and sandbox toot embeds (#9552)
ThibG [Sun, 23 Dec 2018 01:16:35 +0000 (02:16 +0100)]
Sanitize and sandbox toot embeds (#9552)

7 years agoRemove links to bridge.joinmastodon.org (non-functional) (#9608)
Eugen Rochko [Sat, 22 Dec 2018 22:32:00 +0000 (23:32 +0100)]
Remove links to bridge.joinmastodon.org (non-functional) (#9608)

Add link to profile directory

7 years agoShow 40 profiles per directory page instead of 30 (#9609)
Eugen Rochko [Sat, 22 Dec 2018 22:31:23 +0000 (23:31 +0100)]
Show 40 profiles per directory page instead of 30 (#9609)

To better align with the list of hashtags

7 years agoAdd moderation warnings (#9519)
Eugen Rochko [Sat, 22 Dec 2018 19:02:09 +0000 (20:02 +0100)]
Add moderation warnings (#9519)

* Add moderation warnings

Replace individual routes for disabling, silencing, and suspending
a user, as well as the report update route, with a unified account
action controller that allows you to select an action (none,
disable, silence, suspend) as well as whether it should generate an
e-mail notification with optional custom text. That notification,
with the optional custom text, is saved as a warning.

Additionally, there are warning presets you can configure to save
time when performing the above.

* Use Account#local_username_and_domain

7 years ago[i18n] Occitan update (#9607)
Quentí [Sat, 22 Dec 2018 17:27:03 +0000 (18:27 +0100)]
[i18n] Occitan update (#9607)

* Update for new On Board messages

* Update oc.json

7 years agoRemove MailerHelper does nothing (#9604)
ysksn [Sat, 22 Dec 2018 01:35:55 +0000 (10:35 +0900)]
Remove MailerHelper does nothing (#9604)

7 years agoFix composer not getting focus after reply confirmation dialog
Thibaut Girka [Fri, 21 Dec 2018 17:40:50 +0000 (18:40 +0100)]
Fix composer not getting focus after reply confirmation dialog

The modal-handling code gives back focus to the element focused when the
modal opened. However, in the case of reply confirmation, it would do so
*after* the composer code itself requested focus.

7 years agoFix incorrect and duplicate onConfirm callback
Thibaut Girka [Fri, 21 Dec 2018 16:54:47 +0000 (17:54 +0100)]
Fix incorrect and duplicate onConfirm callback

7 years ago[Glitch] Fix that translation is not applied to "joining hashtags"
Thibaut Girka [Tue, 18 Dec 2018 17:06:55 +0000 (18:06 +0100)]
[Glitch] Fix that translation is not applied to "joining hashtags"

Port bfec030a4e3be37e4986d7ec5cb1bda968ba549a to glitch-soc

7 years ago[Glitch] Deep compare tags for hashtag column reload
Thibaut Girka [Tue, 18 Dec 2018 17:05:29 +0000 (18:05 +0100)]
[Glitch] Deep compare tags for hashtag column reload

Port 4fdefffb9906ffc3e5fde7af652674bebffd6e15 to glitch-soc

7 years ago[Glitch] Allow joining several hashtags in a single column
Thibaut Girka [Tue, 18 Dec 2018 16:56:08 +0000 (17:56 +0100)]
[Glitch] Allow joining several hashtags in a single column

Port 4c03e05a4e1a237f8a414a0861c03abe3269dbc8 to glitch-soc

This introduces new requirements in the API:

  `/api/v1/timelines/tag/:tag` now accepts new params: `any`, `all` and `none`
  It now returns status matching tag :tag or any of the :any, provided that
  they also include all tags in `all` and none of `none`.

7 years agoi18n: Update Polish translation (#9594)
Marcin Mikołajczak [Fri, 21 Dec 2018 17:56:24 +0000 (18:56 +0100)]
i18n: Update Polish translation (#9594)

Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
7 years agoAdd specs for CustomEmojiFilter (#9599)
ysksn [Fri, 21 Dec 2018 17:52:57 +0000 (02:52 +0900)]
Add specs for CustomEmojiFilter (#9599)

7 years agoFix composer not getting focus after reply confirmation dialog (#9602)
ThibG [Fri, 21 Dec 2018 17:52:41 +0000 (18:52 +0100)]
Fix composer not getting focus after reply confirmation dialog (#9602)

The modal-handling code gives back focus to the element focused when the
modal opened. However, in the case of reply confirmation, it would do so
*after* the composer code itself requested focus.

7 years agoAdd specs for AdminMailer (#9597)
ysksn [Fri, 21 Dec 2018 08:34:34 +0000 (17:34 +0900)]
Add specs for AdminMailer (#9597)

7 years agoAdd specs for InstancePresenter (#9596)
ysksn [Fri, 21 Dec 2018 07:59:56 +0000 (16:59 +0900)]
Add specs for InstancePresenter (#9596)

7 years agoSkip mailer job retries when a record no longer exists (#9590)
Eugen Rochko [Fri, 21 Dec 2018 05:16:17 +0000 (06:16 +0100)]
Skip mailer job retries when a record no longer exists (#9590)

Fix #8666

7 years ago[Glitch] Display customized mascot in web UI
Thibaut Girka [Wed, 19 Dec 2018 19:23:16 +0000 (20:23 +0100)]
[Glitch] Display customized mascot in web UI

Port relevant parts of 9d4541c612b506889675c4c19ced5cd17ad3710f to glitch-soc

7 years agoMake drawer markup and styling closer to upstream
Thibaut Girka [Wed, 19 Dec 2018 18:09:04 +0000 (19:09 +0100)]
Make drawer markup and styling closer to upstream

WARNING: This may break some custom skins!

  `.drawer > .contents` has been moved to
  `.drawer > .drawer__pager > .drawer__iner`, and the waves have been moved
  from `.drawer > .contents` to `.drawer__inner__mastodon`!

7 years agoAdd specs for ReportNotePolicy (#9592)
ysksn [Thu, 20 Dec 2018 16:52:18 +0000 (01:52 +0900)]
Add specs for ReportNotePolicy (#9592)

7 years agoAdd specs for policies (#9591)
ysksn [Thu, 20 Dec 2018 16:52:07 +0000 (01:52 +0900)]
Add specs for policies (#9591)

* Add spec for RelayPolicy

* Add specs for SubscriptionPolicy

* Add specs for SettingsPolicy

* Add specs for TagPolicy

* Add specs for ReportPolicy

7 years agoAdd specs for UserPolicy (#9593)
ysksn [Thu, 20 Dec 2018 16:51:55 +0000 (01:51 +0900)]
Add specs for UserPolicy (#9593)

7 years ago[Glitch] Back to the getting-started when pins the timeline
Thibaut Girka [Wed, 19 Dec 2018 12:13:24 +0000 (13:13 +0100)]
[Glitch] Back to the getting-started when pins the timeline

Port 5bf100f87be571e86305f3ab244183fc46f1ede2 to glitch-soc

7 years agoMove hide_followers_count logic to an helper
Thibaut Girka [Tue, 18 Dec 2018 13:26:21 +0000 (14:26 +0100)]
Move hide_followers_count logic to an helper

7 years agoAdd a per-user setting to hide followers count
Thibaut Girka [Tue, 18 Dec 2018 10:24:44 +0000 (11:24 +0100)]
Add a per-user setting to hide followers count

This is only available if the instance-wide setting isn't set and allows
people to hide their own followers count. This does not hide others' to
them.

7 years agoPer-user followers count display in profile directory
Thibaut Girka [Tue, 18 Dec 2018 11:02:54 +0000 (12:02 +0100)]
Per-user followers count display in profile directory

7 years agoHide negative follower counts from glitch flavour
Thibaut Girka [Mon, 17 Dec 2018 20:23:44 +0000 (21:23 +0100)]
Hide negative follower counts from glitch flavour

7 years agoAdd admin setting to disable followers count
Thibaut Girka [Mon, 17 Dec 2018 19:36:30 +0000 (20:36 +0100)]
Add admin setting to disable followers count

7 years agoRefactor followers_accounts_controller
Thibaut Girka [Mon, 17 Dec 2018 19:25:47 +0000 (20:25 +0100)]
Refactor followers_accounts_controller

7 years agoAdd specs for InvitePolicy (#9589)
ysksn [Thu, 20 Dec 2018 03:23:09 +0000 (12:23 +0900)]
Add specs for InvitePolicy (#9589)

7 years agoAdd specs for EmailDomainBlockPolicy (#9586)
ysksn [Thu, 20 Dec 2018 02:51:41 +0000 (11:51 +0900)]
Add specs for EmailDomainBlockPolicy (#9586)

7 years agoAdd specs for InstancePolicy (#9587)
ysksn [Thu, 20 Dec 2018 02:51:31 +0000 (11:51 +0900)]
Add specs for InstancePolicy (#9587)

7 years agoAdd specs for DomainBlockPolicy (#9585)
ysksn [Thu, 20 Dec 2018 02:47:51 +0000 (11:47 +0900)]
Add specs for DomainBlockPolicy (#9585)

7 years agoAdd specs for CustomEmojiPolicy (#9584)
ysksn [Thu, 20 Dec 2018 02:24:28 +0000 (11:24 +0900)]
Add specs for CustomEmojiPolicy (#9584)

7 years agoAllow unauthenticated REST API access to GET /api/v1/accounts/:id/statuses (#9573)
Eugen Rochko [Thu, 20 Dec 2018 00:30:43 +0000 (01:30 +0100)]
Allow unauthenticated REST API access to GET /api/v1/accounts/:id/statuses (#9573)

Fix #7087

The same data is available over the ActivityPub outbox, RSS, and Atom, so
there is little benefit to keeping it limited in this method.

7 years agoFix unnecessary loadMore calls when the end of a timeline has been reached (#9581)
ThibG [Wed, 19 Dec 2018 21:23:16 +0000 (22:23 +0100)]
Fix unnecessary loadMore calls when the end of a timeline has been reached (#9581)

Fixes #9568

7 years agoOverride current_user when generating static pages
Thibaut Girka [Tue, 18 Dec 2018 22:31:34 +0000 (23:31 +0100)]
Override current_user when generating static pages

7 years agoRestore oops.gif animation for user who have auto_play_gif set
Thibaut Girka [Tue, 18 Dec 2018 22:15:30 +0000 (23:15 +0100)]
Restore oops.gif animation for user who have auto_play_gif set

7 years agoReplace animated oops.gif by a non-animated image
Thibaut Girka [Mon, 17 Dec 2018 13:47:00 +0000 (14:47 +0100)]
Replace animated oops.gif by a non-animated image

Fixes #6060

7 years agoAdd specs for BackupPolicy (#9576)
ysksn [Wed, 19 Dec 2018 17:24:15 +0000 (02:24 +0900)]
Add specs for BackupPolicy (#9576)

7 years agoMerge pull request #865 from ThibG/glitch-soc/merge-upstream
ThibG [Wed, 19 Dec 2018 15:19:00 +0000 (16:19 +0100)]
Merge pull request #865 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

7 years agoWeblate translations (2018-12-19) (#9578)
Renato "Lond" Cerqueira [Wed, 19 Dec 2018 12:07:05 +0000 (13:07 +0100)]
Weblate translations (2018-12-19) (#9578)

* Translated using Weblate (Greek)

Currently translated at 99.7% (715 of 717 strings)

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

* Translated using Weblate (Czech)

Currently translated at 99.9% (716 of 717 strings)

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

* Translated using Weblate (Japanese)

Currently translated at 97.5% (699 of 717 strings)

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

* Translated using Weblate (Slovak)

Currently translated at 99.7% (715 of 717 strings)

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

* Translated using Weblate (Dutch)

Currently translated at 99.7% (715 of 717 strings)

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

* Translated using Weblate (Galician)

Currently translated at 99.9% (716 of 717 strings)

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

* Translated using Weblate (Korean)

Currently translated at 100.0% (717 of 717 strings)

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

* Translated using Weblate (Korean)

Currently translated at 100.0% (350 of 350 strings)

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

* Translated using Weblate (Korean)

Currently translated at 100.0% (93 of 93 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ko/

* Translated using Weblate (Portuguese (Brazil))

Currently translated at 98.9% (709 of 717 strings)

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

* Translated using Weblate (Portuguese (Brazil))

Currently translated at 97.8% (91 of 93 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt_BR/

* Translated using Weblate (Corsican)

Currently translated at 99.9% (716 of 717 strings)

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

* Translated using Weblate (French)

Currently translated at 99.9% (716 of 717 strings)

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

* Translated using Weblate (French)

Currently translated at 99.9% (716 of 717 strings)

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

* Translated using Weblate (Arabic)

Currently translated at 96.8% (90 of 93 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/

* Translated using Weblate (Arabic)

Currently translated at 96.8% (694 of 717 strings)

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

* Translated using Weblate (Dutch)

Currently translated at 100,0% (717 of 717 strings)

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

* Translated using Weblate (Czech)

Currently translated at 99.9% (716 of 717 strings)

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

* Translated using Weblate (Slovak)

Currently translated at 99.7% (715 of 717 strings)

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

* Translated using Weblate (Czech)

Currently translated at 100.0% (350 of 350 strings)

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

* Translated using Weblate (Czech)

Currently translated at 99.9% (716 of 717 strings)

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

* Translated using Weblate (Italian)

Currently translated at 100,0% (93 of 93 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/it/

* Translated using Weblate (Czech)

Currently translated at 99,9% (716 of 717 strings)

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

* Translated using Weblate (Catalan)

Currently translated at 100,0% (93 of 93 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ca/

* Translated using Weblate (Catalan)

Currently translated at 100,0% (717 of 717 strings)

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

* Translated using Weblate (Czech)

Currently translated at 99.9% (716 of 717 strings)

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

* Translated using Weblate (Occitan)

Currently translated at 100,0% (350 of 350 strings)

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

* Translated using Weblate (Occitan)

Currently translated at 99,7% (715 of 717 strings)

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

* Translated using Weblate (Occitan)

Currently translated at 100,0% (93 of 93 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/oc/

* Translated using Weblate (Czech)

Currently translated at 99.9% (716 of 717 strings)

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

* Translated using Weblate (Greek)

Currently translated at 99.7% (715 of 717 strings)

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

* Translated using Weblate (Greek)

Currently translated at 100.0% (350 of 350 strings)

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

* Translated using Weblate (French)

Currently translated at 100.0% (93 of 93 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fr/

* Translated using Weblate (German)

Currently translated at 100,0% (93 of 93 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/de/

* Translated using Weblate (German)

Currently translated at 99,9% (716 of 717 strings)

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

* Translated using Weblate (Japanese)

Currently translated at 97,5% (699 of 717 strings)

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

* Translated using Weblate (Korean)

Currently translated at 100,0% (350 of 350 strings)

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

* Translated using Weblate (Czech)

Currently translated at 100.0% (350 of 350 strings)

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

* Normalize translations

* Normalize translations, remove unused, add missing plurals

7 years ago[Glitch] Improved appearance of notification filter on safari
Thibaut Girka [Wed, 19 Dec 2018 12:00:08 +0000 (13:00 +0100)]
[Glitch] Improved appearance of notification filter on safari

Port 2e1b5edfea1b03f64c69266f979caee228fa90b7 to glitch-soc

7 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Wed, 19 Dec 2018 11:58:49 +0000 (12:58 +0100)]
Merge branch 'master' into glitch-soc/merge-upstream

7 years agoAdd specs for AccountPolicy (#9575)
ysksn [Wed, 19 Dec 2018 07:56:59 +0000 (16:56 +0900)]
Add specs for AccountPolicy (#9575)

7 years agoUpdate Japanese translations. (#9574)
mayaeh [Wed, 19 Dec 2018 07:51:02 +0000 (16:51 +0900)]
Update Japanese translations. (#9574)

7 years agoAdd specs for AccountModerationNotePolicy (#9571)
ysksn [Wed, 19 Dec 2018 06:24:03 +0000 (15:24 +0900)]
Add specs for AccountModerationNotePolicy (#9571)

7 years agoAdd specs for StatusPolicy (#9569)
ysksn [Wed, 19 Dec 2018 04:19:20 +0000 (13:19 +0900)]
Add specs for StatusPolicy (#9569)

7 years agoimproved appearance of notification filter on safari (#9564)
Hinaloe [Tue, 18 Dec 2018 21:28:09 +0000 (06:28 +0900)]
improved appearance of notification filter on safari (#9564)

7 years agoClean up dead code in public timeline code (#9565)
ThibG [Tue, 18 Dec 2018 21:00:18 +0000 (22:00 +0100)]
Clean up dead code in public timeline code (#9565)

7 years agoReword confirm_before_clearing_draft description
Thibaut Girka [Tue, 27 Nov 2018 17:54:47 +0000 (18:54 +0100)]
Reword confirm_before_clearing_draft description

7 years agoAllow disabling the reply confirmation dialog
Thibaut Girka [Tue, 27 Nov 2018 17:25:51 +0000 (18:25 +0100)]
Allow disabling the reply confirmation dialog

7 years agoAllow disabling media confirmation from the confirmation dialog itself
Thibaut Girka [Tue, 27 Nov 2018 16:31:50 +0000 (17:31 +0100)]
Allow disabling media confirmation from the confirmation dialog itself

7 years agoRemove dead code
Thibaut Girka [Tue, 18 Dec 2018 18:06:58 +0000 (19:06 +0100)]
Remove dead code

7 years ago[Glitch] Put "Media Only" option in column settings instead of content area headline
Thibaut Girka [Tue, 18 Dec 2018 17:52:37 +0000 (18:52 +0100)]
[Glitch] Put "Media Only" option in column settings instead of content area headline

Port 4f42238c294f92dbd87db3d83f9514344fcd1f8a to glitch-soc

7 years ago[Glitch] Always display tab navigation on local/federated timeline even when empty
Thibaut Girka [Tue, 29 May 2018 14:40:04 +0000 (16:40 +0200)]
[Glitch] Always display tab navigation on local/federated timeline even when empty

Port 90b64c006998ec3bae365007781c61e8a79eeeef to glitch-soc

7 years agoDo not replace history state
Thibaut Girka [Sun, 27 May 2018 19:33:04 +0000 (21:33 +0200)]
Do not replace history state

This is both for consistency with account timelines and to not mess with
the logic used to decide whether going back in the browser's history is
going to make us leave the WebUI.

7 years ago[Glitch] Enable media timeline
Thibaut Girka [Sun, 27 May 2018 19:31:08 +0000 (21:31 +0200)]
[Glitch] Enable media timeline

Port 8182b615183b83fb6651fb23912abda3cc4ccf03 to glitch-soc

7 years ago[Glitch] Hide section headline for timelines in production
Thibaut Girka [Sun, 27 May 2018 19:28:24 +0000 (21:28 +0200)]
[Glitch] Hide section headline for timelines in production

Port 4eeda6772796bcd08b8c63ec2e1f3e68a95cbca4 to glitch-soc

7 years ago[Glitch] Change column params on pinned timeline
Thibaut Girka [Sun, 27 May 2018 19:26:33 +0000 (21:26 +0200)]
[Glitch] Change column params on pinned timeline

Port 06252ec71ed67cb84e6730fe7148552dc6481c7a to glitch-soc

7 years ago[Glitch] Save onlyMedia prop when pinning column
Thibaut Girka [Sun, 27 May 2018 19:23:56 +0000 (21:23 +0200)]
[Glitch] Save onlyMedia prop when pinning column

Port 5ea643b27908b14bd89ff068fc87e446e8cbcd32 to glitch-soc

7 years ago[Glitch] Add exact attribute to WrappedRoute for community timeline
Thibaut Girka [Sun, 27 May 2018 19:22:17 +0000 (21:22 +0200)]
[Glitch] Add exact attribute to WrappedRoute for community timeline

Port 46061dc041b0a2a4a3907976cc3432abdb1d67ec to glitch-soc

7 years ago[Glitch] Add media timeline
Thibaut Girka [Sun, 27 May 2018 18:55:11 +0000 (20:55 +0200)]
[Glitch] Add media timeline

Port 7403e5d306d36c83bfb80cd900235373186cd51a to glitch-soc

7 years agoMerge pull request #862 from ThibG/glitch-soc/merge-upstream
ThibG [Tue, 18 Dec 2018 18:37:07 +0000 (19:37 +0100)]
Merge pull request #862 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

7 years ago[Glitch] Make notifications quick-filter use consistent style with profile tabs
Thibaut Girka [Tue, 18 Dec 2018 16:23:04 +0000 (17:23 +0100)]
[Glitch] Make notifications quick-filter use consistent style with profile tabs

Port 12ab15e584e78d209b59a893405a0cde83f49035 to glitch-soc

7 years ago[Glitch] Add notification quick-filter bar in the frontend app
Thibaut Girka [Tue, 18 Dec 2018 16:22:01 +0000 (17:22 +0100)]
[Glitch] Add notification quick-filter bar in the frontend app

Port 13dce126655f856f23d02373fa2e333e74bdc36e to glitch-soc

7 years ago[Glitch] Responsive design for profile directory
Thibaut Girka [Tue, 18 Dec 2018 16:03:53 +0000 (17:03 +0100)]
[Glitch] Responsive design for profile directory

Port SCSS changes from 087e11897137dc1f2811c21c3ccc6cec3ccdedb3 to glitch flavour

7 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Tue, 18 Dec 2018 15:55:15 +0000 (16:55 +0100)]
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- app/controllers/admin/base_controller.rb
  Some refactoring made upstream, no real conflict.
- app/javascript/mastodon/features/compose/components/compose_form.js
  Updated using upstream's code but using maxChars instead of the
  hardcoded length of 500 characters per toot.
- app/javascript/styles/mastodon/components.scss
  Upstream redesigned the onboarding modal. Not sure why we had a
  conflict there.

7 years agoBack to the getting-started when pins the timeline. (#9561)
kedama [Tue, 18 Dec 2018 15:43:50 +0000 (00:43 +0900)]
Back to the getting-started when pins the timeline. (#9561)

7 years agoAdd spec for AccountableConcern#log_action (#9559)
ysksn [Tue, 18 Dec 2018 15:43:03 +0000 (00:43 +0900)]
Add spec for AccountableConcern#log_action (#9559)

7 years agoBump nokogiri from 1.8.5 to 1.9.1 (#9557)
dependabot[bot] [Tue, 18 Dec 2018 15:41:41 +0000 (16:41 +0100)]
Bump nokogiri from 1.8.5 to 1.9.1 (#9557)

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.8.5 to 1.9.1.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.8.5...v1.9.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
7 years agofix CSP / X-Frame-Options for media embeds (#9558)
jomo [Tue, 18 Dec 2018 15:40:30 +0000 (16:40 +0100)]
fix CSP / X-Frame-Options for media embeds (#9558)

7 years agoFix tootctl accounts rotate not updating public keys (#9556)
Eugen Rochko [Tue, 18 Dec 2018 00:22:29 +0000 (01:22 +0100)]
Fix tootctl accounts rotate not updating public keys (#9556)

This allowed you to brick your system when running that command, because the accounts would continue to advertise the old public key, but sign things with the new one

7 years agoSandbox toot embeds in the embed modal
Thibaut Girka [Mon, 17 Dec 2018 20:42:18 +0000 (21:42 +0100)]
Sandbox toot embeds in the embed modal

It should not be necessary thanks to our Content Security Policy, but best
be sure in case a server's CSP is incorrect. Also, avoids a CSP warning about
loading remote scripts.

7 years ago[Glitch] Minor scrollable list fixes
Thibaut Girka [Mon, 17 Dec 2018 20:32:27 +0000 (21:32 +0100)]
[Glitch] Minor scrollable list fixes

* Make sure loading indicator has enough vertical space
* Respect reduce_motion setting for loading indicator

Port 4ede51743e5b9121a49e9131f91cf012fab410f8 to glitch-soc

7 years agoMake notifications quick-filter use consistent style with profile tabs (#9554)
Eugen Rochko [Mon, 17 Dec 2018 20:08:40 +0000 (21:08 +0100)]
Make notifications quick-filter use consistent style with profile tabs (#9554)

7 years ago Ignore low-confidence CharlockHolmes guesses when parsing link cards (#9510)
ThibG [Mon, 17 Dec 2018 18:19:45 +0000 (19:19 +0100)]
 Ignore low-confidence CharlockHolmes guesses when parsing link cards (#9510)

* Add failing test for windows-1251 link cards

* Ignore low-confidence CharlockHolmes guesses

Fixes #9466

* Fix no method error when charlock holmes cannot detect charset

7 years agoMinor scrollable list fixes (#9551)
ThibG [Mon, 17 Dec 2018 16:02:59 +0000 (17:02 +0100)]
Minor scrollable list fixes (#9551)

* Make sure loading indicator has enough vertical space

* Respect reduce_motion setting for loading indicator

7 years agoSplit out is_changing_upload from is_submitting
Thibaut Girka [Sun, 16 Dec 2018 14:26:04 +0000 (15:26 +0100)]
Split out is_changing_upload from is_submitting

Fixes #855

7 years agoMove #set_user to Admin::BaseController (#9470)
ysksn [Mon, 17 Dec 2018 10:40:51 +0000 (19:40 +0900)]
Move #set_user to Admin::BaseController (#9470)

* Move #set_user to Admin::BaseController

* Rename Admin::TwoFactorAuthenticationsController

from `#set_user` to `#set_target_user` .

7 years agoAdd spec for Api::V1::Timelines::DirectController (#9547)
ysksn [Mon, 17 Dec 2018 10:36:20 +0000 (19:36 +0900)]
Add spec for Api::V1::Timelines::DirectController (#9547)

7 years agoAdd specs for Api::V1::Instances::PeersController (#9546)
ysksn [Mon, 17 Dec 2018 10:35:55 +0000 (19:35 +0900)]
Add specs for Api::V1::Instances::PeersController (#9546)

7 years agoAdd spec for Api::V1::EndorsementsController (#9543)
ysksn [Mon, 17 Dec 2018 10:32:44 +0000 (19:32 +0900)]
Add spec for Api::V1::EndorsementsController (#9543)

7 years agoAdd spec for Api::V1::Instances::ActivityController (#9545)
ysksn [Mon, 17 Dec 2018 10:32:24 +0000 (19:32 +0900)]
Add spec for Api::V1::Instances::ActivityController (#9545)

7 years agoAdd new first-time tutorial (#9531)
Eugen Rochko [Mon, 17 Dec 2018 10:07:17 +0000 (11:07 +0100)]
Add new first-time tutorial (#9531)

* Prepare to load onboarding as a full page

* Update the first-time introduction

* Improve responsive design

* Replace speech bubble with logo

* Increase text size and reword first paragraph

7 years agoBump omniauth from 1.8.1 to 1.9.0 (#9544)
dependabot[bot] [Mon, 17 Dec 2018 09:15:14 +0000 (10:15 +0100)]
Bump omniauth from 1.8.1 to 1.9.0 (#9544)

Bumps [omniauth](https://github.com/omniauth/omniauth) from 1.8.1 to 1.9.0.
- [Release notes](https://github.com/omniauth/omniauth/releases)
- [Commits](https://github.com/omniauth/omniauth/compare/v1.8.1...v1.9.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
7 years agoAdd specs for Accounts::PinsController (#9542)
ysksn [Mon, 17 Dec 2018 05:03:51 +0000 (14:03 +0900)]
Add specs for Accounts::PinsController (#9542)

7 years agoFix regression in #9539 (#9541)
Eugen Rochko [Mon, 17 Dec 2018 03:32:36 +0000 (04:32 +0100)]
Fix regression in #9539 (#9541)

7 years agoRemove "most popular" tab from profile directory, add responsive design (#9539)
Eugen Rochko [Mon, 17 Dec 2018 02:14:28 +0000 (03:14 +0100)]
Remove "most popular" tab from profile directory, add responsive design (#9539)

* Remove "most popular" tab from profile directory, add responsive design

* Remove unused translations

7 years agoDo no retry web push workers if the server returns a 4xx response (#9434)
Eugen Rochko [Mon, 17 Dec 2018 02:14:13 +0000 (03:14 +0100)]
Do no retry web push workers if the server returns a 4xx response (#9434)

Add timeout of 10s to web push requests

7 years agoSplit out is_changing_upload from is_submitting (#9536)
ThibG [Sun, 16 Dec 2018 20:17:56 +0000 (21:17 +0100)]
Split out is_changing_upload from is_submitting (#9536)

There is no reason to disable the composer textarea when some media metadata
is being modified, nor is there any reason to focus the textarea when some
media metadata has been modified (prevents clicking one image's description
field right after having modified another).

7 years agoRemove PostgreSQL statement timeout (#9537)
Eugen Rochko [Sun, 16 Dec 2018 20:17:15 +0000 (21:17 +0100)]
Remove PostgreSQL statement timeout (#9537)

Revert #9382

7 years agoMerge pull request #856 from ThibG/glitch-soc/merge-upstream
ThibG [Sun, 16 Dec 2018 14:26:50 +0000 (15:26 +0100)]
Merge pull request #856 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

7 years ago[Glitch] Fix padding on select elements in preferences
Thibaut Girka [Sun, 16 Dec 2018 12:36:19 +0000 (13:36 +0100)]
[Glitch] Fix padding on select elements in preferences

Port c58c00651b13520e22f0a59737d23a68e63b4840 to glitch-soc

7 years ago[Glitch] Make animated header resoect `auto_play_gif`
Thibaut Girka [Sun, 16 Dec 2018 12:34:01 +0000 (13:34 +0100)]
[Glitch] Make animated header resoect `auto_play_gif`

Port part of 7c48688d85d0ab64501cea6b8a516867a786bb4c to glitch-soc

7 years agoAdd notification quick-filter bar in the frontend app (#9399)
Paweł Ngei [Sun, 16 Dec 2018 04:56:41 +0000 (05:56 +0100)]
Add notification quick-filter bar in the frontend app (#9399)

* create FilterBar componer and its container, unstyled

* introduce basic styling for FilterBar

* add selection css

* allow FilterBar to display active CSS with js

* connect the FilterBar to the Redux state

* change getNotifications to use filter

* remove temporary comments

* add an option to turn the FilterBar off in settings

* fix showFilterBar data type to boolean

* fix eslint errors

* add English and Polish translations

* allowed filter bar overflow to accomodate for longer languages

* fix mispelled translation key

* add unified CSS look

* replace text in FilterBar with icons

* add tooltips

* replace text @ with an icon

* introduce simple and advanced filtering view

* add ability to toggle the advanced view

* add Polish translations

* change Advanced View description to be more clear

* make each filter flush notifications and load new ones, fixing pagination

* simplify getNotifications once frontend filtering is not needed for FilterBar

* add a semicolon

* Revert "simplify getNotifications once frontend filtering is not needed for FilterBar"

This reverts commit 9f4be7857135b0327814bd22a3e8a4e7b546f7cc.

* reset filter to 'all' when turning off FilterBar