about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2019-02-10Adjust scroll when statuses above the current scroll position are deletedThibaut Girka
2019-02-10Adjust scroll if previewCard appearedThibaut Girka
2019-02-10Avoid two-step rendering of statuses as much as possibleThibaut Girka
Cache width shared by Video player, MediaGallery and Cards at the ScrollableList level, pass it down through StatusList and Notifications.
2019-02-10Refactor intersection observer article codeThibaut Girka
2019-02-10Cleanup redundant markup for hidden statusesThibaut Girka
2019-02-10Hide items rendered out-of-frame (once they have been rendered at least once)Thibaut Girka
2019-02-10[Glitch] Rename from instance to server.Thibaut Girka
Port 46e806cd2f14a5e45d66b4c23040855202818984 to glitch-soc
2019-02-10[Glitch] Fix not showing custom emojis in share page emoji pickerThibaut Girka
Port e02a13f64e5c2c93fa73a67a4ce32a7d1df24760 to glitch-soc
2019-02-10[Glitch] Add featured hashtags to profilesThibaut Girka
Port SCSS changes from 364f2ff9aa2b4bf601d68a12bce758aeb5530467
2019-02-10[Glitch] Allow multiple files upload through web UI, including drag & dropThibaut Girka
Port 750c67660de753065ec160b4e389ba0dda2f81cc to glitch-soc
2019-02-10[Glitch] Add missing rejection handling for PromisesThibaut Girka
Port missing parts from 2c51bc0ca5a4c3a4bb140b4b40dabdda859ebb94 to glitch-soc
2019-02-10[Glitch] Add WebP supportThibaut Girka
Port 5092d17f2936146fa26e5d8a9b9e391f77010f28 to glitch-soc
2019-02-10Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/controllers/oauth/authorized_applications_controller.rb Two changes too close to each other - app/controllers/settings/sessions_controller.rb - app/lib/user_settings_decorator.rb Two changes too close to each other - app/models/media_attachment.rb New changes too close to glitch-soc only changes. - app/models/user.rb Two changes too close to each other. - app/services/remove_status_service.rb Kept direct timeline code which had been removed upstream. - app/views/settings/preferences/show.html.haml Two changes too close to each other. - config/locales/en.yml Introduction of a new string too close to glitch-soc-only's “flavour” - config/locales/ja.yml Introduction of a new string too close to glitch-soc-only's “flavour” - config/locales/pl.yml Introduction of a new string too close to glitch-soc-only's “flavour” - config/locales/simple_form.en.yml Introduction of a new string too close to glitch-soc-only's “skin” - config/locales/simple_form.pl.yml Introduction of a new string too close to glitch-soc-only's “skin” - config/settings.yml Reverted upstream's decision of enabling posting application by default.
2019-02-10Bump parallel_tests from 2.27.1 to 2.28.0 (#9985)dependabot[bot]
Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 2.27.1 to 2.28.0. - [Release notes](https://github.com/grosser/parallel_tests/releases) - [Commits](https://github.com/grosser/parallel_tests/compare/v2.27.1...v2.28.0) Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-02-10i18n: add Japanese translations (#10000)mayaeh
* Add Japanese translations. * Probably change to more general "統合" than "マージ" .
2019-02-09Fix URL linkifier grabbing full-width spaces and quotations (#9997)Eugen Rochko
Fix #9993 Fix #5654
2019-02-09Enable "displaying application used to post" setting by default (#9994)rinsuki
related: https://github.com/tootsuite/mastodon/pull/9897#issuecomment-461093615
2019-02-09 Only URLs extract with pre-escaped text (#9991)Hinaloe
* [test] add japanese hashtag testcase * Only URLs extract with pre-escaped text ( https://github.com/tootsuite/mastodon/issues/9989 )
2019-02-06Fix IntersectionObserverArticle not hiding some out-of-view items (#9982)ThibG
IntersectionObserverArticle is made to save on RAM by avoiding fully rendering items that are far out of view. However, it did not work for items spawned outside the intersection observer.
2019-02-06Bump microformats from 4.0.7 to 4.1.0 (#9980)dependabot[bot]
Bumps [microformats](https://github.com/microformats/microformats-ruby) from 4.0.7 to 4.1.0. - [Release notes](https://github.com/microformats/microformats-ruby/releases) - [Commits](https://github.com/microformats/microformats-ruby/compare/v4.0.7...v4.1.0) Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-02-06Fix CW unfolding not triggering re-layout in public hashtag pageThibaut Girka
2019-02-06Fix unfolding CWs on public hashtag pageThibaut Girka
Fixes #909
2019-02-06Fix Tombstone.delete_all ArgumentError (#9978)abcang
2019-02-05Rename from instance to server. (#9938)mayaeh
2019-02-05i18n: Update Polish translation 🇵 (#9974)marcin mikołajczak
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2019-02-05Do not use apk cache and upgrade (#9966)J0WI
2019-02-05Replace LibreSSL by OpenSSL (#9975)J0WI
2019-02-05Hide misleading “You will be sent a confirmation e-mail” hint from admin ↵ThibG
view (#9973) Thanks @wryk for noticing this issue.
2019-02-05Fix it as tagged_request of accounts_controller is not addressable_uri (#9976)Takeshi Umeda
2019-02-05Update Dockerfile (#9965)ashleyhull-versent
2019-02-05[UI] Fix whitespace being applied to div instead of p (#9968)trwnh
* fix large line breaks * fix ascii art posts
2019-02-05Fix pinned statuses being shown in a featured hashtag (#9971)Eugen Rochko
2019-02-04Fix not showing custom emojis in share page emoji picker (#9970)rinsuki
2019-02-04Fix authorized applications list page design (#9969)rinsuki
2019-02-04Use video filesize limit with gifv (#9924)rinsuki
2019-02-04change "finish tutorial" text to "finish toot-orial" (#9905)mike castleman
2019-02-04Add featured hashtags to profiles (#9755)Eugen Rochko
* Add hashtag filter to profiles GET /@:username/tagged/:hashtag GET /api/v1/accounts/:id/statuses?tagged=:hashtag * Display featured hashtags on public profile * Use separate model for featured tags * Update featured hashtag counters on-write * Limit featured tags to 10
2019-02-03Add option to overwrite imported data (#9962)Eugen Rochko
* Add option to overwrite imported data Fix #7465 * Add import for domain blocks
2019-02-03Bump capybara from 3.12.0 to 3.13.2 (#9935)dependabot[bot]
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.12.0 to 3.13.2. - [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.12.0...3.13.2) Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-02-03Bump httplog from 1.2.0 to 1.2.1 (#9942)dependabot[bot]
Bumps [httplog](https://github.com/trusche/httplog) from 1.2.0 to 1.2.1. - [Release notes](https://github.com/trusche/httplog/releases) - [Changelog](https://github.com/trusche/httplog/blob/master/CHANGELOG.md) - [Commits](https://github.com/trusche/httplog/compare/v1.2.0...v1.2.1) Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-02-03Remove redundant “options” from “Compose box options”Thibaut Girka
Thanks @ariasuni.
2019-02-03Minor description correctionsMarek Ľach
2019-02-02Allow multiple files upload through web UI, including drag & drop (#9856)tmm576
* Allow drag and drop uploads of multiple files to compose * Calculate aggregate upload progress for single action * Allow multiple uploads to compose through traditional input, consolidate update file limit logic, provide file limit feedback
2019-02-02Re-enable ignored translations that is needed (#7842)Jeong Arm
Some of strings should be translated.
2019-02-02Make displaying application used to toot opt-in (#9897)ThibG
* Make storing and displaying application used to toot opt-in * Revert to storing application info, and display it to the author via API
2019-02-02Create Redisable#redis (#9633)ysksn
* Create Redisable * Use #redis instead of Redis.current
2019-02-02Allow most kinds of characters in URL query (fixes #8408) (#8447)Jakub Mendyk
* Allow unicode characters in URL query strings Fixes #8408 * Alternative approach to unicode support in urls Adds PoC/idea to approch this problem.
2019-02-02Add WebP support (#9879)Acid Chicken (硫酸鶏)
* Add WebP support * Remove the changes to the tooltip refs: https://github.com/tootsuite/mastodon/pull/9879#pullrequestreview-199312528
2019-02-02Upgrade new Web Share Target API (#9963)gol-cha
* Update manifest.json for new Web Share Target API. * fix code formatting
2019-02-01Merge pull request #904 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes