Skip to content
Permalink
Branch: master
Commits on Dec 12, 2019
  1. Fix edit filter link in filtered “Show why” dialog

    ThibG committed Dec 12, 2019
  2. Merge pull request #1252 from ThibG/glitch-soc/merge-upstream

    ThibG committed Dec 12, 2019
    Merge upstream changes
  3. Merge branch 'master' into glitch-soc/merge-upstream

    ThibG committed Dec 12, 2019
    Conflicts:
    - app/controllers/application_controller.rb
      Minor conflict due to glitch-soc's theming system
Commits on Dec 11, 2019
  1. Bump aws-sdk-s3 from 1.57.0 to 1.59.0 (tootsuite#12581)

    dependabot-preview authored and ykzts committed Dec 11, 2019
    Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.57.0 to 1.59.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](aws/aws-sdk-ruby@v1.57.0...v1.59.0)
    
    Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
  2. Bump yargs from 13.3.0 to 15.0.2 (tootsuite#12574)

    dependabot-preview authored and ykzts committed Dec 11, 2019
    Bumps [yargs](https://github.com/yargs/yargs) from 13.3.0 to 15.0.2.
    - [Release notes](https://github.com/yargs/yargs/releases)
    - [Changelog](https://github.com/yargs/yargs/blob/master/CHANGELOG.md)
    - [Commits](yargs/yargs@v13.3.0...v15.0.2)
    
    Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
  3. Bump es6-symbol from 3.1.2 to 3.1.3 (tootsuite#12577)

    dependabot-preview authored and ykzts committed Dec 11, 2019
    Bumps [es6-symbol](https://github.com/medikoo/es6-symbol) from 3.1.2 to 3.1.3.
    - [Release notes](https://github.com/medikoo/es6-symbol/releases)
    - [Changelog](https://github.com/medikoo/es6-symbol/blob/master/CHANGELOG.md)
    - [Commits](medikoo/es6-symbol@v3.1.2...v3.1.3)
    
    Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
  4. Bump @babel/core from 7.7.4 to 7.7.5 (tootsuite#12578)

    dependabot-preview authored and ykzts committed Dec 11, 2019
    Bumps [@babel/core](https://github.com/babel/babel) from 7.7.4 to 7.7.5.
    - [Release notes](https://github.com/babel/babel/releases)
    - [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
    - [Commits](babel/babel@v7.7.4...v7.7.5)
    
    Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
  5. Bump @babel/plugin-transform-runtime from 7.7.4 to 7.7.6 (tootsuite#1…

    dependabot-preview authored and ykzts committed Dec 11, 2019
    …2575)
    
    Bumps [@babel/plugin-transform-runtime](https://github.com/babel/babel) from 7.7.4 to 7.7.6.
    - [Release notes](https://github.com/babel/babel/releases)
    - [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
    - [Commits](babel/babel@v7.7.4...v7.7.6)
    
    Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Commits on Dec 10, 2019
  1. Bump strong_migrations from 0.4.2 to 0.5.0 (tootsuite#12583)

    dependabot-preview authored and Gargron committed Dec 10, 2019
    Bumps [strong_migrations](https://github.com/ankane/strong_migrations) from 0.4.2 to 0.5.0.
    - [Release notes](https://github.com/ankane/strong_migrations/releases)
    - [Changelog](https://github.com/ankane/strong_migrations/blob/master/CHANGELOG.md)
    - [Commits](ankane/strong_migrations@v0.4.2...v0.5.0)
    
    Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Commits on Dec 9, 2019
  1. Use codeblock for native redirect URI (tootsuite#12570)

    Sasha-Sorokin authored and Gargron committed Dec 9, 2019
    This commit changes how doorkeeper.applications.help.native_redirect_uri
    string is being formatted to use <code> tag for native_redirect_uri
    placeholder. This makes the URI look more distinguishable.
Commits on Dec 8, 2019
  1. Merge pull request #1251 from ThibG/glitch-soc/merge-upstream

    ThibG committed Dec 8, 2019
    Merge upstream changes
Commits on Dec 7, 2019
  1. Fix erroneous inclusion of upstream code

    ThibG committed Dec 7, 2019
  2. [Glitch] Highlight border when focusing poll-form footer

    hinaloe authored and ThibG committed Dec 4, 2019
    Port eb551c4 to glitch-soc
    
    Signed-off-by: Thibaut Girka <thib@sitedethib.com>
  3. [Glitch] Add basic support for group actors

    noellabo authored and ThibG committed Dec 4, 2019
    Port f43f1e0 to glitch-soc
    
    Signed-off-by: Thibaut Girka <thib@sitedethib.com>
  4. [Glitch] Fix poll options not being selectable via keyboard

    ThibG committed Dec 3, 2019
    Port c05ed8a to glitch-soc
    
    Signed-off-by: Thibaut Girka <thib@sitedethib.com>
  5. [Glitch] Add follow_request notification type

    ThibG committed Dec 1, 2019
    Port 911cc14 to glitch-soc
    
    Signed-off-by: Thibaut Girka <thib@sitedethib.com>
  6. [Glitch] upgrade/replace websocket.js to @gamestdio/websocket v2

    2 people authored and ThibG committed Dec 4, 2019
    Port f92ed32 to glitch-soc
    
    Co-authored-by: hina <hina@hinaloe.net>
    Signed-off-by: Thibaut Girka <thib@sitedethib.com>
  7. Merge branch 'master' into glitch-soc/merge-upstream

    ThibG committed Dec 7, 2019
    Conflicts:
    - package.json
      Not really a conflict, caused by an additional dependency in glitch-soc.
    - yarn.lock
      Not really a conflict, caused by an additional dependency in glitch-soc.
Commits on Dec 6, 2019
  1. Fix account search with no query (tootsuite#12549)

    trwnh authored and Gargron committed Dec 6, 2019
    * Fix account search with no query
    
    Modeled after tootsuite#12541. Fix tootsuite#12548
    
    * fix codeclimate
  2. [Security] Bump puma from 4.2.0 to 4.3.1 (tootsuite#12559)

    dependabot-preview authored and Gargron committed Dec 6, 2019
    Bumps [puma](https://github.com/puma/puma) from 4.2.0 to 4.3.1. **This update includes a security fix.**
    - [Release notes](https://github.com/puma/puma/releases)
    - [Changelog](https://github.com/puma/puma/blob/master/History.md)
    - [Commits](puma/puma@v4.2.0...v4.3.1)
    
    Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Commits on Dec 4, 2019
  1. Fix media open hotkey (tootsuite#12546)

    Kjwon15 authored and Gargron committed Dec 4, 2019
  2. Add basic support for group actors (tootsuite#12071)

    noellabo authored and Gargron committed Dec 4, 2019
    * Show badge on group actor in WebUI
    
    * Do not notify in case of  by following group actor
    
    * If you mention group actor, also mention group actor followers
    
    * Relax characters that can be used in username (same as Application)
    
    * Revert "Relax characters that can be used in username (same as Application)"
    
    This reverts commit 7e10a13.
    
    * Delete display_name method
Older
You can’t perform that action at this time.