Commit Graph

8498 Commits (42713b97106ffbeb9406d1a7086082a172fc2141)

Author SHA1 Message Date
Thibaut Girka 42713b9710 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- README.md: kept our version
2019-01-28 21:14:47 +01:00
Eugen Rochko 28866d329b
Bump version to 2.7.1 () 2019-01-28 04:24:12 +01:00
Eugen Rochko 5d312ef9c7
Fix slow fallback of CopyAccountStats migration setting stats to 0 () 2019-01-28 04:18:35 +01:00
Eugen Rochko d4300c3b98
Add note that contributors may request reimbursement through OpenCollective () 2019-01-28 04:17:11 +01:00
Stanislas 01bc2f84a9 Fix SUPERUSER postgres command () 2019-01-27 23:56:07 +01:00
ThibG e488faaa4a
Merge pull request from ThibG/glitch-soc/merge-upstream
Merge upstream changes
2019-01-27 22:24:29 +01:00
Thibaut Girka f35d790480 [Glitch] Fix initial value of volume slider in video player and handle volume changes
Port a53dcaa298 to glitch-soc
2019-01-27 22:02:59 +01:00
Thibaut Girka 72bab194ad Merge branch 'master' into glitch-soc/merge-upstream 2019-01-27 21:57:55 +01:00
ThibG a53dcaa298 Fix initial value of volume slider in video player and handle volume changes ()
* Fix initial value of volume slider in video player and handle volume changes

