about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2018-10-09When screen width is too narrow, hide local-settings page text, keep only iconsThibaut Girka
2018-10-09Change “preferences” icon to match settings page iconThibaut Girka
2018-10-09Add icons for each of the local-setting pagesThibaut Girka
2018-10-09Merge pull request #774 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2018-10-09Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-10-09Merge pull request #770 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2018-10-09Fix app-wide hotkeys randomly failing to workThibaut Girka
2018-10-09add ffmpeg initializer (#8855)Sascha
* add ffmpeg initializer * use different expression to check for environment var
2018-10-09Add Japanese translations. (#8927)mayaeh
2018-10-08Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-10-08Fixed error occurrence when pinning the DM column. (#8922)mayaeh
2018-10-08Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-10-08Move “Show action buttons in collapsed toots” optionThibaut Girka
2018-10-08Switch from selects to radio buttons for local settings, improve stylingThibaut Girka
2018-10-08Bump capybara from 3.8.2 to 3.9.0 (#8924)dependabot[bot]
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-08Bump tty-prompt from 0.17.0 to 0.17.1 (#8925)dependabot[bot]
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-08Bump aws-sdk-s3 from 1.20.0 to 1.21.0 (#8926)dependabot[bot]
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-08Bump i18n-tasks from 0.9.21 to 0.9.25 (#8923)dependabot[bot]
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-08rubocop issues - Cleaning up (#8912)ashleyhull-versent
* cleanup pass * undo mistakes * fixed. * revert
2018-10-08Remove dead code (#8919)Eugen Rochko
SignatureVerification#matches_time_window? is not called anywhere.
2018-10-08Replace SVG asset with Custom mascot (#8766)ashleyhull-versent
2018-10-07Add conversations API (#8832)Eugen Rochko
* 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[Glitch] Change documentation URLThibaut Girka
Port 28401962caff028f328d674878e1f0abd16ffdfd to glitch-soc
2018-10-07[Glitch] RTL: fix margins of public-account-header__tabsThibaut Girka
Port 185cb2dc3aac59ee27aa962fff48b064bd638567 to glitch-soc
2018-10-07Merge pull request #768 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2018-10-07Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-10-07Ensure only toots from the reported users are reported (#8916)ThibG
2018-10-07Add POST /api/v1/notifications/:id/dismiss (#8905)Eugen Rochko
POST /api/v1/notifications/dismiss was a mistake in #2251
2018-10-07Do not scroll timelines when *closing* media modalsThibaut Girka
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-07Add fallback for PostgreSQL without upsert in CopyStatusStats (#8903)Eugen Rochko
Fix #8590
2018-10-06i18n: Update Polish translation (#8901)Marcin Mikołajczak
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-10-06Improve production build config (#8899)bsky
2018-10-06Change documentation URL (#8898)Eugen Rochko
* Change documentation URL * Fix hardcoded documentation URL in locales
2018-10-06Remove unused ruby-progressbar dependency (#8896)Eugen Rochko
* Remove unused ruby-progressbar dependency * Remove unused colorize dependency
2018-10-06RTL: fix margins of public-account-header__tabs (#8897)Masoud Abkenar
* RTL: fix margins of public-account-header__tabs * fix style * even more stylish code :)
2018-10-05Merge pull request #764 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2018-10-05Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-10-05Leave unknown language as nil if account is remote (#8861)Jeong Arm
* Force use language detector if account is remote * Set unknown remote toot's language as nil
2018-10-05[Glitch] Add a confirmation dialog when hitting reply and the compose box ↵Thibaut Girka
isn't empty
2018-10-05Merge pull request #762 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2018-10-05Bump omniauth-saml from 1.10.0 to 1.10.1 (#8885)dependabot[bot]
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-05Bump parallel_tests from 2.21.3 to 2.23.0 (#8884)dependabot[bot]
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-05Bump puma from 3.11.4 to 3.12.0 (#8883)dependabot[bot]
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-05Add a confirmation dialog when hitting reply and the compose box isn't empty ↵ThibG
(#8893) * Add a confirmation dialog when hitting reply and the compose box isn't empty Fixes #878 * Performance improvement
2018-10-05Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
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[Security] Bump nokogiri from 1.8.4 to 1.8.5 (#8881)dependabot[bot]
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-04lint pass 2 (#8878)aus-social
* Code quality pass * Typofix * Update applications_controller_spec.rb * Update applications_controller_spec.rb
2018-10-04Limit the number of people that can be followed from one account (#8807)Eugen Rochko
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-04Add tootctl settings registrations open (#8829)Eugen Rochko
2018-10-04Change admin accounts default sort to most recent (#8813)Eugen Rochko