fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-16 03:35:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
7676 commits 128 branches 266 tags 975 MiB
Commit graph

7676 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thibaut Girka 5f308a7f05 When screen width is too narrow, hide local-settings page text, keep only icons 2018-10-09 18:10:54 +02:00
Thibaut Girka 6cd793f0ac Change “preferences” icon to match settings page icon 2018-10-09 18:10:54 +02:00
Thibaut Girka edb9ec8543 Add icons for each of the local-setting pages 2018-10-09 18:10:54 +02:00
ThibG 641d056e0f
Merge pull request #774 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2018-10-09 13:23:01 +02:00
Thibaut Girka 122ac9cd1d Merge branch 'master' into glitch-soc/merge-upstream 2018-10-09 12:12:03 +02:00
ThibG 4134a10549
Merge pull request #770 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2018-10-09 12:11:14 +02:00
Thibaut Girka d0b1369a85 Fix app-wide hotkeys randomly failing to work 2018-10-09 12:10:51 +02:00
Sascha b2a57a5d6f add ffmpeg initializer (#8855) 
* add ffmpeg initializer

* use different expression to check for environment var
 2018-10-09 03:02:52 +02:00
mayaeh 87abbb07f3 Add Japanese translations. (#8927) 2018-10-09 07:12:37 +09:00
Thibaut Girka b368d3c15d Merge branch 'master' into glitch-soc/merge-upstream 2018-10-08 15:34:53 +02:00
mayaeh 770e337497 Fixed error occurrence when pinning the DM column. (#8922) 2018-10-08 14:43:38 +02:00
Thibaut Girka d17844e6d1 Merge branch 'master' into glitch-soc/merge-upstream 2018-10-08 13:51:33 +02:00
Thibaut Girka 96c3d26870 Move “Show action buttons in collapsed toots” option 2018-10-08 13:49:25 +02:00
Thibaut Girka faecb35fe0 Switch from selects to radio buttons for local settings, improve styling 2018-10-08 13:49:25 +02:00
dependabot[bot] 4c4ff05a46 Bump capybara from 3.8.2 to 3.9.0 (#8924) 
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.8.2 to 3.9.0.
- [Release notes](https://github.com/teamcapybara/capybara/releases)
- [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md)
- [Commits](https://github.com/teamcapybara/capybara/compare/3.8.2...3.9.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-10-08 07:45:31 +02:00
dependabot[bot] 8639f000ea Bump tty-prompt from 0.17.0 to 0.17.1 (#8925) 
Bumps [tty-prompt](https://github.com/piotrmurach/tty-prompt) from 0.17.0 to 0.17.1.
- [Release notes](https://github.com/piotrmurach/tty-prompt/releases)
- [Changelog](https://github.com/piotrmurach/tty-prompt/blob/master/CHANGELOG.md)
- [Commits](https://github.com/piotrmurach/tty-prompt/compare/v0.17.0...v0.17.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-10-08 07:45:08 +02:00
dependabot[bot] 10e38b441f Bump aws-sdk-s3 from 1.20.0 to 1.21.0 (#8926) 
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.20.0 to 1.21.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-10-08 07:44:53 +02:00
dependabot[bot] 87ad9c408c Bump i18n-tasks from 0.9.21 to 0.9.25 (#8923) 
Bumps [i18n-tasks](https://github.com/glebm/i18n-tasks) from 0.9.21 to 0.9.25.
- [Release notes](https://github.com/glebm/i18n-tasks/releases)
- [Changelog](https://github.com/glebm/i18n-tasks/blob/master/CHANGES.md)
- [Commits](https://github.com/glebm/i18n-tasks/compare/v0.9.21...v0.9.25)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-10-08 14:24:07 +09:00
ashleyhull-versent f194857ac9 rubocop issues - Cleaning up (#8912) 
* cleanup pass

* undo mistakes

* fixed.

* revert
 2018-10-08 04:50:11 +02:00
Eugen Rochko a00ce8c92c
Remove dead code (#8919) 
SignatureVerification#matches_time_window? is not called anywhere.
 2018-10-08 04:48:54 +02:00
ashleyhull-versent 2dba313100 Replace SVG asset with Custom mascot (#8766) 2018-10-08 00:20:45 +02:00
Eugen Rochko 774ac47373
Add conversations API (#8832) 
* Add conversations API

* Add web UI for conversations

* Add test for conversations API

* Add tests for ConversationAccount

* Improve web UI

* Rename ConversationAccount to AccountConversation

* Remove conversations on block and mute

* Change last_status_id to be a denormalization of status_ids

* Add optimistic locking
 2018-10-07 23:44:58 +02:00
Thibaut Girka a3677a828d [Glitch] Change documentation URL 
Port 28401962ca to glitch-soc
 2018-10-07 22:56:24 +02:00
Thibaut Girka b4ba1058b8 [Glitch] RTL: fix margins of public-account-header__tabs 
Port 185cb2dc3a to glitch-soc
 2018-10-07 22:56:24 +02:00
ThibG f1c3053d36
Merge pull request #768 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2018-10-07 20:13:07 +02:00
Thibaut Girka 611740ce81 Merge branch 'master' into glitch-soc/merge-upstream 2018-10-07 19:47:56 +02:00
ThibG 25744d43b0 Ensure only toots from the reported users are reported (#8916) 2018-10-07 19:45:40 +02:00
Eugen Rochko 09d789e79b
Add POST /api/v1/notifications/:id/dismiss (#8905) 
POST /api/v1/notifications/dismiss was a mistake in #2251
 2018-10-07 18:26:26 +02:00
Thibaut Girka 7cc7843109 Do not scroll timelines when *closing* media modals 
Media modals push an history state so that pressing back on mobile closes them.
We made sure to not scroll when opening them, but not when *closing* them,
which caused some issues in rare cases.
 2018-10-07 12:08:32 +02:00
Eugen Rochko 886af5ce19
Add fallback for PostgreSQL without upsert in CopyStatusStats (#8903) 
Fix #8590
 2018-10-07 04:40:37 +02:00
Marcin Mikołajczak 2fb692ea45 i18n: Update Polish translation (#8901) 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2018-10-06 20:42:36 +09:00
bsky 84f82ee2fe Improve production build config (#8899) 2018-10-06 15:12:05 +09:00
Eugen Rochko 28401962ca Change documentation URL (#8898) 
* Change documentation URL

* Fix hardcoded documentation URL in locales
 2018-10-06 14:33:36 +09:00
Eugen Rochko 30dd7f3d90 Remove unused ruby-progressbar dependency (#8896) 
* Remove unused ruby-progressbar dependency

* Remove unused colorize dependency
 2018-10-06 08:33:26 +09:00
Masoud Abkenar 185cb2dc3a RTL: fix margins of public-account-header__tabs (#8897) 
* RTL: fix margins of public-account-header__tabs

* fix style

* even more stylish code :)
 2018-10-06 00:05:11 +02:00
ThibG f990b9c768
Merge pull request #764 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2018-10-05 21:58:23 +02:00
Thibaut Girka 98bb6815a7 Merge branch 'master' into glitch-soc/merge-upstream 2018-10-05 21:48:25 +02:00
Jeong Arm 144d73730d Leave unknown language as nil if account is remote (#8861) 
* Force use language detector if account is remote

* Set unknown remote toot's language as nil
 2018-10-05 19:17:46 +02:00
Thibaut Girka c6e4c48942 [Glitch] Add a confirmation dialog when hitting reply and the compose box isn't empty 2018-10-05 19:08:52 +02:00
ThibG 515ce8f469
Merge pull request #762 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2018-10-05 19:01:44 +02:00
dependabot[bot] 9a42b75f00 Bump omniauth-saml from 1.10.0 to 1.10.1 (#8885) 
Bumps [omniauth-saml](https://github.com/omniauth/omniauth-saml) from 1.10.0 to 1.10.1.
- [Release notes](https://github.com/omniauth/omniauth-saml/releases)
- [Changelog](https://github.com/omniauth/omniauth-saml/blob/master/CHANGELOG.md)
- [Commits](https://github.com/omniauth/omniauth-saml/compare/v1.10.0...v1.10.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-10-05 19:01:00 +02:00
dependabot[bot] 6812f811b1 Bump parallel_tests from 2.21.3 to 2.23.0 (#8884) 
Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 2.21.3 to 2.23.0.
- [Release notes](https://github.com/grosser/parallel_tests/releases)
- [Commits](https://github.com/grosser/parallel_tests/compare/v2.21.3...v2.23.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-10-05 18:59:35 +02:00
dependabot[bot] 7c154c6afd Bump puma from 3.11.4 to 3.12.0 (#8883) 
Bumps [puma](https://github.com/puma/puma) from 3.11.4 to 3.12.0.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v3.11.4...v3.12.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-10-05 18:58:13 +02:00
ThibG 42aecb4c13 Add a confirmation dialog when hitting reply and the compose box isn't empty (#8893) 
* Add a confirmation dialog when hitting reply and the compose box isn't empty

Fixes #878

* Performance improvement
 2018-10-05 18:44:44 +02:00
Thibaut Girka 00fcdebed7 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	db/migrate/20170716191202_add_hide_notifications_to_mute.rb
	spec/controllers/application_controller_spec.rb

Took our version, upstream changes were only minor style linting.
 2018-10-05 15:23:57 +02:00
dependabot[bot] 028ad4124c [Security] Bump nokogiri from 1.8.4 to 1.8.5 (#8881) 
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.8.4 to 1.8.5. **This update includes security fixes.**
- [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.4...v1.8.5)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-10-05 04:07:44 +02:00
aus-social 0a4739c732 lint pass 2 (#8878) 
* Code quality pass

* Typofix

* Update applications_controller_spec.rb

* Update applications_controller_spec.rb
 2018-10-04 17:38:04 +02:00
Eugen Rochko a46ab86adf
Limit the number of people that can be followed from one account (#8807) 
Configurable soft limit of 7,500, and above that, configurable
ratio of 1.1 * followers, controlled by:

- MAX_FOLLOWS_THRESHOLD
- MAX_FOLLOWS_RATIO

Fix #2311
 2018-10-04 17:36:11 +02:00
Eugen Rochko 186024a058
Add tootctl settings registrations open (#8829) 2018-10-04 16:05:54 +02:00
Eugen Rochko e645ae9561
Change admin accounts default sort to most recent (#8813) 2018-10-04 16:05:38 +02:00