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
ThibG
Neil Moore
nzws
Maciek Baron
nzws
Aurélien Reeves
Alix Rossi
Jeong Arm
spla
mayaeh
jeroenpraat
Kirishima21
Baptiste Gelez
Aditoo17
Eugen Rochko
partev
kedama
Yamagishi Kazutoshi
Jessica
Sho Kusano
Renato "Lond" Cerqueira
Evgeny Petrov
Marek Ľach
Yağızhan
Quentí
ashleyhull-versent