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

4262 commits

This branch
This branch
All branches
Author SHA1 Message Date
Surinna Curtis
b4ffe602a5 block notifications in notify_service from hard muted accounts 2017-09-13 21:47:30 -05:00
Surinna Curtis
0d5ce9d8e6 Add muting_notifications? and a notifications argument to mute! 2017-09-13 21:47:30 -05:00
Surinna Curtis
df04a52a4d Add a hide_notifications column to mutes 2017-09-13 21:47:30 -05:00
Surinna Curtis
2f872fc0aa Fix a spuriously failing spec that assumed we required short bios like upstream 2017-09-10 19:43:52 -05:00
Surinna Curtis
485de6b477 Remove unused imports 2017-09-10 16:00:26 -05:00
Surinna Curtis
d817a53479 Merge pull request #143 from yipdw/sync/upstream 
Merge with upstream's 1.6.0
 2017-09-10 14:10:30 -05:00
David Yip
f90abccf33 Merge tag 'v1.6.0' into sync/upstream 2017-09-10 13:04:27 -05:00
beatrix
6f7e7a8f2c Merge pull request #142 from glitch-soc/sync/upstream-1.6.0rc4 
Merge with 1.6.0rc4

STRAP IN BUCKAWOO HERE WE GO AGAIN
 2017-09-10 13:34:14 -04:00
