16a4a333a2
Merge upstream styling for public profile endorsements
...
Port the SCSS part of f2404de871
2018-08-10 16:22:49 +02:00
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.
2018-08-10 16:22:31 +02:00
5b8603879f
Adjust responsive design for /about/more and /terms ( #8158 )
...
Follow-up to #8142
2018-08-10 06:43:02 +02:00
0dcc1950d1
Update /terms and /about/more to use public layout ( #8142 )
2018-08-09 12:58:20 +02:00
f2404de871
Public profile endorsements (accounts picked by profile owner) ( #8146 )
2018-08-09 09:56:53 +02:00
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
2018-08-09 08:50:42 +02:00
d974c94478
Remove protocol handler registration ( #8127 )
...
Browser UI too confusing / scares people, protocol URIs not used much
2018-08-08 21:12:45 +02:00
7d1dd59496
Good bye, CW rainbows
...
Accessibility issues largely outweigh the joke and consistency with upstream.
2018-08-07 18:49:49 +02:00
c700778922
Scroll to linked status in public status view
2018-08-07 16:58:00 +02:00
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).
2018-08-06 15:16:02 +02:00
617c3a8006
Restore glitch-soc's 500 characters limit for bios ( fixes #625 )
2018-08-06 08:20:29 +02:00
5e6cec4a40
Import upstream's emojify function in settings.js
...
This fixes updating the profile preview when changing display name.
2018-08-05 12:57:20 +02:00
23b22d0dff
i18n: Make Polish translation more gender neutral + update ( #8119 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-08-03 00:09:24 +02:00
ed69117048
Fix styling of toot prepended text on public profiles
...
Fixes how “Pinned toot”, “… boosted” etc. are styled on public profiles.
2018-08-02 12:43:00 +02:00
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.
2018-08-01 00:18:42 +02:00
7ab46b73bd
Reintroduce glitch-soc avatar styling in public pages
2018-08-01 00:18:42 +02:00
a3dd2deda3
[Glitch] Do not hide hashtag timeline in mobile view, make it full-window
...
Port 13ac8ca66a
2018-08-01 00:18:42 +02:00
175c2155a9
[Glitch] Compensate for scrollbar disappearing when media modal
...
Port 60df87f6f0
2018-08-01 00:18:42 +02:00
d2b3eebe00
[Glitch] Show media modal on public timeline
...
Port e0b1e17bd0
2018-08-01 00:18:42 +02:00
5cd7fe21bf
[Glitch] Add missing formatting to the text in hero widget
...
Port 1d773b3a46
2018-08-01 00:18:42 +02:00
d894cdc93f
Port profile redesign to glitch-soc
...
Port bb71538bb5
2018-08-01 00:18:42 +02:00
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”.
2018-08-01 00:18:13 +02:00
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.
2018-07-31 16:26:36 +02:00
13ac8ca66a
Do not hide hashtag timeline in mobile view, make it full-window ( #8093 )
2018-07-31 02:54:25 +02:00
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
2018-07-31 01:14:33 +02:00
1bae4c4f83
[Glitch] Resize images by area instead of fixed dimensions
...
Port WebUI part of 0fb0037ca7
2018-07-30 19:30:38 +02:00
5f1bdca4c8
Merge commit 'e23b26178a71f90d64fe2a3e9e4468f265ecc71c' into glitch-soc/merge-upstream
...
Merge upstream changes right before the public profile redesign.
2018-07-30 14:39:06 +02:00
b02bfe86ce
Don't reset scroll position when opening a modal
2018-07-30 14:32:02 +02:00
5d060cb6e4
Allow modals to be closed by pressing “back”
2018-07-30 14:32:02 +02:00
3eb3c21327
Treat the App Setting link as a proper link ( fixes #375 )
2018-07-30 14:31:45 +02:00
88b7ccc2ca
[Glitch] Improve WebUI account action bar
...
Mostly a port of 2ccef52a4f
2018-07-30 14:24:35 +02:00
4cf7cfd9e0
[Glitch] Fix accounts' display name/bio not being set from initial state
...
Port 20d1be18af
2018-07-30 14:24:24 +02:00
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
2018-07-30 03:43:34 +02:00
06c83527f5
Do not scroll up when modal is opened ( #8095 )
2018-07-29 16:52:06 +02:00
1d773b3a46
Add missing formatting to the text in hero widget ( #8089 )
2018-07-28 23:52:20 +02:00
d8544e7003
Use same margin for navbar and column for consistency
2018-07-28 23:26:18 +02:00
69ea4a01e1
Hide navigation bar text so it can fit on small screens
2018-07-28 23:26:18 +02:00
37302c63c3
Fix glitch-soc columns padding on mobile ( fixes #561 )
2018-07-28 23:26:18 +02:00
93d4e9a58d
Preserve hashtags in threaded mode ( fixes #584 )
2018-07-28 23:25:57 +02:00
28a59e4e80
Move CW field just above main textarea
2018-07-28 23:25:42 +02:00
358e3a4c32
Get rid of Collapsable, use CSS instead
...
Change inspired by 691107263c
2018-07-28 23:25:42 +02:00
d3783b864c
Refactor reply indicator and show compact list of attachments
2018-07-28 23:24:15 +02:00
e3bf8c8aa1
Show reply indicator for empty toots, not undefined toots ( fixes #610 )
...
Fix a regression introduced by 612b00d1bb
2018-07-28 23:24:15 +02:00
2ccef52a4f
Improve account bar css ( #8087 )
...
* Remove superfluous span tags
* Make account bar items (except dropdown) flexible to work well with custom CSS
* Fix CSS lint warning (0px → 0)
2018-07-28 20:09:58 +02:00
bb71538bb5
Redesign public profiles and toots ( #8068 )
2018-07-28 19:25:33 +02:00
e23b26178a
i18n: Update Polish translation ( #8084 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-07-29 02:20:45 +09:00
0fb0037ca7
Resize images by area instead of fixed dimensions ( #8083 )
...
To improve the way super tall or super ride images are treated, the
numbers remain the same, 1280x1280 and 400x400, but if an image
is less in one dimension than the other, the other can become larger
Thanks to @WAHa_06x36@mastodon.social for the tip
2018-07-28 03:33:00 +02:00
c057aeb76b
[Glitch] Add documentation for “p” hotkey
...
Port ed50c2393a0f12f88f1102f8cf8beca3bf711158 to glitch-soc
2018-07-26 22:19:01 +02:00
a8911616b6
Add hotkey variants to keyboard shortcuts description
...
Port 89c6d2bd6bc014ca6487c8f2569f8252fb3ef5dc to glitch-soc
2018-07-26 22:19:01 +02:00
6141c2a035
Merge branch 'master' into glitch-soc/merge-upstream
2018-07-26 21:22:43 +02:00
Thibaut Girka