20d01a954e
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
fdb3952b20
[Glitch] Fix composer route opening when not needed
...
Port c1e77b56a9
2019-05-26 13:50:15 +02:00
63483ee543
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
988342a56c
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
4a818ac2de
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
0e445ebb13
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
a472190729
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
4168aeb234
Avoid cutting bottom of letters of last paragraph of statuses ( #10821 )
2019-05-25 23:19:39 +02:00
1e5532e693
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
7fb76999af
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
652147a3f4
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- streaming/index.js
2019-05-24 15:23:52 +02:00
d63c3c0cef
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
72bf354e97
Merge pull request #1067 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-05-23 22:01:34 +02:00
d6a7d62dc6
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
bf988123ba
Merge branch 'master' into glitch-soc/merge-upstream
2019-05-23 21:18:27 +02:00
84dc21d55d
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
9a5561a5b8
Fix possible race condition when processing statuses ( #10815 )
2019-05-23 20:00:39 +02:00
a1143a19c0
[Glitch] Fix stacking order of emoji picker
...
Port 8a378d4c3d
2019-05-23 19:16:42 +02:00
c0dc247bce
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
89d600bedb
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
9efcca3c54
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
0744d6e571
Make headers font size proportional
2019-05-23 12:41:38 +02:00
7c609bdab9
Allow rel=tag in status text
...
Fixes tag links in local Markdown or HTML-authored statuses
2019-05-23 12:28:33 +02:00
9ddeb30f90
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
8a378d4c3d
Fix stacking order of emoji picker ( #10801 )
2019-05-22 18:00:34 +02:00
ee0e68e97a
i18n: Complete frontend Bengali translation ( #10800 )
...
* i18n: Complete frontend Bengali translation
* run yarn manage:translations
2019-05-22 10:00:58 +09:00
2332b3f146
Fix local text/html toots not being sanitized
2019-05-21 23:12:43 +02:00
0c933c1b8c
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
4fbce23992
Refactor contentType selection in glitch composer
2019-05-20 10:27:31 +02:00
2cd7bfac23
Use glitch-soc's poll component instead of upstream's
2019-05-19 23:24:53 +02:00
a6caf919e2
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
08a2af27c3
Merge branch 'master' into glitch-soc/merge-upstream
2019-05-19 21:53:44 +02:00
ae18386558
Fix “invited by” not showing up for invited accounts in admin interface ( #10791 )
2019-05-19 21:40:36 +02:00
bb9d7fad9f
fix `isSubmitting` prop case ( #10785 )
2019-05-19 18:41:41 +02:00
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
3191c3b349
Fix tabs bar on mobile
...
Fixes #1037
2019-05-08 00:32:53 +02:00
5c82d660d1
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
2c767f44bf
Fix front-end crash when a video has a blurhash and is hidden behind a CW
2019-05-07 22:33:37 +02:00
7562602df8
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
b2f5b1045f
Add description on hover in media gallery ( #10713 )
2019-05-06 05:33:56 +02:00
89d2859296
Fix content warning button displaying a link icon when no status card is set
2019-05-05 21:47:05 +02:00
1eb14ef774
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
e742bff19b
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
8383222026
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
eef8802325
[Glitch] Make sure the instance banner is never cropped
...
Port 21209c2b52
2019-05-05 12:29:06 +02:00
832cf92c74
Merge branch 'master' into glitch-soc/merge-upstream
2019-05-05 12:28:10 +02:00
b7741ed732
I18n: Update Czech translation 🇨🇿 ( #10704 )
...
* I18n: Update Czech translation
* Tiny fix
2019-05-05 15:33:33 +09:00
21209c2b52
Make sure the instance banner is never cropped ( #10702 )
2019-05-05 01:07:15 +02:00
f2cf8144b4
Minor style fixes
2019-05-04 23:05:43 +02:00
9b1ef58c95
[Glitch] Change font weight of sensitive button to 500
...
Port 63b1388fef
2019-05-04 20:41:21 +02:00
f59973cc85
[Glitch] Make the "mark media as sensitive" button more obvious in web UI
...
Port 05ef3462ba
2019-05-04 20:41:21 +02:00
b1ab4d5ebe
Add visibility icon back in media gallery
2019-05-04 20:06:17 +02:00
cbda1b8b66
Add back description on hover
2019-05-04 20:03:37 +02:00
8e221cd22b
[Glitch] Fix transition: all
...
Port 7aa749ab46
2019-05-04 19:53:09 +02:00
b7f69beebe
[Glitch] Make the cursor icon consistant across media types in account media gallery
2019-05-04 19:16:51 +02:00
52a4284fe5
Merge branch 'master' into glitch-soc/merge-upstream
2019-05-04 19:15:50 +02:00
bc97fd641f
[Glitch] Add button to view context to media modal
...
Port eb63217210
2019-05-04 19:10:24 +02:00
209c080280
[Glitch] Fix alignment of items in the account gallery in web UI and load more per page
...
Port 967e419f8f
2019-05-04 18:59:11 +02:00
a5da59f140
[Glitch] Change account gallery in web UI
...
Port 3f143606fa
2019-05-04 18:54:57 +02:00
373dd1fdf1
Minor CSS fixes
2019-05-04 18:18:15 +02:00
ccf4f3240a
[Glitch] Add blurhash
...
Port front-end changes from fba96c808d
2019-05-04 18:07:44 +02:00
7aa749ab46
Fix transition: all ( #10699 )
2019-05-04 17:39:53 +02:00
4f73cde4e1
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
1149ddd3da
Fix glitch SCSS for links in error messages in admin interface
...
Port SCSS changes from 011b032300
2019-05-04 16:43:08 +02:00
33c80e0783
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/models/media_attachment.rb
2019-05-04 16:37:26 +02:00
b85f216cbc
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
7cb369d4c6
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
9f25ab9792
Fix polls icon not showing in CW button in detailed statuses
2019-05-03 21:55:50 +02:00
63b1388fef
Change font weight of sensitive button to 500 ( #10682 )
2019-05-03 20:44:20 +02:00
91634947f8
Explicitly disable storage of REST API results ( #10655 )
...
Fixes #10652
2019-05-03 20:39:19 +02:00
011b032300
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
7617f78359
Fix crash in onboarding modal
...
Fixes #1027
2019-05-03 19:24:54 +02:00
eb63217210
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
5121d9c12f
When selecting a toot via keyboard, ensure it is scrolled into view ( #10593 )
2019-05-03 06:20:35 +02:00
05ef3462ba
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
967e419f8f
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
3f143606fa
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
21a73c52a7
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
fcbf557bd2
Add site-wide options to show reblogs and replies in local/public timelines
...
Fixes #1021
2019-05-01 22:33:09 +02:00
cc5a81b7d8
Make hi-color privacy icons opt-in instead of opt-out
2019-05-01 20:23:25 +02:00
ac54292d69
Add high color privacy icons
...
Fixes #1015
2019-05-01 16:38:01 +02:00
be6ef1947e
changed pinned status count operator
...
changed default pinned count to 5 to preserve default behavior
2019-04-29 20:52:53 +02:00
5616200ed4
added documentation into .env.production.sample
...
moved max pin count into constant
2019-04-29 20:52:53 +02:00
a36affb9d6
add env var for max pinned toots
2019-04-29 20:52:53 +02:00
d4c95e6a8a
When selecting a toot via keyboard, ensure it is scrolled into view
...
Fixes detailed status column
2019-04-29 20:28:38 +02:00
3e095cab83
Add support for missing formatting tags
2019-04-29 19:31:09 +02:00
67fb9a8679
Add keyboard shortcut to collapse/uncollapse toots
2019-04-28 20:23:04 +02:00
f3acf8f414
Add hotkey for bookmarking a toot
2019-04-28 20:23:04 +02:00
5e79dd3f17
Update hy.json ( #10644 )
2019-04-28 12:51:20 +09:00
e18786dec7
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
cd9a284702
Fix regression with textarea's caret position when selecting a suggestion
2019-04-27 21:40:42 +02:00
fba96c808d
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
aa1832ac4d
Hide suggestions by default
...
They will be enabled if the input has focus
2019-04-26 22:38:03 +02:00
fddd8251dd
Attempt to fix CSS
2019-04-26 22:38:03 +02:00
d7e4be285a
Add emoji suggestion to poll options
2019-04-26 22:38:03 +02:00
df52004fe6
Add suggestions in CW field
2019-04-26 22:38:03 +02:00
3a671470ec
Refactor selectComposeSuggestion so that different paths can be updated
2019-04-26 22:38:03 +02:00
e451ba0e83
Fix LDAP/PAM/SAML/CAS users not being approved instantly ( #10621 )
2019-04-25 02:49:25 +02:00
f27d709351
Fix not being able to save e-mail preference for new pending accounts ( #10622 )
2019-04-25 02:49:06 +02:00
852ccea676
Fix upload progressbar when image resizing is involved ( #10632 )
2019-04-25 02:48:54 +02:00
b1a0322a06
Reject follow requests of blocked users ( #10633 )
2019-04-25 02:47:33 +02:00
1c0402c103
Do not ask to register web intent handler
2019-04-24 23:05:11 +02:00
b13c90f3e3
Fix color of muted statuses content not wrapped in a p tag
2019-04-24 22:40:17 +02:00
e4b65e6349
Redesign blockquote styling
2019-04-24 22:40:17 +02:00
8753e5317f
Better distinguish titles from text
2019-04-24 22:40:17 +02:00
3631c3314a
Remove extra margin in paragraphs inside blockquotes
2019-04-24 22:40:17 +02:00
9b86707b1e
Make bold text bolder
2019-04-24 22:40:17 +02:00
5a8495dabe
Remove margins around `p` tags in lists
2019-04-24 22:40:17 +02:00
ef249a2718
Rename status__text to status__content__text for consistency with upstream
2019-04-24 22:40:17 +02:00
adbb174c9c
Fix status header display in toot mobile menu
2019-04-24 20:21:19 +02:00
ef1504d625
Fix upload progressbar when image resizing is involved
2019-04-24 20:19:23 +02:00
ffab9d626a
Hide media upload form if no media are attached
2019-04-24 19:47:11 +02:00
7783ec921b
Merge branch 'master' into glitch-soc/merge-upstream
2019-04-24 15:25:22 +02:00
416aa832e5
Fix file upload
2019-04-24 07:57:28 +02:00
3d722b0c4e
Fix settings modal
2019-04-23 18:31:13 +02:00
041fb0e840
Fix sign up button not saying sign up when invite is used ( #10623 )
...
Fix #10616
2019-04-23 04:39:21 +02:00
08afd6b69c
Do not leak local-only toots to remote mentioned users
2019-04-22 23:37:50 +02:00
2db0506226
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
27e8354914
Add support for lists in statuses
2019-04-22 23:07:14 +02:00
659f972bed
Do not switch to italic for status media buttons
2019-04-22 23:07:14 +02:00
2e3640ecbb
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
039e35560c
[Glitch] Fix modal items cannot scroll on touch devices
...
Port d763d39d26
2019-04-22 22:57:39 +02:00
a9eaa780f5
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
c3fa4e8e07
Fix ReferenceError in dropdown
2019-04-22 20:15:47 +02:00
d779ec1f0e
Fix broken reference to handleSubmit
2019-04-22 20:15:47 +02:00
e949861176
Cleanup
2019-04-22 20:15:47 +02:00
faff152ae5
Move ComposerPublisher to Compose
2019-04-22 20:15:47 +02:00
df951c319c
Add OptionsContainer
2019-04-22 20:15:47 +02:00
14028655df
Move composer Dropdown from features/composer to features/compose
2019-04-22 20:15:47 +02:00
4c6221929f
Move ComposerTextareaIcons to TextareaIcons
2019-04-22 20:15:47 +02:00
47faf47ed5
ComposerTextarea → AutosuggestTextarea
2019-04-22 20:15:47 +02:00
a243567a3e
ComposerUploadForm → UploadForm + UploadFormContainer
2019-04-22 20:15:47 +02:00
c5f49a92dc
Move PollForm from features/composer to features/compose
2019-04-22 20:15:47 +02:00
f1a22e33e2
Inline spoiler input
2019-04-22 20:15:47 +02:00
8fd599fb40
ComposerReply → ReplyIndicator
2019-04-22 20:15:47 +02:00
f72af5794d
Refactor Compose*Warning → ContainerWarning
...
Regression: only one warning at a time
2019-04-22 20:15:47 +02:00
1bc4b8a0a5
features/composer/index.js → ComposeForm
2019-04-22 20:15:47 +02:00
281a82d878
DrawerHeader → Header + HeaderContainer
2019-04-22 20:15:47 +02:00
9a2f10fe8b
DrawerAccount → NavigationBar + NavigationContainer
2019-04-22 20:15:47 +02:00
9b9816aba6
[Glitch] Show suggested follows on search screen in mobile layout
...
Port ad510db3a1
2019-04-22 20:15:47 +02:00
149aa07409
DrawerResults → SearchResults + SearchResultsContainer
2019-04-22 20:15:47 +02:00
67771e6d65
Rework DrawerResults to make them closer to upstream
2019-04-22 20:15:47 +02:00
ab3e8fc542
Move DrawerSearch to Search + SearchContainer
2019-04-22 20:15:47 +02:00
c92ab35b19
Inline DrawerSearchPopout in DrawerSearch
2019-04-22 20:15:47 +02:00
c19b983986
Refactor a bit DrawerSearch to make it closer to upstream
2019-04-22 20:15:47 +02:00
eed2c9dd44
Rename flavours/glitch/features/drawer to flavours/glitch/features/compose
2019-04-22 20:15:47 +02:00
0e78862b61
Allow switching between singe-option and multiple-option polls ( #10603 )
2019-04-22 14:56:14 +02:00
d763d39d26
Fix modal items cannot scroll on touch devices ( #10605 )
2019-04-22 14:55:50 +02:00
bdec58b514
Minor code cleanup ( #10613 )
2019-04-22 14:55:24 +02:00
be8692b938
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
80c9cb0eb3
Add hi.json ( #10573 )
2019-04-21 04:52:20 +02:00
Thibaut Girka
りんすき
Neil Moore
Eugen Rochko
Hanage999
Mélanie Chauvel (ariasuni)
nzws
dxwc
Paul Woolcock
trwnh
Hinaloe
Ben Lubar
Haelwenn (lanodan) Monnier
KokaKiwi
Maciek Baron
nzws
Aurélien Reeves
Alix Rossi
Jeong Arm
spla
mayaeh
jeroenpraat
Kirishima21
Baptiste Gelez
Aditoo17
Zac
partev
kedama
Ben Lubar
Yamagishi Kazutoshi