929324cf60
Scroll to linked status in public status view
2018-08-07 16:58:00 +02:00
dc85e5a379
Restore glitch-soc's 500 characters limit for bios ( fixes #625 )
2018-08-06 08:20:29 +02:00
dfe8240f8d
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
d99f8674ab
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
b66ce62579
Merge pull request #621 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-08-02 11:57:52 +02:00
30c9fef4d4
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
config/settings.yml
2018-08-01 22:20:25 +02:00
9e0015e834
Do not show pinned toots when min_id is set ( #8111 )
2018-08-01 17:57:02 +02:00
52b61a8b71
Delete leftovers from keyword_mutes
2018-08-01 16:49:27 +02:00
e77e055739
Merge pull request #619 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-08-01 15:29:35 +02:00
8d2f582bf7
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
d87eac4663
Reintroduce glitch-soc avatar styling in public pages
2018-08-01 00:18:42 +02:00
89b05c7d68
[Glitch] Do not hide hashtag timeline in mobile view, make it full-window
...
Port d39e0ad4d5
2018-08-01 00:18:42 +02:00
658fc6bc1e
[Glitch] Compensate for scrollbar disappearing when media modal
...
Port a78672ae50
2018-08-01 00:18:42 +02:00
28cdf3da09
[Glitch] Show media modal on public timeline
...
Port c1427f90f6
2018-08-01 00:18:42 +02:00
8c4fc00ece
[Glitch] Add missing formatting to the text in hero widget
...
Port bdb76122bc
2018-08-01 00:18:42 +02:00
ca256cca22
Port profile redesign to glitch-soc
...
Port 13df3889f0
2018-08-01 00:18:42 +02:00
1159490f00
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
934d50daf0
Add separate setting for sidebar text (site_short_description) ( #8107 )
...
* Add separate setting for sidebar text (site_short_description)
* Fix tests
2018-07-31 18:59:34 +02:00
4277328e9c
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
919fc15097
Disallow remote users from viewing local-only toots
2018-07-31 15:41:04 +02:00
517b7a028d
Add test to disallow remote users from fetching local-only toots
2018-07-31 15:41:04 +02:00
91eeeb1780
Fix nodejs 8.x install in vagrant ( #8105 )
2018-07-31 14:38:31 +02:00
d39e0ad4d5
Do not hide hashtag timeline in mobile view, make it full-window ( #8093 )
2018-07-31 02:54:25 +02:00
a78672ae50
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
ebf836cc69
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
2018-07-30 22:29:52 +02:00
52165d0824
Use workspace instead of caching for built assets
...
Tests cannot run without built assets, and we want
exactly the matching assets. This is not a cache.
2018-07-30 22:25:22 +02:00
5c7a7176a3
Use workspace instead of caching for built assets ( #8103 )
...
Tests cannot run without built assets, and we want
exactly the matching assets. This is not a cache.
2018-07-30 22:22:55 +02:00
8c8f80c0fb
Fix incorrect context definition for the "featured" keyword ( #8090 )
...
* Fix incorrect context definition for the "featured" keyword
Fix #8077
* Adjust context definition for movedTo
2018-07-30 19:33:37 +02:00
f7910c4164
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.
2018-07-30 19:33:05 +02:00
f5b880a429
[Glitch] Resize images by area instead of fixed dimensions
...
Port WebUI part of 91aadec929
2018-07-30 19:30:38 +02:00
62fb690b96
Merge pull request #614 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes up to (excluding) profile redesign
2018-07-30 16:51:55 +02:00
f866d00fa2
Merge commit 'dad7cd6d77f1bb090a7a64df405a920a1a1b2d83' into glitch-soc/merge-upstream
...
Merge upstream changes right before the public profile redesign.
2018-07-30 14:39:06 +02:00
f37bf7c0a3
Don't reset scroll position when opening a modal
2018-07-30 14:32:02 +02:00
4e8532cc1a
Allow modals to be closed by pressing “back”
2018-07-30 14:32:02 +02:00
32d4005516
Treat the App Setting link as a proper link ( fixes #375 )
2018-07-30 14:31:45 +02:00
8a9882ee34
[Glitch] Improve WebUI account action bar
...
Mostly a port of 2ccef52a4f
2018-07-30 14:24:35 +02:00
a3d318ec76
[Glitch] Fix accounts' display name/bio not being set from initial state
...
Port 6e72faaa78
2018-07-30 14:24:24 +02:00
9d3bb125b7
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
2d000a877b
Do not scroll up when modal is opened ( #8095 )
2018-07-29 16:52:06 +02:00
f53755aaad
Fix size/dimension values in avatar/header hint localizations ( #8088 )
2018-07-29 09:57:13 +09:00
bdb76122bc
Add missing formatting to the text in hero widget ( #8089 )
2018-07-28 23:52:20 +02:00
9a1015327b
Use same margin for navbar and column for consistency
2018-07-28 23:26:18 +02:00
78071de615
Hide navigation bar text so it can fit on small screens
2018-07-28 23:26:18 +02:00
429c05537e
Fix glitch-soc columns padding on mobile ( fixes #561 )
2018-07-28 23:26:18 +02:00
9507ab6493
Preserve hashtags in threaded mode ( fixes #584 )
2018-07-28 23:25:57 +02:00
40fe9256ea
Move CW field just above main textarea
2018-07-28 23:25:42 +02:00
0ef509c27a
Get rid of Collapsable, use CSS instead
...
Change inspired by a6ddd1aba2
2018-07-28 23:25:42 +02:00
e09ade34cd
Reduce assets precompilation time by about 20%
...
Bundle most common webpack chunks into a “common” pack,
in a way similar to what upstream does.
2018-07-28 23:24:41 +02:00
5eeb95fac7
Refactor reply indicator and show compact list of attachments
2018-07-28 23:24:15 +02:00
22618172b4
Show reply indicator for empty toots, not undefined toots ( fixes #610 )
...
Fix a regression introduced by 14061b76dc
2018-07-28 23:24:15 +02:00
Thibaut Girka