0bb3ba2406
Merge pull request #1043 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-05-11 12:35:25 +02:00
2a917031c9
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
d35f558b37
Use local time in audit log ( #10751 )
2019-05-11 06:46:01 +02:00
e060819020
[Glitch] Improve poll link accessibility
...
Port fc40391743
2019-05-10 19:05:57 +02:00
f625501c05
[Glitch] Fix some colors of high contrast theme
...
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-05-10 18:59:12 +02:00
22541e98e2
[Glitch] Add confirm modal for unboosting toots
...
Port d225a952a8
2019-05-10 18:56:01 +02:00
062684bcf8
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
1959e4e5ec
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
01ba6c5d83
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
1bf48b01e3
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
e55cf0042f
Fix media description confirmation modal
...
Fixes #1040
2019-05-10 11:49:00 +02:00
d225a952a8
Add confirm modal for unboosting toots ( #10287 )
...
[#3815 ]
Display the boost modal also when unboosting toots.
2019-05-09 22:39:26 +02:00
5cf2f8c646
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
a571b07557
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
4870d7f122
Add some caching for HTML versions of statuses pages ( #10701 )
2019-05-09 22:03:44 +02:00
fc40391743
Improve poll link accessibility ( #10720 )
...
* Add distinction between hover and active/focus states
* Resolves #10198
2019-05-09 22:03:32 +02:00
5ad2a7b5dc
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
3288f4a571
Bring back crossed eye icon on gallery ( #10715 )
2019-05-08 18:01:33 +02:00
e9f0c31dc6
Fix tabs bar on mobile
...
Fixes #1037
2019-05-08 00:32:53 +02:00
6b71076391
Fix some colors of high contrast theme ( #10711 )
...
* Fix "nothing here" text color of high contrast
* Fix counter border color of high contrast
2019-05-07 23:53:58 +02:00
40a480ea34
Fix front-end crash when a video has a blurhash and is hidden behind a CW
2019-05-07 22:33:37 +02:00
13244f7bb3
i18n Update Catalan translation ( #10719 )
...
* Updated Catalan strings
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update simple_form.ca.yml
* Update simple_form.ca.yml
* Update simple_form.ca.yml
* bundle exec i18n-tasks
* Update ca.json
* Update simple_form.ca.yml
* i18n: Update Catalan translations
* i18n: Update Catalan translations
* i18n: Update Catalan translations
* i18n: Update Catalan translations
* i18n: Update Catalan translations
* i18n: Update Catalan translations
* i18n: Update Catalan translations
* i18n: Update Catalan translations
* i18n: Update Catalan translations
* i18n: Update Catalan translation
* i18n Update Catalan translation
2019-05-07 00:55:37 +09:00
139ef769f7
Add description on hover in media gallery ( #10713 )
2019-05-06 05:33:56 +02:00
5052b8c29f
Fix content warning button displaying a link icon when no status card is set
2019-05-05 21:47:05 +02:00
683a5ae765
i18n: Update Japanese translations ( #10706 )
...
* Update Japanese translations.
run yarn manage:translations
This commit includes translations by some users that were done at the transifex.
* Reduce translation text because it becomes two lines.
2019-05-06 04:34:32 +09:00
027f35c6a5
1 NL string update ( #10709 )
...
* 1 NL string update
No that weblate isn't used anymore, it would be fine if, or the english strings are update, or there is somewhere an explanation how to generate new strings for a language
* Update nl.json
2019-05-06 04:33:24 +09:00
1592cab613
fix pinned columns ’s Media-only button
...
Media-only toggles could not be used on pinned columns.
The commit fixes this problem.
2019-05-05 20:54:21 +02:00
83665f0357
[Glitch] Make sure the instance banner is never cropped
...
Port 05b2a77a6d
2019-05-05 12:29:06 +02:00
23829e09f5
Merge branch 'master' into glitch-soc/merge-upstream
2019-05-05 12:28:10 +02:00
71fd62835e
I18n: Update Czech translation 🇨🇿 ( #10704 )
...
* I18n: Update Czech translation
* Tiny fix
2019-05-05 15:33:33 +09:00
05b2a77a6d
Make sure the instance banner is never cropped ( #10702 )
2019-05-05 01:07:15 +02:00
850f8195fd
Minor style fixes
2019-05-04 23:05:43 +02:00
5df7b98c2b
[Glitch] Change font weight of sensitive button to 500
...
Port f7879bbe08
2019-05-04 20:41:21 +02:00
8050f86d04
[Glitch] Make the "mark media as sensitive" button more obvious in web UI
...
Port cc39785d45
2019-05-04 20:41:21 +02:00
167808363d
Add visibility icon back in media gallery
2019-05-04 20:06:17 +02:00
43dc5ad0e5
Add back description on hover
2019-05-04 20:03:37 +02:00
d0342a1a63
[Glitch] Fix transition: all
...
Port 9e044c9649
2019-05-04 19:53:09 +02:00
09d6a2920d
[Glitch] Make the cursor icon consistant across media types in account media gallery
2019-05-04 19:16:51 +02:00
5d6f4ef070
Merge branch 'master' into glitch-soc/merge-upstream
2019-05-04 19:15:50 +02:00
52c09770fe
[Glitch] Add button to view context to media modal
...
Port 4aabc452d0
2019-05-04 19:10:24 +02:00
6138cad296
[Glitch] Fix alignment of items in the account gallery in web UI and load more per page
...
Port 78f5b96bf6
2019-05-04 18:59:11 +02:00
3b9ff1fa34
[Glitch] Change account gallery in web UI
...
Port db73f8e585
2019-05-04 18:54:57 +02:00
61b5fd518c
Minor CSS fixes
2019-05-04 18:18:15 +02:00
87a7a9a4df
[Glitch] Add blurhash
...
Port front-end changes from a6d2fe7165
2019-05-04 18:07:44 +02:00
9e044c9649
Fix transition: all ( #10699 )
2019-05-04 17:39:53 +02:00
d5357fcbf2
Minor account media gallery fixes ( #10695 )
...
* Make the cursor icon consistant across media types in account media gallery
* Fix the video player modal causing scroll position to reset
2019-05-04 17:36:43 +02:00
0f1d2f4d71
Fix glitch SCSS for links in error messages in admin interface
...
Port SCSS changes from 8c716f917f
2019-05-04 16:43:08 +02:00
73bc58c656
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/models/media_attachment.rb
2019-05-04 16:37:26 +02:00
09ce4ea53c
Do not retry processing ActivityPub jobs raising validation errors ( #10614 )
...
* Do not retry processing ActivityPub jobs raising validation errors
Jobs yielding validation errors most probably won't ever be accepted,
so it makes sense not to clutter the queues with retries.
* Lower RecordInvalid error reporting to debug log level
* Remove trailing whitespace
2019-05-03 23:45:37 +02:00
c3b1f6963b
Change e-mail whitelist/blacklist to not be checked when invited ( #10683 )
...
* Change e-mail whitelist/blacklist to not be checked when invited
And only when creating an account, not when updating it later
Fix #10648
* Fix test
2019-05-03 23:44:44 +02:00
d20647fd94
Fix polls icon not showing in CW button in detailed statuses
2019-05-03 21:55:50 +02:00
f7879bbe08
Change font weight of sensitive button to 500 ( #10682 )
2019-05-03 20:44:20 +02:00
4c4f9d78fd
Explicitly disable storage of REST API results ( #10655 )
...
Fixes #10652
2019-05-03 20:39:19 +02:00
8c716f917f
Provide a link to existing domain block when trying to block an already-blocked domain ( #10663 )
...
* When trying to block an already-blocked domain, provide a link to the block
* Fix styling for links in flash messages
* Allow blocks to be upgraded but not downgraded
2019-05-03 20:36:36 +02:00
c15b1aa00c
Fix crash in onboarding modal
...
Fixes #1027
2019-05-03 19:24:54 +02:00
4aabc452d0
Add button to view context to media modal ( #10676 )
...
* Add "view context" button to media modal when opened from gallery
* Add "view context" button to video modal
Allow closing the video modal by navigating back in the browser,
just like the media modal
2019-05-03 16:16:30 +02:00
d8418c07c9
When selecting a toot via keyboard, ensure it is scrolled into view ( #10593 )
2019-05-03 06:20:35 +02:00
cc39785d45
Make the "mark media as sensitive" button more obvious in web UI ( #10673 )
...
* Make the "mark media as sensitive" button more obvious in web UI
* Use eye-slash icon instead of eye icon to mean "hide"
2019-05-03 04:34:55 +02:00
78f5b96bf6
Fix alignment of items in the account gallery in web UI and load more per page ( #10674 )
2019-05-03 04:02:55 +02:00
db73f8e585
Change account gallery in web UI ( #10667 )
...
- 3 items per row instead of 2
- Use blurhash for previews
- Animate/hover-to-play GIFs and videos
- Open media modal instead of opening status
- Allow opening status instead with ctrl+click and open in new tab
2019-05-02 08:34:32 +02:00
af3971a0e6
Check that an invite link is valid before bypassing approval mode ( #10657 )
...
* Check that an invite link is valid before bypassing approval mode
Fixes #10656
* Add tests
* Only consider valid invite links in registration controller
* fixup
2019-05-02 04:30:12 +02:00
c4865cbd25
Add site-wide options to show reblogs and replies in local/public timelines
...
Fixes #1021
2019-05-01 22:33:09 +02:00
e53b2a9c37
Make hi-color privacy icons opt-in instead of opt-out
2019-05-01 20:23:25 +02:00
f5f0bd6c0a
Add high color privacy icons
...
Fixes #1015
2019-05-01 16:38:01 +02:00
826d926bb9
changed pinned status count operator
...
changed default pinned count to 5 to preserve default behavior
2019-04-29 20:52:53 +02:00
5a3d18a660
added documentation into .env.production.sample
...
moved max pin count into constant
2019-04-29 20:52:53 +02:00
41d3d17fe7
add env var for max pinned toots
2019-04-29 20:52:53 +02:00
98732502f5
When selecting a toot via keyboard, ensure it is scrolled into view
...
Fixes detailed status column
2019-04-29 20:28:38 +02:00
81c9377c7d
Add support for missing formatting tags
2019-04-29 19:31:09 +02:00
02bd678944
Add keyboard shortcut to collapse/uncollapse toots
2019-04-28 20:23:04 +02:00
7ed89e9178
Add hotkey for bookmarking a toot
2019-04-28 20:23:04 +02:00
f843bdbd73
Update hy.json ( #10644 )
2019-04-28 12:51:20 +09:00
b1e10ed1b3
Fix approved column being set to nil instead of false ( #10642 )
...
Fix https://github.com/tootsuite/mastodon/pull/10621#issuecomment-487316619
2019-04-27 23:55:16 +02:00
5a8b820767
Fix regression with textarea's caret position when selecting a suggestion
2019-04-27 21:40:42 +02:00
a6d2fe7165
Add blurhash ( #10630 )
...
* Add blurhash
* Use fallback color for spoiler when blurhash missing
* Federate the blurhash and accept it as long as it's at most 5x5
* Display unknown media attachments as blurhash placeholders
* Improve style of embed actions and spoiler button
* Change blurhash resolution from 3x3 to 4x4
* Improve dependency definitions
* Fix code style issues
2019-04-27 03:24:09 +02:00
b40841b488
Hide suggestions by default
...
They will be enabled if the input has focus
2019-04-26 22:38:03 +02:00
e720f1eac2
Attempt to fix CSS
2019-04-26 22:38:03 +02:00
4155a1556a
Add emoji suggestion to poll options
2019-04-26 22:38:03 +02:00
b35b38f4ea
Add suggestions in CW field
2019-04-26 22:38:03 +02:00
0541e4ad21
Refactor selectComposeSuggestion so that different paths can be updated
2019-04-26 22:38:03 +02:00
be7bab1fd9
Fix LDAP/PAM/SAML/CAS users not being approved instantly ( #10621 )
2019-04-25 02:49:25 +02:00
2ba12c8917
Fix not being able to save e-mail preference for new pending accounts ( #10622 )
2019-04-25 02:49:06 +02:00
23e87a4742
Fix upload progressbar when image resizing is involved ( #10632 )
2019-04-25 02:48:54 +02:00
140be28787
Reject follow requests of blocked users ( #10633 )
2019-04-25 02:47:33 +02:00
642a298ceb
Do not ask to register web intent handler
2019-04-24 23:05:11 +02:00
8942036345
Fix color of muted statuses content not wrapped in a p tag
2019-04-24 22:40:17 +02:00
73f83ef399
Redesign blockquote styling
2019-04-24 22:40:17 +02:00
f5ea016889
Better distinguish titles from text
2019-04-24 22:40:17 +02:00
8003dd8849
Remove extra margin in paragraphs inside blockquotes
2019-04-24 22:40:17 +02:00
a855f38086
Make bold text bolder
2019-04-24 22:40:17 +02:00
ad30895262
Remove margins around `p` tags in lists
2019-04-24 22:40:17 +02:00
ce2da44c2c
Rename status__text to status__content__text for consistency with upstream
2019-04-24 22:40:17 +02:00
facc95f71a
Fix status header display in toot mobile menu
2019-04-24 20:21:19 +02:00
b43cfd3eb3
Fix upload progressbar when image resizing is involved
2019-04-24 20:19:23 +02:00
4a95bfe919
Hide media upload form if no media are attached
2019-04-24 19:47:11 +02:00
0f97c82eac
Merge branch 'master' into glitch-soc/merge-upstream
2019-04-24 15:25:22 +02:00
07367bc6ec
Fix file upload
2019-04-24 07:57:28 +02:00
86108e7af7
Fix settings modal
2019-04-23 18:31:13 +02:00
72f3242a59
Fix sign up button not saying sign up when invite is used ( #10623 )
...
Fix #10616
2019-04-23 04:39:21 +02:00
2d2eca5bda
Do not leak local-only toots to remote mentioned users
2019-04-22 23:37:50 +02:00
ThibG