queer-af/mastodon
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
7706 commits 2 branches 0 tags 215 MiB
Commit graph

7706 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thibaut Girka eb85427576 [Glitch] Honour displayMedia setting in accountMedia gallery 
Inspired by b79ab15859
 2018-10-02 22:00:57 +02:00
dependabot[bot] 3f62b119e4 Bump rubocop from 0.55.0 to 0.59.2 (#8849) 
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.55.0 to 0.59.2.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.55.0...v0.59.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-10-02 20:16:51 +02:00
dependabot[bot] d19b625394 Bump redis from 4.0.1 to 4.0.2 (#8850) 
Bumps [redis](https://github.com/redis/redis-rb) from 4.0.1 to 4.0.2.
- [Release notes](https://github.com/redis/redis-rb/releases)
- [Changelog](https://github.com/redis/redis-rb/blob/master/CHANGELOG.md)
- [Commits](https://github.com/redis/redis-rb/compare/v4.0.1...v4.0.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-10-02 20:16:05 +02:00
ThibG 35e9d099b3
Merge pull request #758 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2018-10-02 12:01:40 +02:00
dependabot[bot] 3dac956587 Bump fastimage from 2.1.1 to 2.1.4 (#8847) 
Bumps [fastimage](https://github.com/sdsykes/fastimage) from 2.1.1 to 2.1.4.
- [Release notes](https://github.com/sdsykes/fastimage/releases)
- [Commits](https://github.com/sdsykes/fastimage/compare/v2.1.1...v2.1.4)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-10-02 17:20:52 +09:00
dependabot[bot] b95d944625 Bump webpush from 0.3.3 to 0.3.4 (#8846) 
Bumps [webpush](https://github.com/zaru/webpush) from 0.3.3 to 0.3.4.
- [Release notes](https://github.com/zaru/webpush/releases)
- [Commits](https://github.com/zaru/webpush/compare/v0.3.3...v0.3.4)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-10-02 15:37:28 +09:00
dependabot[bot] 194ad2c90b Bump rack-attack from 5.2.0 to 5.4.1 (#8838) 
Bumps [rack-attack](https://github.com/kickstarter/rack-attack) from 5.2.0 to 5.4.1.
- [Release notes](https://github.com/kickstarter/rack-attack/releases)
- [Changelog](https://github.com/kickstarter/rack-attack/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kickstarter/rack-attack/compare/v5.2.0...v5.4.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-10-01 22:49:26 +02:00
Grey Baker 3a2f007eb0 Promote colorize to top-level dependency (#8844) 2018-10-02 05:34:25 +09:00
Thibaut Girka 6ad7606909 [Glitch] Add support for new display_media setting 
Port f7a6f9489d to glitch-soc

[API] [vanilla required] [glitch-soc optional] initial_state show_sensitive_media boolean changed to show_media string with options "default", "hide_all", "show_all"
 2018-10-01 16:48:55 +02:00
Thibaut Girka 15197a831c [Glitch] RTL: fix margins: public-layout.header.nav-button 
Port df2f4052b8 to glitch-soc
 2018-10-01 14:38:35 +02:00
Thibaut Girka 884a898442 [Glitch] RTL: fix statubar action buttons/counter margins 
Port 9f6662fcc9 to glitch-soc
 2018-10-01 14:38:32 +02:00
Thibaut Girka 36d426cec9 [Glitch] Separate font-family into variable 
Port d0d65b5a28 to glitch-soc
 2018-10-01 14:38:29 +02:00
Thibaut Girka 24d05c7a50 Merge branch 'master' into glitch-soc/merge-upstream 2018-10-01 14:36:06 +02:00
dependabot[bot] 793fb7499d Bump annotate from 2.7.3 to 2.7.4 (#8840) 
Bumps [annotate](https://github.com/ctran/annotate_models) from 2.7.3 to 2.7.4.
- [Release notes](https://github.com/ctran/annotate_models/releases)
- [Changelog](https://github.com/ctran/annotate_models/blob/develop/CHANGELOG.rdoc)
- [Commits](https://github.com/ctran/annotate_models/compare/v2.7.3...v2.7.4)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-10-01 14:10:07 +02:00
dependabot[bot] 746da5ccda Bump ox from 2.9.2 to 2.10.0 (#8837) 
Bumps [ox](https://github.com/ohler55/ox) from 2.9.2 to 2.10.0.
- [Release notes](https://github.com/ohler55/ox/releases)
- [Changelog](https://github.com/ohler55/ox/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ohler55/ox/compare/v2.9.2...v2.10.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-10-01 14:08:33 +02:00
abcang ac15c26c29 Fix requirie bootsnap (#8836) 2018-10-01 14:06:40 +02:00
Thibaut Girka c91d9b7389 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	app/lib/user_settings_decorator.rb
	app/models/user.rb
	app/serializers/initial_state_serializer.rb
	app/views/stream_entries/_simple_status.html.haml
	config/locales/simple_form.en.yml
	config/locales/simple_form.ja.yml
	config/locales/simple_form.pl.yml
	config/routes.rb
 2018-10-01 12:43:20 +02:00
Eugen Rochko 5d5d1b528e
Double the threshold for "read more" functionality (#8835) 2018-10-01 03:38:10 +02:00
Spencer Alves 4e60a0d543 Add option to hide action bar in collapsed toots 2018-09-30 08:31:50 +02:00
David Yip c065717b67
Merge pull request #681 from ThibG/glitch-soc/fixes/accessibility 
Port various accessibility improvements from upstream
 2018-09-29 19:01:19 -05:00
David Yip 2bb3c8c944
Merge pull request #755 from ThibG/glitch-soc/features/optional-reply-selection 
Make pre-selection of usernames optional when replying to a toot
 2018-09-29 19:01:05 -05:00
David Yip 19968912fa
Merge pull request #754 from ThibG/glitch-soc/fixes/scroll-compose-into-view 
Scroll to textarea when composing a toot
 2018-09-29 19:00:31 -05:00
David Yip 5b43d7bcbf
Merge pull request #745 from ThibG/glitch-soc/fixes/grey-out-button 
Disable the “TOOT” button (and secondary toot button) if the toot text is empty
 2018-09-29 19:00:06 -05:00
Yamagishi Kazutoshi 65f04e6046 Fix that Rails.cache information could not be sent via StatsD (#8831) 2018-09-30 00:05:59 +02:00
Eugen Rochko 1e75e74f6b
Support /.well-known/change-password (#8828) 
Fix #8771
 2018-09-29 19:14:48 +02:00
Eugen Rochko 6c835085a3
Fix timeline pagination (#8827) 
Ruby's ** operator does not play well with non-Hash objects, which
the params slice is

Fix #8821
 2018-09-29 19:03:33 +02:00
Eugen Rochko e09301f414
Adjust bootsnap configuration for newer version (#8826) 2018-09-29 18:34:36 +02:00
Eugen Rochko ac07bfb018 Fix tootctl accounts reattaching not unsuspending deleted account (#8812) 2018-09-29 18:40:40 +09:00
Masoud Abkenar df2f4052b8 RTL: fix margins: public-layout.header.nav-button (#8823) 
* RTL: fix margins: public-layout.header.nav-button

* add empty line to meet style guides
 2018-09-29 11:04:26 +09:00
Thibaut Girka 76b8ae044d Fix build status link in README.md 
It was still linking to Travis, oops.
 2018-09-28 21:18:04 +02:00
Thibaut Girka 86b2b009dd Make pre-selection of usernames optional when replying to a toot 
Fixes #751
 2018-09-28 21:01:09 +02:00
Thibaut Girka 15134beb1e Fix styling issue in “Compose box options” local settings page 2018-09-28 18:55:44 +02:00
Thibaut Girka 9594c68532 Scroll to textarea when composing a toot 2018-09-28 18:44:55 +02:00
Thibaut Girka fa18859b20 [Glitch] Adjust beforeUnload conditions 
Port 05f90e3695 to glitch-soc
 2018-09-28 17:09:25 +02:00
Thibaut Girka abffbba819 Fix maxCharacters in vanilla front-end 2018-09-28 17:05:19 +02:00
Eugen Rochko ef69c655cc
Fix class autoloading issue in ActivityPub::Activity::Create (#8820) 2018-09-28 17:02:53 +02:00
dependabot[bot] e02c45941d Bump strong_migrations from 0.2.2 to 0.2.3 (#8818) 
Bumps [strong_migrations](https://github.com/ankane/strong_migrations) from 0.2.2 to 0.2.3.
- [Release notes](https://github.com/ankane/strong_migrations/releases)
- [Changelog](https://github.com/ankane/strong_migrations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ankane/strong_migrations/compare/v0.2.2...v0.2.3)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-09-28 13:35:44 +02:00
dependabot[bot] 5da51771cd Bump oj from 3.5.1 to 3.6.11 (#8815) 
Bumps [oj](https://github.com/ohler55/oj) from 3.5.1 to 3.6.11.
- [Release notes](https://github.com/ohler55/oj/releases)
- [Changelog](https://github.com/ohler55/oj/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ohler55/oj/compare/v3.5.1...v3.6.11)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-09-28 13:34:31 +02:00
dependabot[bot] b6985482f7 Bump bootsnap from 1.3.0 to 1.3.2 (#8816) 
Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.3.0 to 1.3.2.
- [Release notes](https://github.com/Shopify/bootsnap/releases)
- [Changelog](https://github.com/Shopify/bootsnap/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Shopify/bootsnap/compare/v1.3.0...v1.3.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-09-28 13:33:10 +02:00
dependabot[bot] ec745b32de Bump simple_form from 4.0.0 to 4.0.1 (#8814) 
Bumps [simple_form](https://github.com/plataformatec/simple_form) from 4.0.0 to 4.0.1.
- [Release notes](https://github.com/plataformatec/simple_form/releases)
- [Changelog](https://github.com/plataformatec/simple_form/blob/master/CHANGELOG.md)
- [Commits](https://github.com/plataformatec/simple_form/compare/v4.0.0...v4.0.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-09-28 13:32:40 +02:00
Eugen Rochko 38f5f9cf5b
Add tootctl accounts backup (#8811) 2018-09-28 03:34:24 +02:00
Eugen Rochko f0fff3eb10
Support min_id-based pagination in REST API (#8736) 
* Allow min_id pagination in Feed#get

* Add min_id pagination to home and list timeline APIs

* Add min_id pagination to account statuses, public and tag APIs

* Remove unused stub in reports API

* Use min_id pagination in notifications, favourites, and fix order

* Fix HomeFeed#from_database not using paginate_by_id
 2018-09-28 02:23:45 +02:00
Eugen Rochko 3d7f68c273
Revert Font Awesome 5 upgrade (#8810) 
* Revert "Fix some icon names changed by the Font Awesome 5. (#8796)"

This reverts commit 3f9ec3de82.

* Revert "Migrate to font-awesome 5.0. (#8799)"

This reverts commit 8bae14591b.

* Revert "Fix some icons names, unavailable in fontawesome5 (free license). (#8792)"

This reverts commit b9c727a945.

* Revert "Update the icon name changed by the Font Awesome 5. (#8776)"

This reverts commit 17af4d27da.

* Revert "Add bot icon to bot avatars and migrate to newer version of Font Awesome (#8484)"

This reverts commit 4b794e134d.
 2018-09-28 02:11:14 +02:00
cbayerlein 4b78546135 Exclude replies from list timelines (#8683) 
* Changed list behaviour

I added the following line to the FeedManager (app/lib/feed_manager.rb) in the push_to_list function:

`return false if status.reply?`

Now all posts that are replies are filtered out, so that now only "genuine" posts are displayed in the list.

This is a first approach to solve issue #5916

* Update feed_manager.rb

As suggested by @Gargron
 2018-09-28 00:37:21 +02:00
mayaeh 3f9ec3de82 Fix some icon names changed by the Font Awesome 5. (#8796) 2018-09-27 20:36:36 +02:00
Maciek Baron a72a939334 Add test for AutosuggestEmoji (#8805) 2018-09-27 20:35:58 +02:00
dependabot[bot] e046a987f6 Bump capistrano from 3.10.2 to 3.11.0 (#8801) 
Bumps [capistrano](https://github.com/capistrano/capistrano) from 3.10.2 to 3.11.0.
- [Release notes](https://github.com/capistrano/capistrano/releases)
- [Changelog](https://github.com/capistrano/capistrano/blob/master/CHANGELOG.md)
- [Commits](https://github.com/capistrano/capistrano/compare/v3.10.2...v3.11.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-09-27 18:24:06 +02:00
dependabot[bot] 20a87b2c7f Bump stackprof from 0.2.11 to 0.2.12 (#8803) 
Bumps [stackprof](https://github.com/tmm1/stackprof) from 0.2.11 to 0.2.12.
- [Release notes](https://github.com/tmm1/stackprof/releases)
- [Changelog](https://github.com/tmm1/stackprof/blob/master/CHANGELOG.md)
- [Commits](https://github.com/tmm1/stackprof/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-09-27 17:11:54 +02:00
dependabot[bot] 1cb8600a45 Bump tty-command from 0.8.0 to 0.8.2 (#8802) 
Bumps [tty-command](https://github.com/piotrmurach/tty-command) from 0.8.0 to 0.8.2.
- [Release notes](https://github.com/piotrmurach/tty-command/releases)
- [Changelog](https://github.com/piotrmurach/tty-command/blob/master/CHANGELOG.md)
- [Commits](https://github.com/piotrmurach/tty-command/compare/v0.8.0...v0.8.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-09-27 17:11:29 +02:00
Colin Dean 330e320b40 Adds follow action timestamp to notification (#8756) 
Fixes #8755
 2018-09-27 17:11:06 +02:00