10ed0ddd2a
Merge pull request #775 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
51c53e709f
Set Content-Security-Policy rules through RoR's config ( #8957 )
...
* Set CSP rules in RoR's configuration
* Override CSP setting in the embed controller to allow frames
6 years ago
4121045113
Bump doorkeeper from 5.0.0 to 5.0.1 ( #8954 )
...
Bumps [doorkeeper](https://github.com/doorkeeper-gem/doorkeeper ) from 5.0.0 to 5.0.1.
- [Release notes](https://github.com/doorkeeper-gem/doorkeeper/releases )
- [Changelog](https://github.com/doorkeeper-gem/doorkeeper/blob/master/NEWS.md )
- [Commits](https://github.com/doorkeeper-gem/doorkeeper/compare/v5.0.0...v5.0.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
d0bf87b689
Add check for missing tag param in streaming API ( #8955 )
...
* Add check for missing tag param in streaming API
Fixes error:
```
TypeError: Cannot read property 'toLowerCase' of undefined
at app.get (.../streaming/index.js:493:50)
```
* Fix code style issues
6 years ago
70a7f72fda
Merge commit '0167397218110e26300bbc6891bc4b1849add083' into glitch-soc/merge-upstream
6 years ago
a441df3e19
Bump version to 2.5.1 ( #8953 )
6 years ago
b9e620946c
Fix typo in ActivityPub Create handler ( #8952 )
...
Regression from #8951
6 years ago
8efdf1a898
Do not push DMs into the home feed ( #8940 )
...
* Do not push DMs into the home feed
* Show DMs column after sending a DM, if DMs column is not already shown
6 years ago
ce087ef889
Move network calls out of transaction in ActivityPub handler ( #8951 )
...
Mention and emoji code may perform network calls, but does not need
to do that inside the database transaction. This may improve availability
of database connections when using pgBouncer in transaction mode.
6 years ago
0167397218
Bump better_errors from 2.4.0 to 2.5.0 ( #8946 )
...
Bumps [better_errors](https://github.com/BetterErrors/better_errors ) from 2.4.0 to 2.5.0.
- [Release notes](https://github.com/BetterErrors/better_errors/releases )
- [Changelog](https://github.com/BetterErrors/better_errors/blob/master/CHANGELOG.md )
- [Commits](https://github.com/BetterErrors/better_errors/compare/v2.4.0...v2.5.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
bf559a477a
Really fix HotKeys
6 years ago
9c66e239d1
Bump bullet from 5.7.5 to 5.7.6 ( #8947 )
...
Bumps [bullet](https://github.com/flyerhzm/bullet ) from 5.7.5 to 5.7.6.
- [Release notes](https://github.com/flyerhzm/bullet/releases )
- [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md )
- [Commits](https://github.com/flyerhzm/bullet/compare/5.7.5...5.7.6 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
de89e3670e
Bump scss_lint from 0.57.0 to 0.57.1 ( #8948 )
...
Bumps [scss_lint](https://github.com/brigade/scss-lint ) from 0.57.0 to 0.57.1.
- [Release notes](https://github.com/brigade/scss-lint/releases )
- [Changelog](https://github.com/brigade/scss-lint/blob/master/CHANGELOG.md )
- [Commits](https://github.com/brigade/scss-lint/compare/v0.57.0...v0.57.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
af3ef0afb0
Add description meta tag additionally to og:description ( #8941 )
...
Fix #8685
6 years ago
c227151023
Add dns-prefetch if using different host for assets or uploads ( #8942 )
6 years ago
8cb843039c
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
app/javascript/packs/public.js
Changes made to app/javascript/packs/publics.js were applied to
app/javascript/core/settings.js
6 years ago
02b17344fd
Bump capistrano-rails from 1.3.1 to 1.4.0 ( #8936 )
...
Bumps [capistrano-rails](https://github.com/capistrano/rails ) from 1.3.1 to 1.4.0.
- [Release notes](https://github.com/capistrano/rails/releases )
- [Changelog](https://github.com/capistrano/rails/blob/master/CHANGELOG.md )
- [Commits](https://github.com/capistrano/rails/compare/v1.3.1...v1.4.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
a1be1d17fe
Bump dotenv-rails from 2.2.2 to 2.5.0 ( #8934 )
...
Bumps [dotenv-rails](https://github.com/bkeepers/dotenv ) from 2.2.2 to 2.5.0.
- [Release notes](https://github.com/bkeepers/dotenv/releases )
- [Changelog](https://github.com/bkeepers/dotenv/blob/master/Changelog.md )
- [Commits](https://github.com/bkeepers/dotenv/compare/v2.2.2...v2.5.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
cf43973ecd
Fix that the copy button of verify link did not work. ( #8938 )
6 years ago
ad0f37e924
Track historical space stats in PgHero to determine PostgreSQL growth ( #8906 )
6 years ago
f9fc7d7660
Fix CW icon color in local-settings modal
6 years ago
d21c9f08e5
Define some local-settings hints
6 years ago
c40ba63f42
Add support for hints (or extended descriptions) in local-settings pages
6 years ago
c598692cdf
When screen width is too narrow, hide local-settings page text, keep only icons
6 years ago
56773bc55c
Change “preferences” icon to match settings page icon
6 years ago
065a19b18b
Add icons for each of the local-setting pages
6 years ago
02422158ae
Merge pull request #774 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
4580979e28
Bump faker from 1.8.7 to 1.9.1 ( #8935 )
...
Bumps [faker](https://github.com/stympy/faker ) from 1.8.7 to 1.9.1.
- [Release notes](https://github.com/stympy/faker/releases )
- [Changelog](https://github.com/stympy/faker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/stympy/faker/compare/v1.8.7...v1.9.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
dbaded7ed2
Bump memory_profiler from 0.9.11 to 0.9.12 ( #8937 )
...
Bumps [memory_profiler](https://github.com/SamSaffron/memory_profiler ) from 0.9.11 to 0.9.12.
- [Release notes](https://github.com/SamSaffron/memory_profiler/releases )
- [Changelog](https://github.com/SamSaffron/memory_profiler/blob/master/CHANGELOG.md )
- [Commits](https://github.com/SamSaffron/memory_profiler/compare/v0.9.11...v0.9.12 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
f09150f2a9
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
d73c1df33b
Merge pull request #770 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
e968dcea13
Fix app-wide hotkeys randomly failing to work
6 years ago
b7a337f63c
add ffmpeg initializer ( #8855 )
...
* add ffmpeg initializer
* use different expression to check for environment var
6 years ago
bcb43baf50
Add Japanese translations. ( #8927 )
6 years ago
683608dd60
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
96a313d02b
Fixed error occurrence when pinning the DM column. ( #8922 )
6 years ago
74e411f4e8
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
3f68e9ed11
Move “Show action buttons in collapsed toots” option
6 years ago
caa56b01a9
Switch from selects to radio buttons for local settings, improve styling
6 years ago
e303c0730f
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
7e089b5a31
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
63581a9262
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
098012ab39
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
00d31a292c
rubocop issues - Cleaning up ( #8912 )
...
* cleanup pass
* undo mistakes
* fixed.
* revert
6 years ago
65d1a2d10a
Remove dead code ( #8919 )
...
SignatureVerification#matches_time_window? is not called anywhere.
6 years ago
ea57aca5e1
Replace SVG asset with Custom mascot ( #8766 )
6 years ago
c9b5168ebd
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
58cbb9ef8f
[Glitch] Change documentation URL
...
Port 7635a136c9
6 years ago
52f97080e7
[Glitch] RTL: fix margins of public-account-header__tabs
...
Port e2065ceead
6 years ago
c8690cc917
Merge pull request #768 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
ThibG
dependabot[bot]
Eugen Rochko
mayaeh
Sascha
ashleyhull-versent