b45f555a0c
Minor cleanup
6 years ago
b551d8aa53
Fix unboost confirmation dialog not showing up on detailed statuses
6 years ago
ccfb48d3eb
Add option to display a warning before boosting toots lacking media descriptions
6 years ago
d61a6271c6
Add DM conversations mode similar to upstream
6 years ago
210fa3a94e
Fix emoji-button appearing above privacy-dropdown ( #11027 )
6 years ago
ce556333ce
Update fr.json ( #11024 )
6 years ago
9a281bac8d
i18n: Update Corsican front-end translation ( #11010 )
6 years ago
e5bdfd1640
Run yarn manage:translations ( #11008 )
6 years ago
9add88a920
Fix position of search icon ( #11003 )
6 years ago
6ecf1825ef
i18n: Update Catalan translations ( #10998 )
...
* 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
* i18n: Update Catalan translations
* i18n: Update Catalan translations
6 years ago
241a8e7b5f
Fix more issues in the light theme ( #10996 )
...
* Fix tabs bar in light theme
* Fix borders on small screens in light theme
6 years ago
537e928186
I18n: Update Czech translation 🇨🇿 ( #10995 )
...
* I18n: Update Czech translation
* Fix
* Re-fix
* And also this
* The real fix now (hopefully)
6 years ago
e9ddd5a159
Put poll options behind content warnings ( #10983 )
...
* Put poll options behind CWs in WebUI
* Put polls behind CWs on public pages
* Add poll icon to public pages CWs
* Revert to not showing an icon in the CW button
6 years ago
20dda5cca0
Change full logo to use primary text color of the given theme ( #10994 )
...
* Change full logo to use primary text color of the given theme
* Fix colors of public layout header in light theme
6 years ago
f4bc77f290
Improve light theme ( #10992 )
6 years ago
25f93f4097
Fix RTL layout not being RTL within the columns area ( #10990 )
6 years ago
aec3fa35fd
[Glitch] Fix not being able to directly switch between list timelines in web UI
...
Port 5bfd802c57
6 years ago
417989ae34
[Glitch] Fix “mark as sensitive” not being used in delete & redraft
...
Port 2657765d2a
6 years ago
b32a62fe95
[Glitch] Scroll to compose form when focus
...
Port 8f3c32e29c
6 years ago
cc8f6b3cda
Fix some React warnings ( #10989 )
6 years ago
01aae33a5f
[Glitch] Fix refreshing featured toots when the new collection is empty
...
Port d34a3a2cc7
6 years ago
34b8346e7f
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/statuses_controller.rb
- app/controllers/stream_entries_controller.rb
6 years ago
8360019896
Fix display of alt-text when a media attachment is not available
6 years ago
cdb420862e
Fix display of alt-text when a media attachment is not available ( #10981 )
6 years ago
1db4117030
Change preferences page into appearance, notifications, and other ( #10977 )
6 years ago
c672676c03
Fix sass-lint config ( #10982 )
6 years ago
fe3bf3b0fc
Fix overlap of emoji button on search popup ( #10978 )
6 years ago
a7f6e72b30
Fix CW field automatically getting the focus when it is always enabled
6 years ago
5bfd802c57
Fix not being able to directly switch between list timelines in web UI ( #10973 )
6 years ago
2657765d2a
Fix “mark as sensitive” not being used in delete & redraft ( #10980 )
6 years ago
c402c291f4
Fix emoji picker being always displayed ( #10979 )
...
* Fix emoji picker being always displayed
* Remove duplicate content with other pull-requests
6 years ago
8f3c32e29c
Scroll to compose form when focus ( #10970 )
...
* Scroll to compose form when focus
* Get rid of constructor
6 years ago
d34a3a2cc7
Fix refreshing featured toots when the new collection is empty ( #10971 )
...
Fixes #10945
6 years ago
ed19f33440
Fix margins on profile metadata in single column mode ( #10961 )
6 years ago
02b56c7e1a
Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream
6 years ago
6077eca240
Add profile directory link to single column navigation panel ( #10963 )
6 years ago
a1e96b2d8a
Add missing Korean translations ( #10962 )
...
And change some word.
6 years ago
8eb7c3304e
[Glitch] Fix profile picture preview
...
Port e13e4b28db
6 years ago
76918554a6
Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream
...
Conflicts:
- Gemfile.lock
- config/webpack/rules/css.js
- package.json
- yarn.lock
6 years ago
e13e4b28db
Fix profile picture preview ( #10931 )
6 years ago
5b92910664
Fix expanding status from menu modal in glitch-soc
...
Fixes #1085
6 years ago
d93b82af87
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
6 years ago
7c1ca0c37b
Center 2-columns layout without side effect ( #10915 )
6 years ago
06036081a0
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
22130a0947
Fix incorrect PropType in Glitch AutosuggestInput
6 years ago
e04724296b
Remove isRequired from Glitch ReplyIndicator status
...
This can be null under normal circumstances, which isRequired doesn't
like.
6 years ago
8d9755e5f5
Change links in right panel to open in the same tab ( #10848 )
...
For Rambox compatibility
6 years ago
3333250ede
Fix React warning about legacy lifecycle calls and sensitive status resetting ( #10872 )
6 years ago
7f203f7c49
Fix safari post field display issue in single column layout ( #10883 )
6 years ago
33ec9c5095
i18n: Update Corsican front-end translation ( #10884 )
6 years ago
c6e1229a82
Update Japanese translations. ( #10875 )
...
run yarn manage:translations ja && i18n-tasks add-missing ja
6 years ago
0c2ca1bd38
I18n: Update Czech translation ( #10874 )
6 years ago
56d8faab18
[Glitch] Use `<use />` to render transparent SVG logo instead of inserting it
...
Port SCSS changes from 8d5dcc9301
6 years ago
3d73d76e55
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
451e5980b6
Refactor footers in web UI into a single component ( #10846 )
6 years ago
3593b85423
Display notifications count on a new single column ( #10859 )
6 years ago
6d60701bfa
Fix video player regressions introduced by blurhash merge
6 years ago
b4d4138cf9
[Glitch] Add keyboard shortcut to hide/show media
...
Port a472190729988342a56c
6 years ago
8d5dcc9301
Use `<use />` to render transparent SVG logo instead of inserting it ( #10845 )
6 years ago
3b9c02506d
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.
6 years ago
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”.
6 years ago
fdb3952b20
[Glitch] Fix composer route opening when not needed
...
Port c1e77b56a9
6 years ago
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
6 years ago
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
6 years ago
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 )
6 years ago
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
6 years ago
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
6 years ago
4168aeb234
Avoid cutting bottom of letters of last paragraph of statuses ( #10821 )
6 years ago
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
6 years ago
7fb76999af
Use Sec-WebSocket-Protocol instead of query string to pass WebSocket token
...
Inspired by https://github.com/kubevirt/kubevirt/issues/1242
6 years ago
652147a3f4
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- streaming/index.js
6 years ago
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
6 years ago
84dc21d55d
Various improvements to single column layout ( #10809 )
...
- Add potential side panels to single column layout
- Hide FAB on large screens
6 years ago
a1143a19c0
[Glitch] Fix stacking order of emoji picker
...
Port 8a378d4c3d
6 years ago
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`.
6 years ago
0744d6e571
Make headers font size proportional
6 years ago
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
6 years ago
8a378d4c3d
Fix stacking order of emoji picker ( #10801 )
6 years ago
ee0e68e97a
i18n: Complete frontend Bengali translation ( #10800 )
...
* i18n: Complete frontend Bengali translation
* run yarn manage:translations
6 years ago
4fbce23992
Refactor contentType selection in glitch composer
6 years ago
2cd7bfac23
Use glitch-soc's poll component instead of upstream's
6 years ago
08a2af27c3
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
bb9d7fad9f
fix `isSubmitting` prop case ( #10785 )
6 years ago
f509815379
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
6fe474837c
Change poll options to alphabetic letters when status text is hidden ( #10685 )
...
Fix #10569
6 years ago
56245a2a72
Export fallback content type and use it as default in WebUI
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
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
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
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
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
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
fe8a8f779e
Add confirm modal for unboosting toots ( #10287 )
...
[#3815 ]
Display the boost modal also when unboosting toots.
6 years ago
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
6 years ago
0402c52f28
Improve poll link accessibility ( #10720 )
...
* Add distinction between hover and active/focus states
* Resolves #10198
6 years ago
09eea46631
Bring back crossed eye icon on gallery ( #10715 )
6 years ago
3191c3b349
Fix tabs bar on mobile
...
Fixes #1037
6 years ago
5c82d660d1
Fix some colors of high contrast theme ( #10711 )
...
* Fix "nothing here" text color of high contrast
* Fix counter border color of high contrast
6 years ago
2c767f44bf
Fix front-end crash when a video has a blurhash and is hidden behind a CW
6 years ago
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
6 years ago
b2f5b1045f
Add description on hover in media gallery ( #10713 )
6 years ago
89d2859296
Fix content warning button displaying a link icon when no status card is set
6 years ago
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.
6 years ago
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
6 years ago
8383222026
fix pinned columns ’s Media-only button
...
Media-only toggles could not be used on pinned columns.
The commit fixes this problem.
6 years ago
eef8802325
[Glitch] Make sure the instance banner is never cropped
...
Port 21209c2b52
6 years ago
832cf92c74
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
b7741ed732
I18n: Update Czech translation 🇨🇿 ( #10704 )
...
* I18n: Update Czech translation
* Tiny fix
6 years ago
21209c2b52
Make sure the instance banner is never cropped ( #10702 )
6 years ago
f2cf8144b4
Minor style fixes
6 years ago
9b1ef58c95
[Glitch] Change font weight of sensitive button to 500
...
Port 63b1388fef
6 years ago
f59973cc85
[Glitch] Make the "mark media as sensitive" button more obvious in web UI
...
Port 05ef3462ba
6 years ago
b1ab4d5ebe
Add visibility icon back in media gallery
6 years ago
cbda1b8b66
Add back description on hover
6 years ago
8e221cd22b
[Glitch] Fix transition: all
...
Port 7aa749ab46
6 years ago
b7f69beebe
[Glitch] Make the cursor icon consistant across media types in account media gallery
6 years ago
52a4284fe5
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
bc97fd641f
[Glitch] Add button to view context to media modal
...
Port eb63217210
6 years ago
209c080280
[Glitch] Fix alignment of items in the account gallery in web UI and load more per page
...
Port 967e419f8f
6 years ago
a5da59f140
[Glitch] Change account gallery in web UI
...
Port 3f143606fa
6 years ago
373dd1fdf1
Minor CSS fixes
6 years ago
ccf4f3240a
[Glitch] Add blurhash
...
Port front-end changes from fba96c808d
6 years ago
7aa749ab46
Fix transition: all ( #10699 )
6 years ago
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
6 years ago
1149ddd3da
Fix glitch SCSS for links in error messages in admin interface
...
Port SCSS changes from 011b032300
6 years ago
33c80e0783
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/models/media_attachment.rb
6 years ago
9f25ab9792
Fix polls icon not showing in CW button in detailed statuses
6 years ago
63b1388fef
Change font weight of sensitive button to 500 ( #10682 )
6 years ago
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
6 years ago
7617f78359
Fix crash in onboarding modal
...
Fixes #1027
6 years ago
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
6 years ago
5121d9c12f
When selecting a toot via keyboard, ensure it is scrolled into view ( #10593 )
6 years ago
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"
6 years ago
967e419f8f
Fix alignment of items in the account gallery in web UI and load more per page ( #10674 )
6 years ago
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
6 years ago
cc5a81b7d8
Make hi-color privacy icons opt-in instead of opt-out
6 years ago
ac54292d69
Add high color privacy icons
...
Fixes #1015
6 years ago
d4c95e6a8a
When selecting a toot via keyboard, ensure it is scrolled into view
...
Fixes detailed status column
6 years ago
3e095cab83
Add support for missing formatting tags
6 years ago
67fb9a8679
Add keyboard shortcut to collapse/uncollapse toots
6 years ago
f3acf8f414
Add hotkey for bookmarking a toot
6 years ago
5e79dd3f17
Update hy.json ( #10644 )
6 years ago
cd9a284702
Fix regression with textarea's caret position when selecting a suggestion
6 years ago
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
6 years ago
aa1832ac4d
Hide suggestions by default
...
They will be enabled if the input has focus
6 years ago
fddd8251dd
Attempt to fix CSS
6 years ago
d7e4be285a
Add emoji suggestion to poll options
6 years ago
df52004fe6
Add suggestions in CW field
6 years ago
3a671470ec
Refactor selectComposeSuggestion so that different paths can be updated
6 years ago
852ccea676
Fix upload progressbar when image resizing is involved ( #10632 )
6 years ago
1c0402c103
Do not ask to register web intent handler
6 years ago
b13c90f3e3
Fix color of muted statuses content not wrapped in a p tag
6 years ago
e4b65e6349
Redesign blockquote styling
6 years ago
8753e5317f
Better distinguish titles from text
6 years ago
3631c3314a
Remove extra margin in paragraphs inside blockquotes
6 years ago
9b86707b1e
Make bold text bolder
6 years ago
5a8495dabe
Remove margins around `p` tags in lists
6 years ago
ef249a2718
Rename status__text to status__content__text for consistency with upstream
6 years ago
adbb174c9c
Fix status header display in toot mobile menu
6 years ago
ef1504d625
Fix upload progressbar when image resizing is involved
6 years ago
ffab9d626a
Hide media upload form if no media are attached
6 years ago
416aa832e5
Fix file upload
6 years ago
3d722b0c4e
Fix settings modal
6 years ago
27e8354914
Add support for lists in statuses
6 years ago
659f972bed
Do not switch to italic for status media buttons
6 years ago
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.
6 years ago
039e35560c
[Glitch] Fix modal items cannot scroll on touch devices
...
Port d763d39d26
6 years ago
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
6 years ago
c3fa4e8e07
Fix ReferenceError in dropdown
6 years ago
d779ec1f0e
Fix broken reference to handleSubmit
6 years ago
e949861176
Cleanup
6 years ago
faff152ae5
Move ComposerPublisher to Compose
6 years ago
df951c319c
Add OptionsContainer
6 years ago
14028655df
Move composer Dropdown from features/composer to features/compose
6 years ago
4c6221929f
Move ComposerTextareaIcons to TextareaIcons
6 years ago
47faf47ed5
ComposerTextarea → AutosuggestTextarea
6 years ago
a243567a3e
ComposerUploadForm → UploadForm + UploadFormContainer
6 years ago
c5f49a92dc
Move PollForm from features/composer to features/compose
6 years ago
f1a22e33e2
Inline spoiler input
6 years ago
8fd599fb40
ComposerReply → ReplyIndicator
6 years ago
f72af5794d
Refactor Compose*Warning → ContainerWarning
...
Regression: only one warning at a time
6 years ago
Thibaut Girka
mayaeh
manuelviens
Alix Rossi
Eugen Rochko
spla
Aditoo17
Jeong Arm
Yamagishi Kazutoshi
Wenceslao Páez Chávez
Takeshi Umeda
Hanage999
slice
abcang
りんすき
Neil Moore
Mélanie Chauvel (ariasuni)
nzws
dxwc
Hinaloe
Haelwenn (lanodan) Monnier
KokaKiwi
Maciek Baron
nzws
Aurélien Reeves
Alix Rossi
jeroenpraat
Kirishima21
Baptiste Gelez
partev
kedama