treehouse
/
mastodon
22
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
10,211 Commits
12 Branches
15 Tags
760 MiB
Commit Graph

10211 Commits (bbc1e15f39b8110a0294363cc0be182bbb3251fe)

Author SHA1 Message Date
Sasha Sorokin 406f2f7d57 Fix trending counter width (#11569) 
Trending counter used to be constant 100px in width, which caused
issues in languages like Russian, where because of that, "talking"
text was cut to the size where actual count is not visible at all:

> 6 people talking
> Популярно у...
 2019-08-15 20:20:02 +02:00
Eugen Rochko fe52fca65c Fix tesseract.js being part of the common chunk (#11571) 
* Fix tesseract.js being part of the common chunk

Besides being 620 KB large, it also causes a modules-related runtime
error in production...

* Fix code style issue

* Fix modules error
 2019-08-15 17:24:45 +02:00
Eugen Rochko 41b188dce6 Add OCR tool to media editing modal (#11566) 2019-08-15 15:13:26 +02:00
ThibG 0fd7f8315f Fix client-side resizing of image uploads (#11570) 
Fixes #11567
 2019-08-15 11:52:26 +02:00
Eugen Rochko da208e7d9b Add media editing modal (#11563) 
Move media description input to a modal and unite that modal with
the focal point modal. Add a hint about choosing focal points, as
well as a preview of a 16:9 thumbnail. Enable the user to watch
the video next to the media description input.

Fix #8320
Fix #6713
 2019-08-14 04:07:32 +02:00
ThibG cfc3fc6bcd Fix reverse-proxy caching of instance actor object (#11561) 2019-08-13 15:30:37 +02:00
Eugen Rochko 954840740e Fix short number formatting for numbers above million in web UI (#11559) 2019-08-13 12:22:33 +02:00
Eugen Rochko a398045539 Add indicator of unread content to window title when web UI is out of focus (#11560) 
Fix #1288
 2019-08-13 12:22:16 +02:00
Thibaut Girka 13faa1daa0 Honor `system_emoji_font` in the Emoji Picker 2019-08-12 23:01:37 +02:00
Thibaut Girka 97c3cec2f8 Add option to disable emoji replacements 
Fixes #647

The option is found in `/settings` (because that was easier to write it this
way) but only affects the glitch-soc front-end.
 2019-08-12 23:01:37 +02:00
ThibG 585d994447 Merge pull request #1196 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-08-12 23:01:19 +02:00
ThibG 93e6461e66 Fix more ActivityPub queries setting cookies and preventing caching (#11557) 2019-08-12 22:26:07 +02:00
Thibaut Girka 8aba819ed2 Merge branch 'master' into glitch-soc/merge-upstream 2019-08-12 18:01:21 +02:00
ThibG c656426415 Revert bcrypt to 3.1.12 (#11555) 2019-08-12 17:52:12 +02:00
Eugen Rochko 284233f309 [Glitch] Fix "cancel follow request" button having unreadable text in web UI 
Port aed7dca53b to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-08-12 16:49:12 +02:00
Thibaut Girka f0362fa0ee Merge branch 'master' into glitch-soc/merge-upstream 2019-08-12 16:24:22 +02:00
dependabot-preview[bot] 02dc03f843 Bump sass from 1.22.7 to 1.22.9 (#11545) 
Bumps [sass](https://github.com/sass/dart-sass) from 1.22.7 to 1.22.9.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.22.7...1.22.9)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-12 21:19:49 +09:00
dependabot-preview[bot] b977373304 Bump parallel_tests from 2.29.1 to 2.29.2 (#11549) 
Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 2.29.1 to 2.29.2.
- [Release notes](https://github.com/grosser/parallel_tests/releases)
- [Commits](https://github.com/grosser/parallel_tests/compare/v2.29.1...v2.29.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-12 20:14:22 +09:00
dependabot-preview[bot] e7188e0cce Bump devise-two-factor from 3.0.3 to 3.1.0 (#11550) 
Bumps [devise-two-factor](https://github.com/tinfoil/devise-two-factor) from 3.0.3 to 3.1.0.
- [Release notes](https://github.com/tinfoil/devise-two-factor/releases)
- [Changelog](https://github.com/tinfoil/devise-two-factor/blob/master/CHANGELOG.md)
- [Commits](https://github.com/tinfoil/devise-two-factor/compare/v3.0.3...v3.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-12 20:11:55 +09:00
dependabot-preview[bot] f07af657fa Bump puma from 4.0.1 to 4.1.0 (#11548) 
Bumps [puma](https://github.com/puma/puma) from 4.0.1 to 4.1.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/v4.0.1...v4.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-12 20:11:18 +09:00
dependabot-preview[bot] 59d6720a90 Bump faker from 2.1.0 to 2.1.2 (#11547) 
Bumps [faker](https://github.com/faker-ruby/faker) from 2.1.0 to 2.1.2.
- [Release notes](https://github.com/faker-ruby/faker/releases)
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md)
- [Commits](https://github.com/faker-ruby/faker/compare/v2.1.0...v2.1.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-12 20:10:16 +09:00
dependabot-preview[bot] d43305fa67 Bump webpack-dev-server from 3.7.2 to 3.8.0 (#11546) 
Bumps [webpack-dev-server](https://github.com/webpack/webpack-dev-server) from 3.7.2 to 3.8.0.
- [Release notes](https://github.com/webpack/webpack-dev-server/releases)
- [Changelog](https://github.com/webpack/webpack-dev-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack/webpack-dev-server/compare/v3.7.2...v3.8.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-12 20:08:37 +09:00
dependabot-preview[bot] 2e95fe660a Bump css-loader from 3.1.0 to 3.2.0 (#11544) 
Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 3.1.0 to 3.2.0.
- [Release notes](https://github.com/webpack-contrib/css-loader/releases)
- [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/css-loader/compare/v3.1.0...v3.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-12 20:07:57 +09:00
dependabot-preview[bot] 0b6540dda3 Bump terser-webpack-plugin from 1.3.0 to 1.4.1 (#11542) 
Bumps [terser-webpack-plugin](https://github.com/webpack-contrib/terser-webpack-plugin) from 1.3.0 to 1.4.1.
- [Release notes](https://github.com/webpack-contrib/terser-webpack-plugin/releases)
- [Changelog](https://github.com/webpack-contrib/terser-webpack-plugin/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/terser-webpack-plugin/compare/v1.3.0...v1.4.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-12 20:06:04 +09:00
dependabot-preview[bot] 1fdf24925a [Security] Bump nokogiri from 1.10.3 to 1.10.4 (#11540) 
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.3 to 1.10.4. **This update includes a security fix.**
- [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.10.3...v1.10.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-11 23:48:56 +02:00
ThibG bfa0b76a6c Fix ActivityPub and REST API queries setting cookies and preventing caching (#11539) 
Regression from #8657
 2019-08-11 22:59:40 +02:00
kedama 7bb4d0e751 Fix some emojis in profile metadata labels are not emojified. (#11534) 2019-08-11 13:15:18 +02:00
Eugen Rochko 826bc61c2c Fix account search always returning exact match on paginated results (#11525) 
Fix #11365
 2019-08-11 13:14:51 +02:00
Eugen Rochko 32ff86b6e5 Fix crash when saving invalid domain name (#11528) 
Fix #7629
 2019-08-08 23:04:19 +02:00
Eugen Rochko 24a5f99d10 Fix pinned statuses API returning pagination headers (#11526) 
Fix #10227
 2019-08-08 23:04:04 +02:00
Eugen Rochko 85466a2b9d Fix weekly usage not being displayed correctly in hashtag admin UI (#11524) 
Fix percentages in usage breakdown having too many digits

Change trending hashtags to only ask for review if a hashtag enters
the top 3 position in the set, since it's the only items shown in
the default web UI
 2019-08-08 23:03:28 +02:00
Eugen Rochko 5948fbf969 Add GIF and WebP support for custom emojis (#11519) 
Fix #11466
 2019-08-08 23:03:09 +02:00
ThibG a9d60cc0b4 Fix “read more” button behing hidden (regression from #11404) (#11522) 
* Fix “read more” button behing hidden (regression from #11404)

This has the side-effect of putting the “Read more” button below possibly
trunctated polls instead of putting the poll below the “Read more”

* Remove dead code
 2019-08-08 17:05:50 +02:00
ThibG f139faca5f Merge pull request #1194 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-08-08 09:25:00 +02:00
Thibaut Girka 68f5e8b9f8 Fix domain block edition in glitch-soc 2019-08-08 09:14:20 +02:00
Eugen Rochko aed7dca53b Fix "cancel follow request" button having unreadable text in web UI (#11521) 
Fix #11478
 2019-08-08 08:56:55 +02:00
Thibaut Girka 81c6f2fd0e Merge branch 'master' into glitch-soc/merge-upstream 2019-08-08 08:44:33 +02:00
Eugen Rochko 10b486f627 Fix acct URIs with IDN domains not being resolved (#11520) 
Fix #11494
 2019-08-07 21:14:08 +02:00
Eugen Rochko cc1e24ddc7 Add breakdown of usage by source to admin UI for hashtags (#11517) 
Allows determining where the majority of posts in a hashtag come
from on a given day at a glance.
 2019-08-07 20:20:39 +02:00
ThibG 072e696aa1 Add domain block notes (#11515) 
* Add database columns for adding notes to domain blocks/restrctions

* Add admin UI to set private and public comments when blocking a domain

* Add text for private and public comments on domain blocks

* Show domain block comments in admin UI

* Add comments to the domain block undo page

* Make UnblockDomainService more robust regarding upgraded domain blocks

* Allow editing domain blocks

* Rename button from “undo domain block” to “view domain block” in account admin UI

* Change test to unsilence silenced users from upgraded blocks
 2019-08-07 20:20:23 +02:00
ThibG 137654d4c1 Merge pull request #1193 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-08-07 20:04:22 +02:00
Eugen Rochko 25f549557b Fix trending tags returning less items than requested sometimes (#11513) 
Add better sorting defaults to the hashtags admin UI

Add "not reviewed" filter to hashtags admin UI
 2019-08-07 17:08:30 +02:00
Eugen Rochko bfb43d7104 Add number of pending accounts and pending hashtags to admin dashboard (#11514) 2019-08-07 16:13:34 +02:00
Eugen Rochko 37294ee595 [Glitch] Fix hashtag links always being lowercase 
Port 277acb8772 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-08-07 15:35:44 +02:00
ThibG ceed029a36 [Glitch] Improve focus handling with dropdown menus 
Port b169874828 to glitch-soc
 2019-08-07 15:11:59 +02:00
Thibaut Girka 6118e8fa04 Merge branch 'master' into glitch-soc/merge-upstream 2019-08-07 15:07:04 +02:00
ThibG b169874828 Improve focus handling with dropdown menus (#11511) 
- Focus first item when activated via keyboard
- When the dropdown menu closes, give back the focus to
  the actual element which was focused prior to opening the menu
 2019-08-07 13:58:53 +02:00
Thibaut Girka ff76f6de4f Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/models/user.rb
- app/serializers/initial_state_serializer.rb
- app/views/admin/dashboard/index.html.haml
- config/locales/simple_form.en.yml
 2019-08-07 13:56:48 +02:00
Eugen Rochko fd352ec288 Fix account tags not being saved correctly (#11507) 
* Fix account tags not being saved correctly

Regression from b838607

Fix Tag#discoverable not returning tags where listable is nil instead of true

Add notice when saving hashtags in admin UI

Change public hashtag and directory pages to return 404 for forbidden tags

* Remove unused locale string
 2019-08-07 10:01:55 +02:00
Eugen Rochko 277acb8772 Fix non-lowercase hashtags not being picked up by the streaming API (#11508) 
Regression from b838607

Fix hashtag links always being lowercase
 2019-08-07 10:01:19 +02:00