122ac9cd1d
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
4134a10549
Merge pull request #770 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
d0b1369a85
Fix app-wide hotkeys randomly failing to work
6 years ago
b2a57a5d6f
add ffmpeg initializer ( #8855 )
...
* add ffmpeg initializer
* use different expression to check for environment var
6 years ago
87abbb07f3
Add Japanese translations. ( #8927 )
6 years ago
b368d3c15d
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
770e337497
Fixed error occurrence when pinning the DM column. ( #8922 )
6 years ago
d17844e6d1
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
96c3d26870
Move “Show action buttons in collapsed toots” option
6 years ago
faecb35fe0
Switch from selects to radio buttons for local settings, improve styling
6 years ago
4c4ff05a46
Bump capybara from 3.8.2 to 3.9.0 ( #8924 )
...
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>
6 years ago
8639f000ea
Bump tty-prompt from 0.17.0 to 0.17.1 ( #8925 )
...
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>
6 years ago
10e38b441f
Bump aws-sdk-s3 from 1.20.0 to 1.21.0 ( #8926 )
...
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>
6 years ago
87ad9c408c
Bump i18n-tasks from 0.9.21 to 0.9.25 ( #8923 )
...
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>
6 years ago
f194857ac9
rubocop issues - Cleaning up ( #8912 )
...
* cleanup pass
* undo mistakes
* fixed.
* revert
6 years ago
a00ce8c92c
Remove dead code ( #8919 )
...
SignatureVerification#matches_time_window? is not called anywhere.
6 years ago
2dba313100
Replace SVG asset with Custom mascot ( #8766 )
6 years ago
774ac47373
Add conversations API ( #8832 )
...
* 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
6 years ago
a3677a828d
[Glitch] Change documentation URL
...
Port 28401962ca
6 years ago
b4ba1058b8
[Glitch] RTL: fix margins of public-account-header__tabs
...
Port 185cb2dc3a
6 years ago
f1c3053d36
Merge pull request #768 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
611740ce81
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
25744d43b0
Ensure only toots from the reported users are reported ( #8916 )
6 years ago
09d789e79b
Add POST /api/v1/notifications/:id/dismiss ( #8905 )
...
POST /api/v1/notifications/dismiss was a mistake in #2251
6 years ago
7cc7843109
Do not scroll timelines when *closing* media modals
...
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.
6 years ago
886af5ce19
Add fallback for PostgreSQL without upsert in CopyStatusStats ( #8903 )
...
Fix #8590
6 years ago
2fb692ea45
i18n: Update Polish translation ( #8901 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
6 years ago
84f82ee2fe
Improve production build config ( #8899 )
6 years ago
28401962ca
Change documentation URL ( #8898 )
...
* Change documentation URL
* Fix hardcoded documentation URL in locales
6 years ago
30dd7f3d90
Remove unused ruby-progressbar dependency ( #8896 )
...
* Remove unused ruby-progressbar dependency
* Remove unused colorize dependency
6 years ago
185cb2dc3a
RTL: fix margins of public-account-header__tabs ( #8897 )
...
* RTL: fix margins of public-account-header__tabs
* fix style
* even more stylish code :)
6 years ago
f990b9c768
Merge pull request #764 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
98bb6815a7
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
144d73730d
Leave unknown language as nil if account is remote ( #8861 )
...
* Force use language detector if account is remote
* Set unknown remote toot's language as nil
6 years ago
c6e4c48942
[Glitch] Add a confirmation dialog when hitting reply and the compose box isn't empty
6 years ago
515ce8f469
Merge pull request #762 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
9a42b75f00
Bump omniauth-saml from 1.10.0 to 1.10.1 ( #8885 )
...
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>
6 years ago
6812f811b1
Bump parallel_tests from 2.21.3 to 2.23.0 ( #8884 )
...
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>
6 years ago
7c154c6afd
Bump puma from 3.11.4 to 3.12.0 ( #8883 )
...
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>
6 years ago
42aecb4c13
Add a confirmation dialog when hitting reply and the compose box isn't empty ( #8893 )
...
* Add a confirmation dialog when hitting reply and the compose box isn't empty
Fixes #878
* Performance improvement
6 years ago
00fcdebed7
Merge branch 'master' into glitch-soc/merge-upstream
...
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.
6 years ago
028ad4124c
[Security] Bump nokogiri from 1.8.4 to 1.8.5 ( #8881 )
...
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>
6 years ago
0a4739c732
lint pass 2 ( #8878 )
...
* Code quality pass
* Typofix
* Update applications_controller_spec.rb
* Update applications_controller_spec.rb
6 years ago
a46ab86adf
Limit the number of people that can be followed from one account ( #8807 )
...
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
6 years ago
186024a058
Add tootctl settings registrations open ( #8829 )
6 years ago
e645ae9561
Change admin accounts default sort to most recent ( #8813 )
6 years ago
7fe137d2f7
Fix link verification for remote accounts ( #8868 )
6 years ago
49b182cd51
Dockerfile: update Node to 8.12.0 and put Ruby on Alpine 3.7 for build system memory help ( #8842 )
6 years ago
da8abef56d
Bump fog-openstack, rspec-rails and fog-core ( #8877 )
...
Bumps [fog-openstack](https://github.com/fog/fog-openstack ), [rspec-rails](https://github.com/rspec/rspec-rails ) and [fog-core](https://github.com/fog/fog-core ). These dependencies needed to be updated together.
Updates `fog-openstack` from 0.3.6 to 1.0.3
- [Release notes](https://github.com/fog/fog-openstack/releases )
- [Changelog](https://github.com/fog/fog-openstack/blob/master/CHANGELOG.md )
- [Commits](https://github.com/fog/fog-openstack/compare/v0.3.6...v1.0.3 )
Updates `rspec-rails` from 3.7.2 to 3.8.0
- [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.7.2...v3.8.0 )
Updates `fog-core` from 1.45.0 to 2.1.2
- [Release notes](https://github.com/fog/fog-core/releases )
- [Changelog](https://github.com/fog/fog-core/blob/master/changelog.md )
- [Commits](https://github.com/fog/fog-core/compare/v1.45.0...v2.1.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
1f98eae1cf
Lint pass ( #8876 )
6 years ago
Thibaut Girka