Thibaut Girka
16a4a333a2
Merge upstream styling for public profile endorsements
...
Port the SCSS part of f2404de871
to glitch-soc
6 years ago
Thibaut Girka
e5a603206d
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
app/controllers/accounts_controller.rb
app/javascript/mastodon/locales/pl.json
app/views/about/more.html.haml
Conflicts in `accounts_controller.rb` resolved by taking upstream's
version + our `use_pack`.
Conflicts in `pl.json` resolved by taking upstream's changes.
Conflicts in `aboute/more.html.haml` resolved by taking upstream's changes.
6 years ago
Thibaut Girka
90b492143d
Introduce OAuth scopes for bookmarks
6 years ago
Eugen Rochko
5b8603879f
Adjust responsive design for /about/more and /terms ( #8158 )
...
Follow-up to #8142
6 years ago
Eugen Rochko
aff6a15061
When follow is removed, remove endorsement ( #8149 )
6 years ago
Eugen Rochko
0dcc1950d1
Update /terms and /about/more to use public layout ( #8142 )
6 years ago
Eugen Rochko
f2404de871
Public profile endorsements (accounts picked by profile owner) ( #8146 )
6 years ago
Evgeny Petrov
80176a3814
[RU] Translation update: ( #8147 )
...
* [RU] Translation update:
• Added translation to Welcome timeline
• Doorkeeper: changed date format to more common in Russia
• Doorkeeper: added translation to scopes
• Added translation to Dashboard settings (I didn't have a chance to test it on Live server, so some strings may be a bit incorrect)
• Added translation to Relays settings
• Added translation to Filters settings
• Some other small fixes and improvements
* Quoted string for "joined" key to avoid mapping error
* [RU] Changed "повторить" (repeat) to "исправить" (change, fix) for a more correct translation.
* i18n-tasks normalize
6 years ago
Eugen Rochko
d974c94478
Remove protocol handler registration ( #8127 )
...
Browser UI too confusing / scares people, protocol URIs not used much
6 years ago
Thibaut Girka
7d1dd59496
Good bye, CW rainbows
...
Accessibility issues largely outweigh the joke and consistency with upstream.
6 years ago
Thibaut Girka
c700778922
Scroll to linked status in public status view
6 years ago
ThibG
1ab8b4b8ea
Scroll to linked status in public status view ( fixes #7884 ) ( #8130 )
...
When there is a single detailed status on a public page, scroll to it and
replace the history state to not scroll back on refresh (simulates # anchors).
6 years ago
Thibaut Girka
617c3a8006
Restore glitch-soc's 500 characters limit for bios ( fixes #625 )
6 years ago
Thibaut Girka
5e6cec4a40
Import upstream's emojify function in settings.js
...
This fixes updating the profile preview when changing display name.
6 years ago
ThibG
c52bcc0331
Serialize text-less statuses as '.' over OStatus ( fixes #7856 ) ( #8126 )
6 years ago
Marcin Mikołajczak
23b22d0dff
i18n: Make Polish translation more gender neutral + update ( #8119 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
6 years ago
ThibG
dad8a1baf2
Render custom emoji in display name on public profile ( #8115 )
6 years ago
Thibaut Girka
ed69117048
Fix styling of toot prepended text on public profiles
...
Fixes how “Pinned toot”, “… boosted” etc. are styled on public profiles.
6 years ago
Thibaut Girka
bf1d3ae3b8
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
config/settings.yml
6 years ago
Yamagishi Kazutoshi
4da03a298a
Do not show pinned toots when min_id is set ( #8111 )
6 years ago
Thibaut Girka
71b318dedc
Delete leftovers from keyword_mutes
6 years ago
Thibaut Girka
a0d0111979
Fix toot styling on public pages
...
The public pages now use CSS from the WebUI to style toots, but the glitch-soc
UI is widely different. Hack around that for now by hardcoding upstream-like
values.
6 years ago
Thibaut Girka
7ab46b73bd
Reintroduce glitch-soc avatar styling in public pages
6 years ago
Thibaut Girka
a3dd2deda3
[Glitch] Do not hide hashtag timeline in mobile view, make it full-window
...
Port 13ac8ca66a
to glitch-soc
6 years ago
Thibaut Girka
175c2155a9
[Glitch] Compensate for scrollbar disappearing when media modal
...
Port 60df87f6f0
to glitch-soc
6 years ago
Thibaut Girka
d2b3eebe00
[Glitch] Show media modal on public timeline
...
Port e0b1e17bd0
to glitch-soc
6 years ago
Thibaut Girka
5cd7fe21bf
[Glitch] Add missing formatting to the text in hero widget
...
Port 1d773b3a46
to glitch-soc
6 years ago
Thibaut Girka
d894cdc93f
Port profile redesign to glitch-soc
...
Port bb71538bb5
to glitch-soc
6 years ago
Thibaut Girka
c1c514ca70
Merge branch 'master' into glitch-soc/merge-upstream
...
Manually-resolved conflicts:
.circleci/config.yml
app/controllers/accounts_controller.rb
app/controllers/auth/passwords_controller.rb
app/controllers/statuses_controller.rb
app/javascript/packs/public.js
app/models/media_attachment.rb
app/views/stream_entries/_content_spoiler.html.haml
app/views/stream_entries/_media.html.haml
config/locales/en.yml
config/locales/ja.yml
config/locales/pl.yml
lib/mastodon/version.rb
Some content from app/javascript/packs/public.js has been split to
app/javascript/core/settings.js.
Translation strings for glitch-soc's keyword mutes were dropped.
Everything else was mostly “take both”.
6 years ago
Eugen Rochko
cc56f2230a
Add separate setting for sidebar text (site_short_description) ( #8107 )
...
* Add separate setting for sidebar text (site_short_description)
* Fix tests
6 years ago
Thibaut Girka
88b593a63f
Drop glitch-style account bio fields
...
Upstream's implementation has been merged a while ago and is the preferred
way to set fields, as it is the only one compatible with upstream and is
more user-friendly.
This commit deletes the legacy glitch-soc FrontMatter functionality in order
to clean up the code and make it easier to maintain.
6 years ago
Thibaut Girka
c4bec9263c
Disallow remote users from viewing local-only toots
6 years ago
Eugen Rochko
13ac8ca66a
Do not hide hashtag timeline in mobile view, make it full-window ( #8093 )
6 years ago
Eugen Rochko
60df87f6f0
Compensate for scrollbar disappearing when media modal visible ( #8100 )
...
* Compensate for scrollbar disappearing when media modal visible
Make auth pages backgrounds lighter
* Fix typo
6 years ago
Eugen Rochko
e7e577dd6e
Enforce username format for remote users, too ( #8102 )
...
Initially I thought there might be valid reasons for remote users to
have a different, unpredicted username format. However, I now realize
such a difference would be unusable and unexpected within Mastodon.
Fix #8058
6 years ago
Eugen Rochko
07b799468d
Fix incorrect context definition for the "featured" keyword ( #8090 )
...
* Fix incorrect context definition for the "featured" keyword
Fix #8077
* Adjust context definition for movedTo
6 years ago
Eugen Rochko
1656663598
Convert MOV and WEBM to MP4, raise maximum limit to 40MB ( #8101 )
...
Separate size limits for images and video. Images remain at 8MB,
while videos can be up to 40MB.
6 years ago
Thibaut Girka
1bae4c4f83
[Glitch] Resize images by area instead of fixed dimensions
...
Port WebUI part of 0fb0037ca7
to glitch-soc
6 years ago
Thibaut Girka
5f1bdca4c8
Merge commit 'e23b26178a71f90d64fe2a3e9e4468f265ecc71c' into glitch-soc/merge-upstream
...
Merge upstream changes right before the public profile redesign.
6 years ago
Thibaut Girka
b02bfe86ce
Don't reset scroll position when opening a modal
6 years ago
Thibaut Girka
5d060cb6e4
Allow modals to be closed by pressing “back”
6 years ago
Thibaut Girka
3eb3c21327
Treat the App Setting link as a proper link ( fixes #375 )
6 years ago
Thibaut Girka
88b7ccc2ca
[Glitch] Improve WebUI account action bar
...
Mostly a port of 2ccef52a4f
to glitch-soc
6 years ago
Thibaut Girka
4cf7cfd9e0
[Glitch] Fix accounts' display name/bio not being set from initial state
...
Port 20d1be18af
to glitch-soc
6 years ago
Yamagishi Kazutoshi
18831acc10
Weblate translations (2018-07-30) ( #8096 )
...
* Translated using Weblate (Czech)
Currently translated at 100.0% (306 of 306 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/
* Translated using Weblate (Czech)
Currently translated at 4.8% (4 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/cs/
* Translated using Weblate (Czech)
Currently translated at 29.5% (196 of 663 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/
* Translated using Weblate (Czech)
Currently translated at 30.1% (200 of 663 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/
* Translated using Weblate (Telugu)
Currently translated at 100.0% (306 of 306 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/te/
* Translated using Weblate (Czech)
Currently translated at 49.4% (328 of 663 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/
* Translated using Weblate (Japanese)
Currently translated at 99.8% (662 of 663 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (306 of 306 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/
* Translated using Weblate (Czech)
Currently translated at 70.4% (467 of 663 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/
* Translated using Weblate (Ukrainian)
Currently translated at 92.3% (612 of 663 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/uk/
* Translated using Weblate (Telugu)
Currently translated at 100.0% (306 of 306 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/te/
* Translated using Weblate (Korean)
Currently translated at 100.0% (82 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ko/
* Translated using Weblate (Czech)
Currently translated at 71.6% (475 of 663 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/
* Translated using Weblate (Korean)
Currently translated at 100.0% (306 of 306 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ko/
* Translated using Weblate (Czech)
Currently translated at 95.0% (630 of 663 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/
* Translated using Weblate (Korean)
Currently translated at 99.8% (662 of 663 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ko/
* Translated using Weblate (Danish)
Currently translated at 79.3% (526 of 663 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/da/
* Translated using Weblate (Czech)
Currently translated at 99.8% (662 of 663 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/
* Translated using Weblate (Czech)
Currently translated at 100.0% (306 of 306 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/
* Translated using Weblate (Czech)
Currently translated at 50.0% (31 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/cs/
* yarn manage:translations && i18n-tasks normalize && i18n-tasks remove-unused
6 years ago
Yamagishi Kazutoshi
06c83527f5
Do not scroll up when modal is opened ( #8095 )
6 years ago
Eugen Rochko
0a3cc246ac
Fix size/dimension values in avatar/header hint localizations ( #8088 )
6 years ago
Eugen Rochko
1d773b3a46
Add missing formatting to the text in hero widget ( #8089 )
6 years ago
Thibaut Girka
d8544e7003
Use same margin for navbar and column for consistency
6 years ago
Thibaut Girka
69ea4a01e1
Hide navigation bar text so it can fit on small screens
6 years ago