f509815379
Merge branch 'master' into glitch-soc/merge-upstream
2019-05-19 17:46:31 +02:00
2f3e4a64be
add og:image:alt for media attachments in embeds ( #10779 )
2019-05-18 20:57:45 +02:00
6fe474837c
Change poll options to alphabetic letters when status text is hidden ( #10685 )
...
Fix #10569
2019-05-18 14:41:16 +02:00
6e227ecb04
Merge branch 'master' into glitch-soc/merge-upstream
2019-05-18 10:04:32 +02:00
a1519a8ef5
Prevent from publicly boosting one's own private toots ( #10775 )
2019-05-18 00:28:51 +02:00
9ca21e93cc
Minor optimization
2019-05-17 23:51:14 +02:00
56245a2a72
Export fallback content type and use it as default in WebUI
2019-05-17 23:51:14 +02:00
dd5bf40b97
Properly escape HTML in code blocks
2019-05-17 23:51:14 +02:00
a6b7c23f6f
Add option for default toot content-type
2019-05-17 23:51:14 +02:00
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…
2019-05-17 23:51:14 +02:00
9df1ef87c2
Hide content-type dropdown by default
2019-05-17 23:51:14 +02:00
c2fa36bbae
Content-Type Dropdown: use the selected option icon for the menu
...
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-05-17 23:51:14 +02:00
93d98f62a8
Support proper content-type in Delete & Redraft
2019-05-17 23:51:14 +02:00
f34a402a94
Add status content type dropdown to compose box.
...
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-05-17 23:51:14 +02:00
14d7ddcb1c
Add API support for setting status content-type
2019-05-17 23:51:14 +02:00
b3e68de4d2
Serialize content-type on Delete & Redraft
2019-05-17 23:51:14 +02:00
d7520f8175
Add support for HTML-formatted toots
2019-05-17 23:51:14 +02:00
94aef563b9
Add support for markdown-formatted toots
2019-05-17 23:51:14 +02:00
bfc509f44a
Add database row to hold status content type
2019-05-17 23:51:14 +02:00
c1cf8c1636
Merge pull request #1049 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-05-15 18:44:21 +02:00
6badf2d252
Merge branch 'master' into glitch-soc/merge-upstream
2019-05-15 17:11:40 +02:00
c1c8c7b2c8
Minor performance improvements and cleanup in formatter ( #10765 )
2019-05-15 06:54:06 +02:00
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.
2019-05-15 06:53:23 +02:00
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
2019-05-14 19:05:02 +02:00
4bab7d7640
Fix rich text style in reply indicator
2019-05-13 17:13:02 +02:00
87d16698c2
Fix rich text styling on public pages
2019-05-13 17:13:02 +02:00
cd534830ad
Fix text color of some formatted elements in notifications
2019-05-12 19:23:32 +02:00
3e15a845c1
Fix some colors in light theme ( #10754 )
...
* Fix typo in light theme
* Fix background color of empty column
2019-05-12 05:15:42 +02:00
dd118449c2
Fix incorrect reference to raw_content (it is raw_text instead) ( #10753 )
2019-05-11 23:56:07 +02:00
93085c273c
[Glitch] Use raw content if available on Delete & Redraft
...
Port front-end changes from 6d44f2441b
2019-05-11 21:46:23 +02:00
2b97d9d780
Merge branch 'master' into glitch-soc/merge-upstream
2019-05-11 18:23:46 +02:00
3ea5c045d7
Use a checkbox for the “Mark media as sensitive” composer button
...
Fixes #1039
2019-05-11 12:35:38 +02:00
fe00f7a7e4
Merge pull request #1043 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-05-11 12:35:25 +02:00
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
2019-05-11 06:46:43 +02:00
be851321c0
Use local time in audit log ( #10751 )
2019-05-11 06:46:01 +02:00
14d855c429
[Glitch] Improve poll link accessibility
...
Port 0402c52f28
2019-05-10 19:05:57 +02:00
78ff7e3821
[Glitch] Fix some colors of high contrast theme
...
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-05-10 18:59:12 +02:00
96f0747afe
[Glitch] Add confirm modal for unboosting toots
...
Port fe8a8f779e
2019-05-10 18:56:01 +02:00
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
2019-05-10 18:09:46 +02:00
d25e358f9f
i18n: Update Corsican translations ( #10746 )
...
* i18n: Update Corsican translations
* Update co.yml
* Fix a translation in co.yml
2019-05-10 18:09:34 +02:00
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
2019-05-10 17:59:57 +02:00
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
2019-05-10 17:09:12 +02:00
d4d4e84324
Fix media description confirmation modal
...
Fixes #1040
2019-05-10 11:49:00 +02:00
fe8a8f779e
Add confirm modal for unboosting toots ( #10287 )
...
[#3815 ]
Display the boost modal also when unboosting toots.
2019-05-09 22:39:26 +02:00
f2be71c293
Add emoji suggestions to CW and poll option fields ( #10555 )
...
* Refactor selectComposeSuggestion so that different paths can be updated
* Add suggestions in CW field
* Add emoji suggestion to poll options
* Attempt to fix CSS
* Hide suggestions by default
They will be enabled if the input has focus
2019-05-09 22:10:27 +02:00
62f5235b6f
Prevent silenced local users from notifying remote users not following them ( #10575 )
...
* Prevent silenced local users from notifying remote users not following them
This is an attempt to extend the local restrictions of silenced users to the
federation.
* Add tests
* Add tests for making sure private status don't get sent over OStatus
2019-05-09 22:05:43 +02:00
26fc21c188
Add some caching for HTML versions of statuses pages ( #10701 )
2019-05-09 22:03:44 +02:00
0402c52f28
Improve poll link accessibility ( #10720 )
...
* Add distinction between hover and active/focus states
* Resolves #10198
2019-05-09 22:03:32 +02:00
ce8635605c
Record deleted(by mod) status to prevent re-appear ( #10732 )
...
* Record deleted(by mod) status to prevent re-appear
* Move to Tombstone
* Add missing migration script
2019-05-09 22:03:02 +02:00
09eea46631
Bring back crossed eye icon on gallery ( #10715 )
2019-05-08 18:01:33 +02:00
Thibaut Girka
Ben Lubar
Eugen Rochko
Haelwenn (lanodan) Monnier
KokaKiwi
Neil Moore
nzws
Maciek Baron
nzws
Aurélien Reeves
Alix Rossi
Jeong Arm