* Clean up dead/incorrect code
2019-01-27 21:18:15 +01:00
ThibG ec5bd8b8bb Implement missing hotkeys for notifications () 2019-01-27 17:54:54 +01:00
ThibG f1adce7f6d
Merge pull request from ThibG/glitch-soc/merge-upstream
Merge upstream changes
2019-01-27 14:23:24 +01:00
Thibaut Girka 7251bc3853 Merge branch 'master' into glitch-soc/merge-upstream 2019-01-27 13:57:25 +01:00
Thibaut Girka f938800ef4 Revert to storing application info, and display it to the author via API 2019-01-27 13:56:41 +01:00
Thibaut Girka 05415fa5d3 Make storing and displaying application used to toot opt-in 2019-01-27 13:56:41 +01:00
ThibG e2a5be6e9a Prevent posting toots with media attachments from someone else () 2019-01-26 23:59:39 +01:00
ThibG 64cb9b6913
Merge pull request from ThibG/glitch-soc/merge-upstream
Merge upstream changes
2019-01-26 18:47:48 +01:00
Thibaut Girka 80d954ec10 Merge branch 'master' into glitch-soc/merge-upstream 2019-01-26 18:32:49 +01:00
ThibG 270bf7778d
Merge pull request from ThibG/glitch-soc/merge-upstream
Merge upstream changes
2019-01-25 22:42:21 +01:00
Eugen Rochko 9519d55332
Fix SSO authentication not working due to missing agreement boolean ()
Fix 
2019-01-25 12:36:54 +01:00
trwnh 8ef0498f1c Fix Firefox scrollbar color regression in ()
In  the track color was changed to transparent for no apparent reason. This PR restores the previous color selections implemented in  while keeping the updated property name. Per https://github.com/tootsuite/mastodon/pull/9210#issuecomment-441788776 there is no particular reason for the color change in .
2019-01-25 11:48:27 +01:00
Jeong Arm 77394156dd Apply style for .landing-page strong () 2019-01-25 11:48:02 +01:00
Thibaut Girka 04e2c67389 Merge branch 'master' into glitch-soc/merge-upstream 2019-01-25 11:37:49 +01:00
Renato "Lond" Cerqueira e1ec3a9f09 Rescue SSL error in verify link service ()
If the first link to be verified contains a rel=me link with a SSL
error, the VerifyAccountLinksWorker will fail and not try the following
links. This rescues the SSL error when fetching the link, avoiding this
issue.
2019-01-24 15:38:18 +01:00
trwnh c87863bdd1 Fix Firefox scrollbar color regression in ()
In  the track color was changed to transparent for no apparent reason. This PR restores the previous color selections implemented in  while keeping the updated property name. Per https://github.com/tootsuite/mastodon/pull/9210#issuecomment-441788776 there is no particular reason for the color change in .
2019-01-24 13:32:23 +01:00
ThibG afec6b43eb
Merge pull request from ThibG/glitch-soc/fixes/dm-column-crash
Fix crash in Direct Messages column settings
2019-01-23 18:53:36 +01:00
Thibaut Girka c30da25c5f Fix crash in Direct Messages column settings
Fixes 
2019-01-23 18:29:18 +01:00
dependabot[bot] 306e1572e8 Bump oj from 3.7.7 to 3.7.8 ()
Bumps [oj](https://github.com/ohler55/oj) from 3.7.7 to 3.7.8.
- [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.7.7...v3.7.8)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-01-22 20:33:20 +09:00
dependabot[bot] 2eae2d271f Bump rubocop from 0.63.0 to 0.63.1 ()
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.63.0 to 0.63.1.
- [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.63.0...v0.63.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-01-22 20:32:49 +09:00
Jeong Arm d50e824168 Apply style for .landing-page strong () 2019-01-21 20:03:44 +01:00
ThibG 061feb63ed Fix scheduled toot with media immediately creating a toot ()
* Add test for not persisting status when attaching media to scheduled toot

* Prevent status used for validation from being persisted to the database

Fixes 

Thanks to tateisu for the help investigating this.
2019-01-21 20:03:04 +01:00
dependabot[bot] dd8a00a3cc Bump json-ld-preloaded from 3.0.0 to 3.0.2 ()
Bumps [json-ld-preloaded](https://github.com/ruby-rdf/json-ld-preloaded) from 3.0.0 to 3.0.2.
- [Release notes](https://github.com/ruby-rdf/json-ld-preloaded/releases)
- [Commits](https://github.com/ruby-rdf/json-ld-preloaded/compare/3.0.0...3.0.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-01-21 21:39:52 +09:00
dependabot[bot] 3fc0abf8dd Bump pundit from 2.0.0 to 2.0.1 ()
Bumps [pundit](https://github.com/varvet/pundit) from 2.0.0 to 2.0.1.
- [Release notes](https://github.com/varvet/pundit/releases)
- [Changelog](https://github.com/varvet/pundit/blob/master/CHANGELOG.md)
- [Commits](https://github.com/varvet/pundit/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-01-21 21:39:00 +09:00
dependabot[bot] c59b45bf3a Bump rspec-rails from 3.8.1 to 3.8.2 ()
Bumps [rspec-rails](https://github.com/rspec/rspec-rails) from 3.8.1 to 3.8.2.
- [Release notes](https://github.com/rspec/rspec-rails/releases)
- [Changelog](https://github.com/rspec/rspec-rails/blob/master/Changelog.md)
- [Commits](https://github.com/rspec/rspec-rails/compare/v3.8.1...v3.8.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-01-21 21:38:37 +09:00
dependabot[bot] c30287cf7c Bump addressable from 2.5.2 to 2.6.0 ()
Bumps [addressable](https://github.com/sporkmonger/addressable) from 2.5.2 to 2.6.0.
- [Release notes](https://github.com/sporkmonger/addressable/releases)
- [Changelog](https://github.com/sporkmonger/addressable/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sporkmonger/addressable/compare/addressable-2.5.2...addressable-2.6.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-01-21 21:38:00 +09:00
ThibG 6f53c4fc79
Merge pull request from ThibG/glitch-soc/merge-upstream
Merge upstream changes (v2.7.0)
2019-01-21 11:35:31 +01:00
Thibaut Girka 9dfbcf941e Merge branch 'master' into glitch-soc/merge-upstream 2019-01-20 16:49:23 +01:00
ThibG aa362ab73d
Merge pull request from ThibG/glitch-soc/merge-upstream
Merge upstream changes
2019-01-20 13:56:37 +01:00
Eugen Rochko 31e7940de5
Fix multiple workers for the same scheduled status being queueable () 2019-01-20 12:57:05 +01:00
Eugen Rochko 6b91da97bb
Fix directory showing tags that have no currently eligible accounts () 2019-01-20 12:56:53 +01:00
Eugen Rochko 70405db63c
Remove unused locale string () 2019-01-20 12:37:58 +01:00
mayaeh c80b89c2a8 i18n: Update Japanese translations ()
* Update Japanese translations.

* Delete unused translation.
2019-01-20 12:37:38 +01:00
Eugen Rochko e9cd3636c6
Fix `tootctl accounts delete` not deleting user record as well () 2019-01-20 12:30:25 +01:00
Thibaut Girka 5145c81620 [Glitch] Fix public hashtag timeline width on mobile, fix scrollbar width compensation
Port 3b3a4d8a17 to glitch-soc
2019-01-20 11:56:21 +01:00
Thibaut Girka e9060b04d4 [Glitch] Hide floating action button on search and getting started pages
Port 30af4ee65f to glitch-soc
2019-01-20 11:54:38 +01:00
tmm576 9b5810b3e9 Allow event defaults on index for text data transfer () 2019-01-20 11:53:22 +01:00
Thibaut Girka a93cb340bd [Glitch] Fix new hashtag page's items not being full-width on mobile
Port b506ce1197 to glitch-soc
2019-01-20 11:52:06 +01:00
Thibaut Girka 8001a9b97b [Glitch] Add information about how to opt-in to the directory on the directory
Port SCSS changes from a492a9bcd3 to glitch-soc
2019-01-20 11:50:19 +01:00
Mélanie Chauvel (ariasuni) 6dbb10c4b7 Fix slightly cropped font on settings page dropdowns when using system font () 2019-01-20 11:49:27 +01:00
Thibaut Girka 02295257b3 [Glitch] Improve the public hashtag page
Port 8b19903559 to glitch-soc
2019-01-20 11:47:17 +01:00
Thibaut Girka 3e8b623975 [Glitch] Redesign public hashtag page to use a masonry layout
Port bc642ac24b to glitch flavour
2019-01-20 11:38:09 +01:00