73e610790e
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
c7feecc715
Improve light theme ( #10992 )
6 years ago
b44ae7d284
Fix RTL layout not being RTL within the columns area ( #10990 )
6 years ago
f8e1c0da75
[Glitch] Fix not being able to directly switch between list timelines in web UI
...
Port a36e4db82f
6 years ago
c15ff07c69
[Glitch] Fix “mark as sensitive” not being used in delete & redraft
...
Port 024ec0759c
6 years ago
a473a7912b
[Glitch] Scroll to compose form when focus
...
Port 91ae2d1275
6 years ago
5c1a46bdcf
Fix some React warnings ( #10989 )
6 years ago
2c240378b2
[Glitch] Fix refreshing featured toots when the new collection is empty
...
Port 1fee4b0fe2
6 years ago
00552d2f79
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/statuses_controller.rb
- app/controllers/stream_entries_controller.rb
6 years ago
390f22ab44
Fix display of alt-text when a media attachment is not available
6 years ago
2b35ddc80a
Fix display of alt-text when a media attachment is not available ( #10981 )
6 years ago
8bf8d6d9d9
Change preferences page into appearance, notifications, and other ( #10977 )
6 years ago
e20f7876e8
Fix sass-lint config ( #10982 )
6 years ago
796b8e8d34
Fix overlap of emoji button on search popup ( #10978 )
6 years ago
2b54b78962
Fix CW field automatically getting the focus when it is always enabled
6 years ago
a36e4db82f
Fix not being able to directly switch between list timelines in web UI ( #10973 )
6 years ago
024ec0759c
Fix “mark as sensitive” not being used in delete & redraft ( #10980 )
6 years ago
88a04bf6c4
Fix emoji picker being always displayed ( #10979 )
...
* Fix emoji picker being always displayed
* Remove duplicate content with other pull-requests
6 years ago
91ae2d1275
Scroll to compose form when focus ( #10970 )
...
* Scroll to compose form when focus
* Get rid of constructor
6 years ago
1fee4b0fe2
Fix refreshing featured toots when the new collection is empty ( #10971 )
...
Fixes #10945
6 years ago
b01b8521ec
Fix margins on profile metadata in single column mode ( #10961 )
6 years ago
a76c660645
Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream
6 years ago
4331f4948e
Add profile directory link to single column navigation panel ( #10963 )
6 years ago
ca61d7577a
Add missing Korean translations ( #10962 )
...
And change some word.
6 years ago
3d34bc17e2
[Glitch] Fix profile picture preview
...
Port 77375ad7df
6 years ago
a4e0071538
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
77375ad7df
Fix profile picture preview ( #10931 )
6 years ago
1501b142d2
Fix expanding status from menu modal in glitch-soc
...
Fixes #1085
6 years ago
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
6 years ago
702dbf1622
Center 2-columns layout without side effect ( #10915 )
6 years ago
206d0ea6a2
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
fb0489022c
Fix incorrect PropType in Glitch AutosuggestInput
6 years ago
c12383e06c
Remove isRequired from Glitch ReplyIndicator status
...
This can be null under normal circumstances, which isRequired doesn't
like.
6 years ago
233a60f6a2
Change links in right panel to open in the same tab ( #10848 )
...
For Rambox compatibility
6 years ago
0162dc0c9c
Fix React warning about legacy lifecycle calls and sensitive status resetting ( #10872 )
6 years ago
9c174f4d02
Fix safari post field display issue in single column layout ( #10883 )
6 years ago
6f624f449e
i18n: Update Corsican front-end translation ( #10884 )
6 years ago
7403b0ec05
Update Japanese translations. ( #10875 )
...
run yarn manage:translations ja && i18n-tasks add-missing ja
6 years ago
d0dc7a60ab
I18n: Update Czech translation ( #10874 )
6 years ago
40117d908f
[Glitch] Use `<use />` to render transparent SVG logo instead of inserting it
...
Port SCSS changes from c5234ac2aa
6 years ago
b9c5aed987
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
7d2b4e9277
Refactor footers in web UI into a single component ( #10846 )
6 years ago
4c9d8f8ef9
Display notifications count on a new single column ( #10859 )
6 years ago
938edb44a1
Fix video player regressions introduced by blurhash merge
6 years ago
c1619a5c24
[Glitch] Add keyboard shortcut to hide/show media
...
Port 7ee189fa609e238804ea
6 years ago
c5234ac2aa
Use `<use />` to render transparent SVG logo instead of inserting it ( #10845 )
6 years ago
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.
6 years ago
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”.
6 years ago
c65b14059a
[Glitch] Fix composer route opening when not needed
...
Port 9ff2739fb5
6 years ago
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
6 years ago
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
6 years ago
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 )
6 years ago
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
6 years ago
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
6 years ago
276c9e6e9e
Avoid cutting bottom of letters of last paragraph of statuses ( #10821 )
6 years ago
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
6 years ago
57911e10c5
Use Sec-WebSocket-Protocol instead of query string to pass WebSocket token
...
Inspired by https://github.com/kubevirt/kubevirt/issues/1242
6 years ago
e8b45064b8
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- streaming/index.js
6 years ago
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
6 years ago
106cfa7553
Various improvements to single column layout ( #10809 )
...
- Add potential side panels to single column layout
- Hide FAB on large screens
6 years ago
3d860417a5
[Glitch] Fix stacking order of emoji picker
...
Port 1fbe5c2fec
6 years ago
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`.
6 years ago
9a101b91ae
Make headers font size proportional
6 years ago
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
6 years ago
1fbe5c2fec
Fix stacking order of emoji picker ( #10801 )
6 years ago
0a1ba7c14b
i18n: Complete frontend Bengali translation ( #10800 )
...
* i18n: Complete frontend Bengali translation
* run yarn manage:translations
6 years ago
a0b7246388
Refactor contentType selection in glitch composer
6 years ago
0bc9d4f6d3
Use glitch-soc's poll component instead of upstream's
6 years ago
e21662d370
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
4de9bd3870
fix `isSubmitting` prop case ( #10785 )
6 years ago
fd5da4033e
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
3a4761c665
Change poll options to alphabetic letters when status text is hidden ( #10685 )
...
Fix #10569
6 years ago
b83cdc9b02
Export fallback content type and use it as default in WebUI
6 years ago
dfeda8857f
Hide content-type dropdown by default
6 years ago
76d58bf63e
Content-Type Dropdown: use the selected option icon for the menu
...
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years ago
8a49df8ede
Support proper content-type in Delete & Redraft
6 years ago
08a981dd25
Add status content type dropdown to compose box.
...
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years ago
38272bbeb1
Merge pull request #1049 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
422dd06806
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
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.
6 years ago
d8e9a04354
Fix rich text style in reply indicator
6 years ago
9f0ff9b6ea
Fix rich text styling on public pages
6 years ago
6e625755a6
Fix text color of some formatted elements in notifications
6 years ago
f79d089b65
Fix some colors in light theme ( #10754 )
...
* Fix typo in light theme
* Fix background color of empty column
6 years ago
cfb69164ad
Fix incorrect reference to raw_content (it is raw_text instead) ( #10753 )
6 years ago
c8195e2da1
[Glitch] Use raw content if available on Delete & Redraft
...
Port front-end changes from 2a917031c9
6 years ago
5262820fae
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
46b5085ced
Use a checkbox for the “Mark media as sensitive” composer button
...
Fixes #1039
6 years ago
0bb3ba2406
Merge pull request #1043 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
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
6 years ago
e060819020
[Glitch] Improve poll link accessibility
...
Port fc40391743
6 years ago
f625501c05
[Glitch] Fix some colors of high contrast theme
...
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years ago
22541e98e2
[Glitch] Add confirm modal for unboosting toots
...
Port d225a952a8
6 years ago
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
6 years ago
1959e4e5ec
i18n: Update Corsican translations ( #10746 )
...
* i18n: Update Corsican translations
* Update co.yml
* Fix a translation in co.yml
6 years ago
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
6 years ago
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
6 years ago
e55cf0042f
Fix media description confirmation modal
...
Fixes #1040
6 years ago
d225a952a8
Add confirm modal for unboosting toots ( #10287 )
...
[#3815 ]
Display the boost modal also when unboosting toots.
6 years ago
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
6 years ago
fc40391743
Improve poll link accessibility ( #10720 )
...
* Add distinction between hover and active/focus states
* Resolves #10198
6 years ago
3288f4a571
Bring back crossed eye icon on gallery ( #10715 )
6 years ago
e9f0c31dc6
Fix tabs bar on mobile
...
Fixes #1037
6 years ago
6b71076391
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
40a480ea34
Fix front-end crash when a video has a blurhash and is hidden behind a CW
6 years ago
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
6 years ago
139ef769f7
Add description on hover in media gallery ( #10713 )
6 years ago
5052b8c29f
Fix content warning button displaying a link icon when no status card is set
6 years ago
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.
6 years ago
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
6 years ago
1592cab613
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
83665f0357
[Glitch] Make sure the instance banner is never cropped
...
Port 05b2a77a6d
6 years ago
23829e09f5
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
71fd62835e
I18n: Update Czech translation 🇨🇿 ( #10704 )
...
* I18n: Update Czech translation
* Tiny fix
6 years ago
05b2a77a6d
Make sure the instance banner is never cropped ( #10702 )
6 years ago
850f8195fd
Minor style fixes
6 years ago
5df7b98c2b
[Glitch] Change font weight of sensitive button to 500
...
Port f7879bbe08
6 years ago
8050f86d04
[Glitch] Make the "mark media as sensitive" button more obvious in web UI
...
Port cc39785d45
6 years ago
167808363d
Add visibility icon back in media gallery
6 years ago
43dc5ad0e5
Add back description on hover
6 years ago
d0342a1a63
[Glitch] Fix transition: all
...
Port 9e044c9649
6 years ago
09d6a2920d
[Glitch] Make the cursor icon consistant across media types in account media gallery
6 years ago
5d6f4ef070
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
52c09770fe
[Glitch] Add button to view context to media modal
...
Port 4aabc452d0
6 years ago
6138cad296
[Glitch] Fix alignment of items in the account gallery in web UI and load more per page
...
Port 78f5b96bf6
6 years ago
3b9ff1fa34
[Glitch] Change account gallery in web UI
...
Port db73f8e585
6 years ago
61b5fd518c
Minor CSS fixes
6 years ago
87a7a9a4df
[Glitch] Add blurhash
...
Port front-end changes from a6d2fe7165
6 years ago
9e044c9649
Fix transition: all ( #10699 )
6 years ago
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
6 years ago
0f1d2f4d71
Fix glitch SCSS for links in error messages in admin interface
...
Port SCSS changes from 8c716f917f
6 years ago
73bc58c656
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/models/media_attachment.rb
6 years ago
d20647fd94
Fix polls icon not showing in CW button in detailed statuses
6 years ago
f7879bbe08
Change font weight of sensitive button to 500 ( #10682 )
6 years ago
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
6 years ago
c15b1aa00c
Fix crash in onboarding modal
...
Fixes #1027
6 years ago
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
6 years ago
d8418c07c9
When selecting a toot via keyboard, ensure it is scrolled into view ( #10593 )
6 years ago
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"
6 years ago
78f5b96bf6
Fix alignment of items in the account gallery in web UI and load more per page ( #10674 )
6 years ago
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
6 years ago
e53b2a9c37
Make hi-color privacy icons opt-in instead of opt-out
6 years ago
f5f0bd6c0a
Add high color privacy icons
...
Fixes #1015
6 years ago
98732502f5
When selecting a toot via keyboard, ensure it is scrolled into view
...
Fixes detailed status column
6 years ago
81c9377c7d
Add support for missing formatting tags
6 years ago
02bd678944
Add keyboard shortcut to collapse/uncollapse toots
6 years ago
7ed89e9178
Add hotkey for bookmarking a toot
6 years ago
f843bdbd73
Update hy.json ( #10644 )
6 years ago
5a8b820767
Fix regression with textarea's caret position when selecting a suggestion
6 years ago
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
6 years ago
b40841b488
Hide suggestions by default
...
They will be enabled if the input has focus
6 years ago
e720f1eac2
Attempt to fix CSS
6 years ago
4155a1556a
Add emoji suggestion to poll options
6 years ago
b35b38f4ea
Add suggestions in CW field
6 years ago
0541e4ad21
Refactor selectComposeSuggestion so that different paths can be updated
6 years ago
23e87a4742
Fix upload progressbar when image resizing is involved ( #10632 )
6 years ago
642a298ceb
Do not ask to register web intent handler
6 years ago
8942036345
Fix color of muted statuses content not wrapped in a p tag
6 years ago
73f83ef399
Redesign blockquote styling
6 years ago
f5ea016889
Better distinguish titles from text
6 years ago
8003dd8849
Remove extra margin in paragraphs inside blockquotes
6 years ago
a855f38086
Make bold text bolder
6 years ago
ad30895262
Remove margins around `p` tags in lists
6 years ago
ce2da44c2c
Rename status__text to status__content__text for consistency with upstream
6 years ago
facc95f71a
Fix status header display in toot mobile menu
6 years ago
b43cfd3eb3
Fix upload progressbar when image resizing is involved
6 years ago
4a95bfe919
Hide media upload form if no media are attached
6 years ago
07367bc6ec
Fix file upload
6 years ago
86108e7af7
Fix settings modal
6 years ago
9aeb714b7a
Add support for lists in statuses
6 years ago
fea727c61a
Do not switch to italic for status media buttons
6 years ago
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.
6 years ago
4ce6358787
[Glitch] Fix modal items cannot scroll on touch devices
...
Port 92ced1e94b
6 years ago
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
6 years ago
1b8d2af1f9
Fix ReferenceError in dropdown
6 years ago
25cfabce26
Fix broken reference to handleSubmit
6 years ago
041e27bd2d
Cleanup
6 years ago
2ee26ba420
Move ComposerPublisher to Compose
6 years ago
bf8b0394b7
Add OptionsContainer
6 years ago
ef17da32f9
Move composer Dropdown from features/composer to features/compose
6 years ago
a6bb49adf1
Move ComposerTextareaIcons to TextareaIcons
6 years ago
08faf16d66
ComposerTextarea → AutosuggestTextarea
6 years ago
513547ba57
ComposerUploadForm → UploadForm + UploadFormContainer
6 years ago
f7d1772fc8
Move PollForm from features/composer to features/compose
6 years ago
2021f14e8f
Inline spoiler input
6 years ago
3529f6f4ae
ComposerReply → ReplyIndicator
6 years ago
ad6166f0ef
Refactor Compose*Warning → ContainerWarning
...
Regression: only one warning at a time
6 years ago
5e4588524b
features/composer/index.js → ComposeForm
6 years ago
8ea0e64864
DrawerHeader → Header + HeaderContainer
6 years ago
2f2381a400
DrawerAccount → NavigationBar + NavigationContainer
6 years ago
7acc035cbe
[Glitch] Show suggested follows on search screen in mobile layout
...
Port 541fda5fc8
6 years ago
4aee182cd3
DrawerResults → SearchResults + SearchResultsContainer
6 years ago
7c2cc9d681
Rework DrawerResults to make them closer to upstream
6 years ago
5264424b71
Move DrawerSearch to Search + SearchContainer
6 years ago
7fa3320516
Inline DrawerSearchPopout in DrawerSearch
6 years ago
a55e1c1d49
Refactor a bit DrawerSearch to make it closer to upstream
6 years ago
e41c4ad61b
Rename flavours/glitch/features/drawer to flavours/glitch/features/compose
6 years ago
eb80c3924f
Allow switching between singe-option and multiple-option polls ( #10603 )
6 years ago
92ced1e94b
Fix modal items cannot scroll on touch devices ( #10605 )
6 years ago
3c6f8de45a
Minor code cleanup ( #10613 )
6 years ago
47c0af88f1
Add hi.json ( #10573 )
6 years ago
fe19e9d7b1
Update hy.json ( #10591 )
6 years ago
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
6 years ago
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
6 years ago
1fecdb013a
Use correct local names for fonts ( #10594 )
6 years ago
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
6 years ago
2da3b24eb8
[Glitch] Allow modal secondary button to shrink and allow wider confirmation modals
...
Port a6fe7ae53c
6 years ago
3673665b46
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
619d55358f
Shift+click on column Back button to return to last pinable column
6 years ago
a4db307b6a
When selecting a toot via keyboard, ensure it is scrolled into view
6 years ago
ae88690fa6
Fix opening/closing gifv sometimes making the timeline scroll
6 years ago
a6fe7ae53c
Allow modal secondary button to shrink and allow wider confirmation modals ( #10586 )
...
Fixes #10531
6 years ago
83420b9d41
Add new pt-br translations ( #10564 )
6 years ago
5a24934449
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
4c19204392
i18n: Russian localization update ( #10515 )
...
* i18n: Updated ru.json for Russian language
* i18n: Updated ru.yml
* Normalize ru.yml
* i18n: Updated simple_form.ru.yml
* i18n: Updated activerecord.ru.yml, devise.ru.yml, normalized strings
* Added new strings to ru.json
* Deleted unused (?) string
* i18n: Added recent strings (Settings refactor)
6 years ago
a0000b9a94
Weblate translations (2019-04-10) ( #10545 )
...
* Translated using Weblate (Occitan)
Currently translated at 95.7% (780 of 815 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/
* Translated using Weblate (Greek)
Currently translated at 100,0% (382 of 382 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/
* Translated using Weblate (Greek)
Currently translated at 100,0% (4 of 4 strings)
Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/el/
* Translated using Weblate (Greek)
Currently translated at 100.0% (382 of 382 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/
* Translated using Weblate (French)
Currently translated at 100.0% (382 of 382 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/
* Translated using Weblate (French)
Currently translated at 100.0% (4 of 4 strings)
Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/fr/
* Translated using Weblate (French)
Currently translated at 100.0% (66 of 66 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/fr/
* Translated using Weblate (Dutch)
Currently translated at 100,0% (4 of 4 strings)
Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/nl/
* Translated using Weblate (Galician)
Currently translated at 100,0% (4 of 4 strings)
Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/gl/
* Translated using Weblate (Dutch)
Currently translated at 100,0% (382 of 382 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/
* Translated using Weblate (Galician)
Currently translated at 100,0% (382 of 382 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/
* Translated using Weblate (Slovak)
Currently translated at 100.0% (382 of 382 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/
* Translated using Weblate (Arabic)
Currently translated at 97.4% (372 of 382 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/
* Translated using Weblate (French)
Currently translated at 100.0% (382 of 382 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/
* Translated using Weblate (Thai)
Currently translated at 75.4% (288 of 382 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/th/
* Translated using Weblate (Slovak)
Currently translated at 100.0% (4 of 4 strings)
Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/sk/
* Translated using Weblate (German)
Currently translated at 100,0% (4 of 4 strings)
Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/de/
* Translated using Weblate (Slovak)
Currently translated at 100,0% (4 of 4 strings)
Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/sk/
* Translated using Weblate (Kazakh)
Currently translated at 100,0% (4 of 4 strings)
Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/kk/
* Translated using Weblate (Persian)
Currently translated at 100.0% (382 of 382 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/
* Translated using Weblate (Kazakh)
Currently translated at 99.0% (378 of 382 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/kk/
* i18n-tasks normalize
* yarn manage:translations
* Fix empty string in Occitan
6 years ago
db70d35c3f
I18n: Final Czech translation 🇨🇿 ( #10542 )
...
* I18n: Update Czech translation
* I18n: Why do you want to join translation
* I18n: Translating a bunch of more stuff
6 years ago
aced669796
Updates the grammar of the SK translation ( #10541 )
6 years ago
771dc9235a
[Glitch] Fix glitched out "not found" message for non-existing profiles in web UI
...
Port 403338108e
6 years ago
c97a40647a
[Glitch] Add "why do you want to join" field to invite requests
...
Port SCSS changes from 7eb05b8724
6 years ago
cde0ac1aa7
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/views/admin/pending_accounts/index.html.haml
No real conflict, upstream changes too close to glitch-specific
theming system changes.
- config/navigation.rb
Upstream redesigned the settings navigation, took those changes
and re-inserted the flavours menu.
6 years ago
6286ace752
Fixed terrible grammar and translated the most ( #10527 )
...
The translation was written in bad Turkish grammar. I fixed those terrible phrases and translated %93 of Mastodon.
I'll come back and finish the translation.
6 years ago
7eb05b8724
Add "why do you want to join" field to invite requests ( #10524 )
...
* Add "why do you want to join" field to invite requests
Fix #10512
* Remove unused translations
* Fix broken registrations when no invite request text is submitted
6 years ago
403338108e
Fix glitched out "not found" message for non-existing profiles in web UI ( #10517 )
6 years ago
5c9f6740c6
[i18n] Update and correction ( #10511 )
...
* [i18n] Update and correction
* Update oc.json
* Update oc.json
6 years ago
0405e42c4a
Add column title to “Favourited by” and “Boosted by” columns
6 years ago
85a9a248f9
[Glitch] Duplicate values
...
Port 8037fa7d2e
6 years ago
2b965f8d17
[Glitch] Port SCSS changes from "Improve blocked view of profiles"
...
Port public pages SCSS changes from c84c30c542
6 years ago
5c8f9a3220
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- config/locales/pl.yml
Conflict caused by new upstream string too close to glitch-specific
“flavour” string. Took both strings.
6 years ago
c66a043591
Updated German locales ( #10505 )
...
* Updated German locales
* Added account approval locales (German)
* Updated JSON locales (German)
6 years ago
a5a7780ad1
i18n: Update Corsican translations ( #10504 )
6 years ago
20040927fc
i18n: Update Czech translation ( #10506 )
6 years ago
d035f4af41
Translate Korean ( #10499 )
6 years ago
4f8beb3717
i18n: Update Japanese translations ( #10494 )
...
* Update Japanese translations
* Update Japanese translations.
6 years ago
c84c30c542
Improve blocked view of profiles ( #10491 )
...
* Revert "Fix filtering of favourited_by, reblogged_by, followers and following (#10447 )"
This reverts commit 0317f37c6f#10442 )"
This reverts commit 4cd944d364
6 years ago
1409a529dd
Improve sk translation further ( #10484 )
...
* Further improving Slovak translation
* Update sk.json
6 years ago
b0348d0f92
tinyfix 2: unrequired arguments ( #10471 )
...
* unrequired argument
* unrequired argument
6 years ago
0e7c4d0c69
i18n: Update Polish translation ( #10479 )
...
Signed-off-by: Marcin Mikołajczak <m4sk1n@m4sk1n.nazwa.pl>
6 years ago
705a2b7615
Updates the Slovak translation ( #10477 )
...
* Update sk.json
* Update sk.json
* Update sk.json
6 years ago
4c20f5376a
Dutch (nl) translation ( #10474 )
...
* Translation Dutch
* Update activerecord.nl.yml
* Update devise.nl.yml
* Update nl.yml
* Update nl.yml
* Update devise.nl.yml
* Update nl.yml
6 years ago
8037fa7d2e
Duplicate values ( #10470 )
6 years ago
3964cc964d
Merge pull request #981 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
729b3841c3
[Glitch] Update poll remaining time just like with status timestamps
...
Port 6e024f0d7a
6 years ago
a835ea0e8f
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/following_accounts_controller.rb
Conflicts were due to glitch-soc's theming system.
- app/javascript/packs/public.js
Some code has been change upstream, but it has been
moved to app/javascript/core/settings.js in glitch-soc.
Applied the changes there.
6 years ago
f46cd7f002
i18n: update Catalan translation ( #10458 )
...
* 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
6 years ago
b83e693c40
Do not handle clicks in detailed status content
6 years ago
6e024f0d7a
Update poll remaining time just like with status timestamps ( #10466 )
6 years ago
aa7fe3101f
Hopefully fix input text selection quirks on iOS ( #10463 )
...
Fix #10448 (hopefully)
6 years ago
7deedcc0cf
Esperanto translations ( #10461 )
...
* Esperanto translations
* Translate untranslated Esperanto strings
* Normalize eo translation
6 years ago
a0eaf51ad4
Re-dd PT-br translations ( #10459 )
6 years ago
8cc94c38cf
i18n: update catalan translations ( #10455 )
...
* 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
6 years ago
445568eff3
I18n: Improve Czech translation ( #10454 )
6 years ago
5eb2632410
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/models/form/admin_settings.rb
- config/locales/ja.yml
6 years ago
4cd944d364
Hide blocking accounts from blocked users ( #10442 )
...
* Revert "Add indication that you have been blocked in web UI (#10420 )"
This reverts commit d31affe69b#10373 )"
This reverts commit a8bb10633dd31affe69b
6 years ago
0615bc56aa
i18n: Update Japanese translations ( #10427 )
...
* Update Japanese translations.
run yarn manage:translations && i18n-tasks add-missing
* Update Japanese translations.
* Fix mistake
* Change to be concise.
6 years ago
a547a214fd
[Glitch] Fix transparent avatars showing underlying elements in avatar stack and profile
...
Port 9a12568a33
6 years ago
2393504c23
[Glitch] Fix search in web UI not setting a limit, restore limit of 10
...
Port 20769a332a
6 years ago
99336afaff
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
1289e86116
Remove unused code ( #10426 )
6 years ago
ed2862e249
Fix emoji-mart crashing web UI on search by reverting the upgrade to 2.10.0 ( #10413 )
...
Fix #10315
This reverts commit e781d842a5
6 years ago
9a12568a33
Fix transparent avatars showing underlying elements in avatar stack and profile ( #10422 )
6 years ago
20769a332a
Fix search in web UI not setting a limit, restore limit of 5 ( #10421 )
...
The search API now supports returning more results and pagination,
but until the web UI implements pagination, it makes no sense to
dump so many results at once. This fix restores the behaviour
before the API change
6 years ago
d31affe69b
Add indication that you have been blocked in web UI ( #10420 )
6 years ago
0c334481cc
I18n: Update Czech translation ( #10419 )
6 years ago
6c39082e87
Add missing Korean translations ( #10416 )
...
* Fix Korean translation
* Add missing translation
6 years ago
1ce9bd86b3
Update Corsican translations ( #10418 )
...
* Update Corsican translation
* Update Corsican YML
* Corsican JSON fix
* Update co.yml
6 years ago
c2e0b3487d
l10n update: fa ( #10417 )
6 years ago
d1b617374c
[Glitch] squashed identity proof updates
...
Port JS from be7c92061c
6 years ago
b29731bb10
Fix background color transition in destructive buttons
6 years ago
4211c9b8d3
[Glitch] Fix opacity of relationship tags
...
Port ddd7a9e44b
6 years ago
773c600c26
Fix left border of profile navigation tab
6 years ago
751739337d
Add fa-info-circle to disclaimer
6 years ago
a23e513f79
Fix double border for account disclaimer
6 years ago
5900b0b206
[Glitch] Add rel='noopener' to redesigned profile column header avatar link
...
Port da47c30eac
6 years ago
fb17e24352
[Glitch] Move the account dropdown menubar to the right, make sure it doesn't move
...
Port 2e5ec8b7c8
6 years ago
6df0d0fd51
[Glitch] Make clicking on avatar open public profile in new tab
...
Port 70a78d968f
6 years ago
a338bde550
[Glitch] Fix menu items that don't action
...
Port 798d9a6b4a
6 years ago
cfbadfa392
[Glitch] Redesign profile column in web UI to match design on public pages
...
Port 858bc12635
6 years ago
22d45fe6b9
Fix centering on public pages
6 years ago
177a0ef2ec
Fix padding and centering of display names
6 years ago
1476826aba
Port search results styling to glitch-soc
6 years ago
1600aeb6cb
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ddd7a9e44b
Fix opacity of relationship tags ( #10411 )
6 years ago
2a740c3e9a
I18n: Update Czech translation ( #10410 )
6 years ago
be7c92061c
squashed identity proof updates ( #10375 )
6 years ago
0117de0a01
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/workers/activitypub/distribute_poll_update_worker.rb
- config/locales/pl.yml
6 years ago
f1a582dc15
Revert locales touched by automated translations ( #10399 )
...
* Revert ruined translations
Regression from #10362
* yarn manage:translations
6 years ago
da47c30eac
Add rel='noopener' to redesigned profile column header avatar link ( #10393 )
6 years ago
451a79bda3
Revert "fix: update to emoji-mart 2.10.0 ( #10281 )"
...
This reverts commit e781d842a5
6 years ago
d72bc923e9
Revert "[Glitch] fix: update to emoji-mart 2.10.0"
...
This reverts commit b0e478fcc5
6 years ago
910fd88da2
Revert "Fix compilation after emoji-picker change"
...
This reverts commit 05b79f07fa
6 years ago
add1f52864
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
2e5ec8b7c8
Move the account dropdown menubar to the right, make sure it doesn't move ( #10390 )
...
* Move the account dropdown menubar to the right, make sure it doesn't move
* Fix margin
6 years ago
5ca976c776
[Glitch] Add a “Block & Report” button to the block confirmation dialog
...
Port 36a6089a22
6 years ago
cab7e62235
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
36a6089a22
Add a “Block & Report” button to the block confirmation dialog ( #10360 )
6 years ago
70a78d968f
Make clicking on avatar open public profile in new tab ( #10387 )
6 years ago
824dc7c6b9
[Glitch] Do not set CSRF Token when no csrf header
...
Port cc670c3234
6 years ago
36daf28215
[Glitch] Change icons of features on admin dashboard to remove bias
...
Port SCSS changes from 88a85f2574
6 years ago
f6767a00d4
[Glitch] Add `lang` attribute to statuses in web UI
...
Port JS changes from 0e730974cd
6 years ago
Eugen Rochko
ThibG
Jeong Arm
Yamagishi Kazutoshi
Wenceslao Páez Chávez
Takeshi Umeda
Hanage999
slice
Alix Rossi
mayaeh
Aditoo17
abcang
りんすき
Neil Moore
Mélanie Chauvel (ariasuni)
nzws
dxwc
Hinaloe
Haelwenn (lanodan) Monnier
KokaKiwi
Maciek Baron
nzws
Aurélien Reeves
Alix Rossi
spla
jeroenpraat
Kirishima21
Baptiste Gelez
partev
kedama
Jessica
Sho Kusano
Renato "Lond" Cerqueira
Evgeny Petrov
Marek Ľach
Yağızhan
Quentí
ashleyhull-versent
koyu
marcin mikołajczak
Masoud Abkenar
Alex Gessner