6e227ecb04
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
a1519a8ef5
Prevent from publicly boosting one's own private toots ( #10775 )
6 years ago
9ca21e93cc
Minor optimization
6 years ago
56245a2a72
Export fallback content type and use it as default in WebUI
6 years ago
dd5bf40b97
Properly escape HTML in code blocks
6 years ago
a6b7c23f6f
Add option for default toot content-type
6 years ago
0be93820f3
Fix autolinking, and newlines in code blocks
...
Autolinking is now performed *after* the Markdown pass, by replacing HTML
tags with zero-width spaces and running the twitter-text extractor as usual,
except it does not auto-link URLs to avoid links in links…
6 years ago
9df1ef87c2
Hide content-type dropdown by default
6 years ago
c2fa36bbae
Content-Type Dropdown: use the selected option icon for the menu
...
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years ago
93d98f62a8
Support proper content-type in Delete & Redraft
6 years ago
f34a402a94
Add status content type dropdown to compose box.
...
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years ago
14d7ddcb1c
Add API support for setting status content-type
6 years ago
b3e68de4d2
Serialize content-type on Delete & Redraft
6 years ago
d7520f8175
Add support for HTML-formatted toots
6 years ago
94aef563b9
Add support for markdown-formatted toots
6 years ago
bfc509f44a
Add database row to hold status content type
6 years ago
e976a9dfbd
Bump aws-sdk-s3 from 1.38.0 to 1.39.0 ( #10773 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.38.0 to 1.39.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/compare/v1.38.0...v1.39.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
520cfde793
i18n: Update Corsican translation ( #10770 )
...
* i18n: update Corsican translation
* Fix typo in co.yml
6 years ago
2310dd40fa
Bump capybara from 3.19.1 to 3.20.0 ( #10768 )
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.19.1 to 3.20.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.19.1...3.20.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
90093f1795
Bump aws-sdk-s3 from 1.36.1 to 1.38.0 ( #10769 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.36.1 to 1.38.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/compare/v1.36.1...v1.38.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
c1cf8c1636
Merge pull request #1049 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
6badf2d252
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
f4f22391b2
Update simple_form.fr.yml ( #10756 )
...
Remplacement des ' par des ’
6 years ago
c1c8c7b2c8
Minor performance improvements and cleanup in formatter ( #10765 )
6 years ago
4ab094d35e
Adds click-able div that expands status ( #10733 ) ( #10766 )
...
The clickable div is positioned under the account avatar and covers
all empty space below it to the end of the status.
6 years ago
14f6ce2885
Record account suspend/silence time and keep track of domain blocks ( #10660 )
...
* Record account suspend/silence time and keep track of domain blocks
* Also unblock users who were suspended/silenced before dates were recorded
* Add tests
* Keep track of suspending date for users suspended through the CLI
* Show accurate number of accounts that would be affected by unsuspending an instance
* Change migration to set silenced_at and suspended_at
* Revert "Also unblock users who were suspended/silenced before dates were recorded"
This reverts commit a015c65d2d1e28c7b7cfab8b3f8cd5fb48b8b71c.
* Switch from using suspended and silenced to suspended_at and silenced_at
* Add post-deployment migration script to remove `suspended` and `silenced` columns
* Use Account#silence! and Account#suspend! instead of updating the underlying property
* Add silenced_at and suspended_at migration to post-migration
* Change account fabricator to translate suspended and silenced attributes
* Minor fixes
* Make unblocking domains always retroactive
6 years ago
564106c5d6
Update slovak simple_forms ( #10763 )
6 years ago
76901b65c4
Bump capybara from 3.18.0 to 3.19.1 ( #10758 )
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.18.0 to 3.19.1.
- [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.18.0...3.19.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
5a24275202
Bump brakeman from 4.5.0 to 4.5.1 ( #10757 )
...
Bumps [brakeman](https://github.com/presidentbeef/brakeman ) from 4.5.0 to 4.5.1.
- [Release notes](https://github.com/presidentbeef/brakeman/releases )
- [Changelog](https://github.com/presidentbeef/brakeman/blob/master/CHANGES.md )
- [Commits](https://github.com/presidentbeef/brakeman/compare/v4.5.0...v4.5.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
d90104204f
Bump rubocop from 0.68.1 to 0.69.0 ( #10762 )
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.68.1 to 0.69.0.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases )
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.68.1...v0.69.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
4bab7d7640
Fix rich text style in reply indicator
6 years ago
87d16698c2
Fix rich text styling on public pages
6 years ago
cd534830ad
Fix text color of some formatted elements in notifications
6 years ago
3e15a845c1
Fix some colors in light theme ( #10754 )
...
* Fix typo in light theme
* Fix background color of empty column
6 years ago
dd118449c2
Fix incorrect reference to raw_content (it is raw_text instead) ( #10753 )
6 years ago
f6838a28f6
Merge pull request #1044 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
93085c273c
[Glitch] Use raw content if available on Delete & Redraft
...
Port front-end changes from 6d44f2441b
6 years ago
2b97d9d780
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
3ea5c045d7
Use a checkbox for the “Mark media as sensitive” composer button
...
Fixes #1039
6 years ago
fe00f7a7e4
Merge pull request #1043 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
6d44f2441b
Add toot source to delete result to ease Delete & Redraft ( #10669 )
...
* Return Status with raw text in raw_content when deleting a status
* Use raw content if available on delete & redraft
* Rename raw_content to text; do not serialize formatted content when source is requested
6 years ago
be851321c0
Use local time in audit log ( #10751 )
6 years ago
14d855c429
[Glitch] Improve poll link accessibility
...
Port 0402c52f28
6 years ago
78ff7e3821
[Glitch] Fix some colors of high contrast theme
...
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years ago
96f0747afe
[Glitch] Add confirm modal for unboosting toots
...
Port fe8a8f779e
6 years ago
775ee63b71
i18n: Update French translations ( #10747 )
...
* Update French JSON
* i18n: Update fr.yml
* i18n: Update simple_form.fr.yml
* Update simple_form.fr.yml
* Update fr.yml
6 years ago
d25e358f9f
i18n: Update Corsican translations ( #10746 )
...
* i18n: Update Corsican translations
* Update co.yml
* Fix a translation in co.yml
6 years ago
6dc9baad2a
Change icon and label depending on whether media is marked as sensitive ( #10748 )
...
* Change icon and label depending on whether media is marked as sensitive
* WiP use a checkbox
6 years ago
68629f2773
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/statuses_controller.rb
minor conflict because of glitch-soc's theming system
- app/controllers/stream_entries_controller.rb
minor conflict because of glitch-soc's theming system
6 years ago
d4d4e84324
Fix media description confirmation modal
...
Fixes #1040
6 years ago
Thibaut Girka