be6e54a70c
Do not misattribute inlined boosts if `attributedTo` isn't present ( #10967 )
...
* Do not misattribute inlined boosts if `attributedTo` isn't present
Fixes #10950
* Fix tests
2019-06-04 23:24:31 +02:00
b01b8521ec
Fix margins on profile metadata in single column mode ( #10961 )
2019-06-04 23:11:57 +02:00
a7952c3a54
Change reblogs counter to be updated when boosted privately ( #10964 )
2019-06-04 23:11:44 +02:00
57098a1b8d
Refactor all ActivityPub deliveries to be serialized and signed through one concern ( #10966 )
2019-06-04 23:11:18 +02:00
a76c660645
Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream
2019-06-04 20:40:19 +02:00
f3a02e70a8
Fix poll API not requiring authentication on non-public polls ( #10960 )
...
* Fix poll API not requiring authentication on non-public polls
That API does not reveal the content of the status, i.e. the question
itself, nor who the author is, nor which status it belongs to, but it
does reveal the poll options and how many answers they got
Fix #10959
* Add test
2019-06-04 20:10:26 +02:00
4331f4948e
Add profile directory link to single column navigation panel ( #10963 )
2019-06-04 19:50:38 +02:00
ca61d7577a
Add missing Korean translations ( #10962 )
...
And change some word.
2019-06-04 18:00:09 +02:00
3d34bc17e2
[Glitch] Fix profile picture preview
...
Port 77375ad7df
2019-06-03 20:20:33 +02:00
c45a330824
Handle blank poll options more gracefully ( #10946 )
...
Pleroma currently allows (erroneously imho) empty poll options, that is,
options with an empty (but existing) `name`.
2019-06-03 20:04:00 +02:00
a4e0071538
Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream
...
Conflicts:
- Gemfile.lock
- config/webpack/rules/css.js
- package.json
- yarn.lock
2019-06-03 14:54:30 +02:00
77375ad7df
Fix profile picture preview ( #10931 )
2019-06-02 18:04:41 +02:00
d691b1f7d3
Added env variables for max image and video size.
...
I changed the IMAGE_LIMIT and VIDEO_LIMIT variables to read from the env, or use default if not set in the env, to make it easier to change this on an instance by instance basis and make it persistent across updates.
2019-06-02 14:38:13 +02:00
1501b142d2
Fix expanding status from menu modal in glitch-soc
...
Fixes #1085
2019-06-02 14:11:32 +02:00
96ac52dabd
Improvement variable height in single column layout ( #10917 )
...
* Improvement variable height of compose and navigation panel in single column layout
* Fix wrong quotes and missing commas
2019-06-02 10:05:54 +02:00
702dbf1622
Center 2-columns layout without side effect ( #10915 )
2019-06-01 07:59:21 +03:00
206d0ea6a2
Merge branch 'master' into glitch-soc/merge-upstream
2019-05-30 13:31:01 +02:00
6e1ad5a03f
Raise exception when attempting to serialize local-only statuses
2019-05-30 09:04:12 +02:00
fb0489022c
Fix incorrect PropType in Glitch AutosuggestInput
2019-05-30 09:04:00 +02:00
c12383e06c
Remove isRequired from Glitch ReplyIndicator status
...
This can be null under normal circumstances, which isRequired doesn't
like.
2019-05-30 09:04:00 +02:00
233a60f6a2
Change links in right panel to open in the same tab ( #10848 )
...
For Rambox compatibility
2019-05-29 17:33:35 +03:00
0162dc0c9c
Fix React warning about legacy lifecycle calls and sensitive status resetting ( #10872 )
2019-05-29 17:33:15 +03:00
9c174f4d02
Fix safari post field display issue in single column layout ( #10883 )
2019-05-29 12:03:56 +03:00
6f624f449e
i18n: Update Corsican front-end translation ( #10884 )
2019-05-29 17:57:08 +09:00
7403b0ec05
Update Japanese translations. ( #10875 )
...
run yarn manage:translations ja && i18n-tasks add-missing ja
2019-05-29 11:09:59 +09:00
d0dc7a60ab
I18n: Update Czech translation ( #10874 )
2019-05-29 09:52:41 +09:00
7fb3fa16dd
Truncate long URLs while providing alt text for inline images
2019-05-28 19:33:43 +02:00
d417a32290
Translate incoming remote img tags by a link
2019-05-28 19:33:43 +02:00
40117d908f
[Glitch] Use `<use />` to render transparent SVG logo instead of inserting it
...
Port SCSS changes from c5234ac2aa
2019-05-28 17:50:21 +02:00
b9c5aed987
Merge branch 'master' into glitch-soc/merge-upstream
2019-05-28 17:45:06 +02:00
31b8203887
Fix web push notifications for polls ( #10864 )
...
Fixes #10861
2019-05-28 00:26:08 +02:00
7d2b4e9277
Refactor footers in web UI into a single component ( #10846 )
2019-05-27 21:58:41 +02:00
4c9d8f8ef9
Display notifications count on a new single column ( #10859 )
2019-05-27 21:56:29 +02:00
938edb44a1
Fix video player regressions introduced by blurhash merge
2019-05-27 19:43:15 +02:00
c1619a5c24
[Glitch] Add keyboard shortcut to hide/show media
...
Port 7ee189fa609e238804ea
2019-05-27 19:43:15 +02:00
c5234ac2aa
Use `<use />` to render transparent SVG logo instead of inserting it ( #10845 )
2019-05-27 03:33:39 +02:00
03054b27e1
Fix poll visibility on public pages ( #10817 )
...
* Fix poll visibility on public pages
* Revert "Fix poll visibility on public pages"
This reverts commit 54a9608add6f855bc6337fe3c65eaee7ba13db49.
* Revert "Change poll options to alphabetic letters when status text is hidden"
This reverts commit c53d67326201b2061990b1874a3547c3647f50d2.
2019-05-26 23:13:29 +02:00
d46668d34b
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/settings/preferences_controller.rb
- app/lib/user_settings_decorator.rb
- app/models/user.rb
Conflicts due to the addition of a new preference upstream,
“advanced layout”.
2019-05-26 15:41:40 +02:00
c65b14059a
[Glitch] Fix composer route opening when not needed
...
Port 9ff2739fb5
2019-05-26 13:50:15 +02:00
139730e3db
Create new click handler for status__expand area in status ( #10837 )
...
This click handler only activates on left-click, resolving #10798 .
This matches behavior in status_content.js, as added in #536
2019-05-26 13:48:45 +02:00
9e238804ea
Fix null error in status component when determining showMedia state ( #10838 )
...
* Fix null error in status component when determining showMedia state
Also update the showMedia value if the status passed to the
component changes
* Refactor media visibility computation into a defaultMediaVisibility function
* Fix default media visibility with reblogs
2019-05-26 13:48:16 +02:00
66081c489f
Fix wrong redirect from getting started to home in advanced Web UI ( #10839 )
...
* update Ruby to 2.5.3
* Link to Getting Started will not redirect to Home in multi-column UI (https://github.com/tootsuite/mastodon/pull/10835 )
2019-05-26 12:22:33 +02:00
6d4af23a69
Improvements to the single column layout ( #10835 )
...
* Improvements to the single column layout
- Add follows and followers link to the right panel
- Increase margins around separators in right panel
- Add follow requests link with counter when account is locked to right panel
* Redirect from getting started to home when navigation panel is visible
2019-05-26 02:55:37 +02:00
7ee189fa60
Add a keyboard shortcut to hide/show media ( #10647 )
...
* Move control of media visibility to parent component
* Add keyboard shortcut to toggle media visibility
2019-05-25 23:20:51 +02:00
276c9e6e9e
Avoid cutting bottom of letters of last paragraph of statuses ( #10821 )
2019-05-25 23:19:39 +02:00
a1bceb2cb6
Add responsive panels to the single-column layout ( #10820 )
...
* Add responsive panels to the single-column layout
* Fixes
* Fix not being able to save the preference
* Fix code style issues
* Set max-height on the compose textarea and add a link to relationship manager
2019-05-25 21:27:00 +02:00
57911e10c5
Use Sec-WebSocket-Protocol instead of query string to pass WebSocket token
...
Inspired by https://github.com/kubevirt/kubevirt/issues/1242
2019-05-24 16:08:09 +02:00
e8b45064b8
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- streaming/index.js
2019-05-24 15:23:52 +02:00
7b1d582232
Improve streaming server security ( #10818 )
...
* Check OAuth token scopes in the streaming API
* Use Sec-WebSocket-Protocol instead of query string to pass WebSocket token
Inspired by https://github.com/kubevirt/kubevirt/issues/1242
2019-05-24 15:21:42 +02:00
4e953ee471
Merge pull request #1067 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-05-23 22:01:34 +02:00
ce528d61b4
Do not share a single Redcarpet::Markdown object across threads
...
There are apparently thread-safety issues: https://github.com/vmg/redcarpet/pull/672
2019-05-23 21:19:44 +02:00
630aafa3a7
Merge branch 'master' into glitch-soc/merge-upstream
2019-05-23 21:18:27 +02:00
106cfa7553
Various improvements to single column layout ( #10809 )
...
- Add potential side panels to single column layout
- Hide FAB on large screens
2019-05-23 20:01:10 +02:00
028fb2060b
Fix possible race condition when processing statuses ( #10815 )
2019-05-23 20:00:39 +02:00
3d860417a5
[Glitch] Fix stacking order of emoji picker
...
Port 1fbe5c2fec
2019-05-23 19:16:42 +02:00
d445d5833e
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/models/account.rb
- app/views/settings/profiles/show.html.haml
- spec/controllers/api/v1/accounts/credentials_controller_spec.rb
Conflicts were due to an increase in account bio length upstream, which
is already covered in glitch-soc through `MAX_BIO_CHARS`.
2019-05-23 19:01:30 +02:00
f5637b174f
Move signature verification stoplight to the requests themselves ( #10813 )
...
* Move signature verification stoplight to the requests themselves
This avoids blocking messages from known keys for 5 minutes when only one fails…
* Put the stoplight on the actual client IP, not a potential reverse proxy
2019-05-23 15:22:39 +02:00
4eaa4a649e
Retry ActivityPub inbox delivery on HTTP 401 and 408 errors ( #10812 )
...
HTTP 401 responses returned by Mastodon's inbox controller may
be temporary if, for instance, the requesting user's actor/key json
could not be retrieved in a timely fashion. This changes allow retries
instead of dropping the message entirely.
Also added HTTP 408 as that error is by nature temporary.
2019-05-23 15:00:30 +02:00
9a101b91ae
Make headers font size proportional
2019-05-23 12:41:38 +02:00
3117d0ac70
Allow rel=tag in status text
...
Fixes tag links in local Markdown or HTML-authored statuses
2019-05-23 12:28:33 +02:00
f9ca3d62b6
Add `forceSingleColumn` prop to `<UI />` ( #10807 )
...
* Move TabsBar rendering logic from CSS to the ColumnsArea component
* Add forceSingleColumn mode
* Add unread notifications counter to tabs bar
* Add toggle to control `forceSingleColumn`
* Increase paddings in mobile layout responsively at large sizes
2019-05-23 01:35:22 +02:00
1fbe5c2fec
Fix stacking order of emoji picker ( #10801 )
2019-05-22 18:00:34 +02:00
0a1ba7c14b
i18n: Complete frontend Bengali translation ( #10800 )
...
* i18n: Complete frontend Bengali translation
* run yarn manage:translations
2019-05-22 10:00:58 +09:00
a93c6f708b
Fix local text/html toots not being sanitized
2019-05-21 23:12:43 +02:00
626844dfb1
Add `account_id` param to `GET /api/v1/notifications` ( #10796 )
...
* Add `from_account` to notifications API
this adds the ability to filter notifications by the account they
originated from
* passing a non-existent user should cause none to be returned
* Fix codeclimate warnings
* fix more codeclimate warnings
* make requested changes:
* use account id instead of user@domain
* name the param `account_id` instead of `from_account`
* Don't use `return` in a lambda
2019-05-21 13:28:49 +02:00
a0b7246388
Refactor contentType selection in glitch composer
2019-05-20 10:27:31 +02:00
0bc9d4f6d3
Use glitch-soc's poll component instead of upstream's
2019-05-19 23:24:53 +02:00
d8e5268939
Change bio limit from 160 to 500 ( #10790 )
...
* Change note_length validator from 160 to 500
* Change input maxlength from 160 to 500
* update bio test from 160 to 500
* Multiply a string 30 times instead of 10
2019-05-19 22:51:44 +02:00
e21662d370
Merge branch 'master' into glitch-soc/merge-upstream
2019-05-19 21:53:44 +02:00
4ad004d2ef
Fix “invited by” not showing up for invited accounts in admin interface ( #10791 )
2019-05-19 21:40:36 +02:00
4de9bd3870
fix `isSubmitting` prop case ( #10785 )
2019-05-19 18:41:41 +02:00
fd5da4033e
Merge branch 'master' into glitch-soc/merge-upstream
2019-05-19 17:46:31 +02:00
8ec309ee64
add og:image:alt for media attachments in embeds ( #10779 )
2019-05-18 20:57:45 +02:00
3a4761c665
Change poll options to alphabetic letters when status text is hidden ( #10685 )
...
Fix #10569
2019-05-18 14:41:16 +02:00
08a793cbd9
Merge branch 'master' into glitch-soc/merge-upstream
2019-05-18 10:04:32 +02:00
1fec2ff78f
Prevent from publicly boosting one's own private toots ( #10775 )
2019-05-18 00:28:51 +02:00
d48d1ed534
Minor optimization
2019-05-17 23:51:14 +02:00
b83cdc9b02
Export fallback content type and use it as default in WebUI
2019-05-17 23:51:14 +02:00
3d03d084cd
Properly escape HTML in code blocks
2019-05-17 23:51:14 +02:00
7aece1eec5
Add option for default toot content-type
2019-05-17 23:51:14 +02:00
ee3dfdf6a1
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
dfeda8857f
Hide content-type dropdown by default
2019-05-17 23:51:14 +02:00
76d58bf63e
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
8a49df8ede
Support proper content-type in Delete & Redraft
2019-05-17 23:51:14 +02:00
08a981dd25
Add status content type dropdown to compose box.
...
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-05-17 23:51:14 +02:00
91ab9e2e4f
Add API support for setting status content-type
2019-05-17 23:51:14 +02:00
20c98d7a27
Serialize content-type on Delete & Redraft
2019-05-17 23:51:14 +02:00
c9696ef8a5
Add support for HTML-formatted toots
2019-05-17 23:51:14 +02:00
8313ee07f6
Add support for markdown-formatted toots
2019-05-17 23:51:14 +02:00
105f03a988
Add database row to hold status content type
2019-05-17 23:51:14 +02:00
38272bbeb1
Merge pull request #1049 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-05-15 18:44:21 +02:00
422dd06806
Merge branch 'master' into glitch-soc/merge-upstream
2019-05-15 17:11:40 +02:00
85a991cfa7
Minor performance improvements and cleanup in formatter ( #10765 )
2019-05-15 06:54:06 +02:00
59f6637559
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
f1a3135809
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
d8e9a04354
Fix rich text style in reply indicator
2019-05-13 17:13:02 +02:00
9f0ff9b6ea
Fix rich text styling on public pages
2019-05-13 17:13:02 +02:00
6e625755a6
Fix text color of some formatted elements in notifications
2019-05-12 19:23:32 +02:00
f79d089b65
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
cfb69164ad
Fix incorrect reference to raw_content (it is raw_text instead) ( #10753 )
2019-05-11 23:56:07 +02:00
c8195e2da1
[Glitch] Use raw content if available on Delete & Redraft
...
Port front-end changes from 2a917031c9
2019-05-11 21:46:23 +02:00
5262820fae
Merge branch 'master' into glitch-soc/merge-upstream
2019-05-11 18:23:46 +02:00
46b5085ced
Use a checkbox for the “Mark media as sensitive” composer button
...
Fixes #1039
2019-05-11 12:35:38 +02:00
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
2ad61962ae
Load custom CSS rules after standard ones
...
Fixes #933
Due to glitch-soc's theming system, JS and CSS files are imported in a slightly
different order, and custom CSS rules were loaded *before* everything else.
They will now be loaded *after* everything else, which is a bit different from
upstream but should work better overall.
2019-04-22 23:07:27 +02:00
9aeb714b7a
Add support for lists in statuses
2019-04-22 23:07:14 +02:00
fea727c61a
Do not switch to italic for status media buttons
2019-04-22 23:07:14 +02:00
22ad8c89b2
Accept richer text from remote statuses
...
Support abbr, del, pre, blockquote, code, strong, b, em, i, and h1…h5
HTML elements in remote statuses, add corresponding CSS.
2019-04-22 23:07:14 +02:00
4ce6358787
[Glitch] Fix modal items cannot scroll on touch devices
...
Port 92ced1e94b
2019-04-22 22:57:39 +02:00
6f85bb754b
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/javascript/mastodon/features/compose/components/compose_form.js
Upstream cleaned up a bit, including on lines in which
we replaced the hardcoded 500 character limit with a maxChar
constant. Applied the changes while keeping maxChar instead of 500.
- app/javascript/packs/public.js
Moved upstream's new animated avatar hover handling in
app/javascript/core/public.js
- app/javascript/styles/fonts/montserrat.scss
Upstream fixed local font name, applied those changes.
- app/javascript/styles/fonts/roboto.scss
Upstream fixed local font name, applied those changes.
- lib/mastodon/version.rb
Upstream made repo URL configurable, did the same, but
default to glitch-soc
2019-04-22 20:40:04 +02:00
1b8d2af1f9
Fix ReferenceError in dropdown
2019-04-22 20:15:47 +02:00
25cfabce26
Fix broken reference to handleSubmit
2019-04-22 20:15:47 +02:00
041e27bd2d
Cleanup
2019-04-22 20:15:47 +02:00
2ee26ba420
Move ComposerPublisher to Compose
2019-04-22 20:15:47 +02:00
bf8b0394b7
Add OptionsContainer
2019-04-22 20:15:47 +02:00
ef17da32f9
Move composer Dropdown from features/composer to features/compose
2019-04-22 20:15:47 +02:00
a6bb49adf1
Move ComposerTextareaIcons to TextareaIcons
2019-04-22 20:15:47 +02:00
08faf16d66
ComposerTextarea → AutosuggestTextarea
2019-04-22 20:15:47 +02:00
513547ba57
ComposerUploadForm → UploadForm + UploadFormContainer
2019-04-22 20:15:47 +02:00
f7d1772fc8
Move PollForm from features/composer to features/compose
2019-04-22 20:15:47 +02:00
2021f14e8f
Inline spoiler input
2019-04-22 20:15:47 +02:00
3529f6f4ae
ComposerReply → ReplyIndicator
2019-04-22 20:15:47 +02:00
ad6166f0ef
Refactor Compose*Warning → ContainerWarning
...
Regression: only one warning at a time
2019-04-22 20:15:47 +02:00
5e4588524b
features/composer/index.js → ComposeForm
2019-04-22 20:15:47 +02:00
8ea0e64864
DrawerHeader → Header + HeaderContainer
2019-04-22 20:15:47 +02:00
2f2381a400
DrawerAccount → NavigationBar + NavigationContainer
2019-04-22 20:15:47 +02:00
7acc035cbe
[Glitch] Show suggested follows on search screen in mobile layout
...
Port 541fda5fc8
2019-04-22 20:15:47 +02:00
4aee182cd3
DrawerResults → SearchResults + SearchResultsContainer
2019-04-22 20:15:47 +02:00
7c2cc9d681
Rework DrawerResults to make them closer to upstream
2019-04-22 20:15:47 +02:00
5264424b71
Move DrawerSearch to Search + SearchContainer
2019-04-22 20:15:47 +02:00
7fa3320516
Inline DrawerSearchPopout in DrawerSearch
2019-04-22 20:15:47 +02:00
a55e1c1d49
Refactor a bit DrawerSearch to make it closer to upstream
2019-04-22 20:15:47 +02:00
e41c4ad61b
Rename flavours/glitch/features/drawer to flavours/glitch/features/compose
2019-04-22 20:15:47 +02:00
eb80c3924f
Allow switching between singe-option and multiple-option polls ( #10603 )
2019-04-22 14:56:14 +02:00
92ced1e94b
Fix modal items cannot scroll on touch devices ( #10605 )
2019-04-22 14:55:50 +02:00
3c6f8de45a
Minor code cleanup ( #10613 )
2019-04-22 14:55:24 +02:00
483aa50856
Default to the web domain (eg. mastodon.lubar.me) instead of the local domain (eg. lubar.me) for keybase proofs ( #10565 )
2019-04-21 04:53:24 +02:00
47c0af88f1
Add hi.json ( #10573 )
2019-04-21 04:52:20 +02:00
fe19e9d7b1
Update hy.json ( #10591 )
2019-04-21 04:48:47 +02:00
e3dda38c8b
Treat meta[property] as a space-separated list ( #10604 )
...
The @property attribute in HTML is a space-separated list of values.
This change normalizes whitespace and finds the desired value in
the list instead of requiring an exact single-value match.
More details:
https://www.ctrl.blog/entry/rdfa-socialmedia-metadata.html
2019-04-21 04:48:19 +02:00
d7c34fb945
Animate avatar GIFs on-hover on public profiles ( #10549 )
...
* Third time is the charm?
* Use full asset URL for data-static and data-original
̀image_tag` expands to the full asset URL, we have to do the same in `data` attributes so that it can work when assets and user data are stored on a different host
2019-04-21 04:47:39 +02:00
f7cc05db80
Update NL (Dutch) translation ( #10601 )
...
* Update NL language strings
Have to do it this way, cause this file is locked on Weblate
* fix
* Update simple_form.nl.yml
* Update nl.yml
2019-04-21 04:46:08 +02:00
1fecdb013a
Use correct local names for fonts ( #10594 )
2019-04-21 04:42:02 +02:00
1af37e09f3
Configrationable repository url ( #10600 )
...
* config: Add GITHUB_REPOSITORY for repository name
* config: Add SOURCE_BASE_URL for repository url
* Show source_url and repository name on getting started
2019-04-21 04:41:34 +02:00
2da3b24eb8
[Glitch] Allow modal secondary button to shrink and allow wider confirmation modals
...
Port a6fe7ae53c
2019-04-19 10:48:54 +02:00
3673665b46
Merge branch 'master' into glitch-soc/merge-upstream
2019-04-19 10:44:10 +02:00
3f40442f49
Fix keybase indication on dashboard
2019-04-19 00:57:39 +02:00
c22175bb86
Allow turning keybase off instance-wide
2019-04-19 00:57:39 +02:00
619d55358f
Shift+click on column Back button to return to last pinable column
2019-04-17 18:40:40 +02:00
a4db307b6a
When selecting a toot via keyboard, ensure it is scrolled into view
2019-04-17 10:07:33 +02:00
ae88690fa6
Fix opening/closing gifv sometimes making the timeline scroll
2019-04-16 22:20:23 +02:00
ThibG