Eugen Rochko
6d13a61ea8 Bump to 1.6.0 2017-09-10 15:10:03 +02:00
Eugen Rochko
078c84fbb5 Fix POST /api/v1/follows error when already following (#4878) 2017-09-10 15:09:06 +02:00
yoshipc
92bdd78105 Fix Japanese translation (#4876) 
I translated the additional text ( added by #4871)
 2017-09-10 20:34:15 +09:00
Eugen Rochko
0e213d4b1a Bump version to 1.6.0rc5 2017-09-10 10:26:51 +02:00
Eugen Rochko
762ca653b6 Hide modal loading screen for media/video/boost/confirm/actions modals (#4873) 2017-09-10 10:26:01 +02:00
Eugen Rochko
6628ea4a82 Default follows for new users (#4871) 
When a new user confirms their e-mail, bootstrap their home timeline
by automatically following a set of accounts. By default, all local
admin accounts (that are unlocked). Can be customized by new admin
setting (comma-separated usernames, local and unlocked only)
 2017-09-10 09:58:38 +02:00
Eugen Rochko
63cb303a66 Fix dimensions of loading component for compose drawer (#4872) 2017-09-10 08:48:11 +02:00
David Yip
017738c604 Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4 
Conflicts:
      app/javascript/mastodon/features/getting_started/index.js
      app/javascript/packs/public.js
      app/javascript/styles/components.scss
 2017-09-09 23:56:21 -05:00
beatrix
e7779adc0d Merge pull request #141 from yipdw/sync/upstream 
Sync with upstream @ v1.6.0rc3

ohhhhhhhhhhh heck here we go
 2017-09-09 20:11:48 -04:00
Yamagishi Kazutoshi
4c0a563c0c Set fallback address when empty notification address (#4868) 2017-09-09 21:31:48 +02:00
David Yip
bee4cdc8d2 Add missing import (patch by @MightyPork) 2017-09-09 14:28:20 -05:00
David Yip
67d9178007 Merge tag 'v1.6.0rc3' into sync/upstream 2017-09-09 14:28:08 -05:00
David Yip
da3f22ee7d Merge branch 'origin/master' into sync/upstream 
Conflicts:
	app/javascript/mastodon/components/status_list.js
	app/javascript/mastodon/features/notifications/index.js
	app/javascript/mastodon/features/ui/components/modal_root.js
	app/javascript/mastodon/features/ui/components/onboarding_modal.js
	app/javascript/mastodon/features/ui/index.js
	app/javascript/styles/about.scss
	app/javascript/styles/accounts.scss
	app/javascript/styles/components.scss
	app/presenters/instance_presenter.rb
	app/services/post_status_service.rb
	app/services/reblog_service.rb
	app/views/about/more.html.haml
	app/views/about/show.html.haml
	app/views/accounts/_header.html.haml
	config/webpack/loaders/babel.js
	spec/controllers/api/v1/accounts/credentials_controller_spec.rb
 2017-09-09 14:27:47 -05:00
Quent-in
899e7ad811 i10n minors changes for 1.6 (#4867) 
* wrong preposition + typo

* wrong preposition + typo

* Typo

* Typo

* minor changes

* minor changes
 2017-09-09 18:22:56 +02:00
Eugen Rochko
86cf6905cc Fix errors preventing UnsubscribeService from working (#4866) 2017-09-09 17:36:27 +02:00
Eugen Rochko
2303725f7d Add script to make embedded iframes autosize (#4853) 2017-09-09 16:23:44 +02:00
Eugen Rochko
d8bbe7cf7c Disable mouse-based pause from #4859 (#4865) 
It wasn't working ideally and introduced some annoying false positivies
 2017-09-09 15:09:50 +02:00
Eugen Rochko
fafd9d8bae Bump version to 1.6.0rc4 2017-09-09 14:53:49 +02:00
unarist
64eb868c4a Fix scroll behavior and others on paused timeline (#4864) 
Resolved:

* Lot of redundant renders while mouse moving
* Scroll jumping when timeline loaded
* Scroll position isn't kept when statuses below the scrollTop was deleted then new status arrived

Unresolved:

* Scroll position isn't kept when statuses over the scrollTop was deleted then new status arrived
-> It needs to know which statuses are over the scrollTop
* New status indicator should be active when new statuses arrived while mouse moved recently
-> It needs a) update indicator in ScrollableList, or b) set scrollTop status while mouse moving
 2017-09-09 14:16:11 +02:00
Yamagishi Kazutoshi
f551b2ca7a Fix second report (regression from 2cc31b3194) (#4863) 2017-09-09 13:42:48 +02:00
Eugen Rochko
dfd9eed84c Add missing reject_media check before avatar download via ActivityPub (#4862) 2017-09-09 13:41:45 +02:00
Lynx Kotoura
c268118e5b Scrollable tables in settings pages (#4857) 
* Scrollable tables in settings pages

* Add space before curly brace
 2017-09-09 02:26:58 +02:00
Eugen Rochko
f79eba1650 Fix #1004 - Temporarily pause timeline if there's been recent mouse movement (#4859) 2017-09-09 02:26:41 +02:00
Eugen Rochko
1a5442204b Fix #4852 - Check if already requested from FollowService (#4855) 2017-09-09 02:02:44 +02:00
Eugen Rochko
cc4bc2709d Fix #4850 - When visibility missing from API call to toot, fallback to user preference (#4861) 2017-09-09 02:02:29 +02:00
unarist
d29f2a30e4 Refresh timeline after toot while the timeline is disconnected (#4858) 
To reflect status posting immediately, we've inserted the status into timelines directly. However, status insertion changes "latest status", and it means next timeline refresh only fetches statuses since the inserted status. This behavior is very bad for disconnected timeline and mobile views.

After this patch, it refreshes timeline for disconnected timelines, instead of direct insertion.
 2017-09-08 21:43:34 +02:00
unarist
05ef0ead4a Handle stream_entry URL correctly in ActivityPub (#4854) 
In before, the method uses stream_entry id as status id, so replied status was wrongly selected.

This PR uses StatusFinder which was introduced with `Api::Web::EmbedsController`.
 2017-09-08 18:20:03 +02:00
Quent-in
df9c7584c9 i10n update OC and FR (#4849) 
* Missing "navigation_bar.pins"

* Missing "navigation_bar.pins"
 2017-09-08 13:55:47 +02:00
Eugen Rochko
a27821f725 Fix language filter codes (#4841) 
* Fix language filter codes

CLD3 returns BCP-47 language identifier, filter settings expect
identifiers in the ISO 639-1 format. Convert between formats,
and exclude duplicate languages from filter choices (zh-CN->zh)

* Fix zh name
 2017-09-08 12:32:22 +02:00
Eugen Rochko
904ab54cf3 "Mute conversation" option on all own toots, not just in notifications (#4844) 
That way you can mute notifications for a toot before you get replies
to it or boosts or favourites
 2017-09-08 12:00:30 +02:00
Eugen Rochko
6fb8be482b Fetch statuses/following/followers numbers from ActivityPub collections (#4840) 2017-09-08 12:00:17 +02:00
m4sk1n
1a4beb3122 i18n: Update Polish translation (#4845) 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2017-09-08 05:51:48 +09:00
Quent-in
cbe9eb3f2e i10n OC / FR update Pinned toots (#4842) 
* Added column.pins

New strings

* Added column.pins

* Update confirmation_instructions.oc.html.erb

* Update confirmation_instructions.oc.text.erb

* Update password_change.oc.html.erb

* Update password_change.oc.text.erb

* Update reset_password_instructions.oc.html.erb

* Update reset_password_instructions.oc.text.erb

* Update confirmation_instructions.oc.html.erb

* Update confirmation_instructions.oc.text.erb
 2017-09-07 22:07:03 +02:00
Eugen Rochko
8bb036350a Fix #4834 - Adjust Status#local and Status#remote scopes (#4839) 2017-09-07 20:18:34 +02:00
abcang
0080804f44 Enable UniqueRetryJobMiddleware even when called from sidekiq worker (#4836) 2017-09-07 16:44:14 +02:00
PFM
3c816b0a77 Use <button> instead of <div role="button"> (#4835) 2017-09-07 16:18:41 +02:00
voidSatisfaction
d766cb0c3c Add Pinned toot column (#4817) 
* Add Pinned_toot_section

* Fix add frozen_string_literal

* Fix delete no need controller and tests

* Fix replace query strings to axios params

* Fix change value to accountId and disabling more button
 2017-09-07 09:58:11 +02:00
voidSatisfaction
ac63da7732 Feat add validation for report comment: characters under 1000 valid (#4833) 2017-09-07 09:55:42 +02:00
Joseph Mingrone
c69b143264 Use casecmp() instead of casecmp?() for now (#4832) 
* Use casecmp() instead of casecmp?() for now

casecmp?() is only available in ruby 2.4.0.  Users running earlier ruby versions
would see errors, e.g., running
RAILS_ENV=production rails mastodon:maintenance:remove_deprecated_preview_cards.

* Correctly check whether casecmp() returns 0
 2017-09-07 03:55:06 +02:00
Quent-in
e489378e22 i10n update OC and FR files (#4824) 
* Onboarding: corrections

Some missing letters and spaces or better wording

* Embed

Translated as Intégrer in FR / Embarcar in OC
 2017-09-07 08:55:03 +09:00
Olivier Humbert
efef36447f Update fr.json (#4830) 
typo
 2017-09-06 22:32:49 +02:00
Eugen Rochko
5ad3153b0b Fix locking migration on statuses table. Nullable column and NO default value (#4825) 2017-09-06 20:57:52 +02:00