ar
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,104 Commits
10 Branches
15 Tags
251 MiB
Commit Graph

7104 Commits (a3dd2deda38bb4f8fb8155ce2de1a6715acd31ea)

Author SHA1 Message Date
Thibaut Girka a3dd2deda3 [Glitch] Do not hide hashtag timeline in mobile view, make it full-window 
Port 13ac8ca66a to glitch-soc
 2018-08-01 00:18:42 +02:00
Thibaut Girka 175c2155a9 [Glitch] Compensate for scrollbar disappearing when media modal 
Port 60df87f6f0 to glitch-soc
 2018-08-01 00:18:42 +02:00
Thibaut Girka d2b3eebe00 [Glitch] Show media modal on public timeline 
Port e0b1e17bd0 to glitch-soc
 2018-08-01 00:18:42 +02:00
Thibaut Girka 5cd7fe21bf [Glitch] Add missing formatting to the text in hero widget 
Port 1d773b3a46 to glitch-soc
 2018-08-01 00:18:42 +02:00
Thibaut Girka d894cdc93f Port profile redesign to glitch-soc 
Port bb71538bb5 to glitch-soc
 2018-08-01 00:18:42 +02:00
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”.
 2018-08-01 00:18:13 +02:00
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.
 2018-07-31 16:26:36 +02:00
Thibaut Girka c4bec9263c Disallow remote users from viewing local-only toots 2018-07-31 15:41:04 +02:00
Thibaut Girka 9f2945ef80 Add test to disallow remote users from fetching local-only toots 2018-07-31 15:41:04 +02:00
Eugen Rochko 13ac8ca66a
Do not hide hashtag timeline in mobile view, make it full-window (#8093) 2018-07-31 02:54:25 +02:00
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
 2018-07-31 01:14:33 +02:00
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
 2018-07-30 22:29:52 +02:00
Thibaut Girka 9d09c7cc68 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
ThibG d425d30804 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
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
 2018-07-30 19:33:37 +02:00
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.
 2018-07-30 19:33:05 +02:00
Thibaut Girka 1bae4c4f83 [Glitch] Resize images by area instead of fixed dimensions 
Port WebUI part of 0fb0037ca7 to glitch-soc
 2018-07-30 19:30:38 +02:00
ThibG ce090a5201
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
Thibaut Girka 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
Thibaut Girka b02bfe86ce Don't reset scroll position when opening a modal 2018-07-30 14:32:02 +02:00
Thibaut Girka 5d060cb6e4 Allow modals to be closed by pressing “back” 2018-07-30 14:32:02 +02:00
Thibaut Girka 3eb3c21327 Treat the App Setting link as a proper link (fixes #375) 2018-07-30 14:31:45 +02:00
Thibaut Girka 88b7ccc2ca [Glitch] Improve WebUI account action bar 
Mostly a port of 2ccef52a4f to glitch-soc
 2018-07-30 14:24:35 +02:00
Thibaut Girka 4cf7cfd9e0 [Glitch] Fix accounts' display name/bio not being set from initial state 
Port 20d1be18af to glitch-soc
 2018-07-30 14:24:24 +02:00
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
 2018-07-30 03:43:34 +02:00
Yamagishi Kazutoshi 06c83527f5 Do not scroll up when modal is opened (#8095) 2018-07-29 16:52:06 +02:00
Eugen Rochko 0a3cc246ac Fix size/dimension values in avatar/header hint localizations (#8088) 2018-07-29 09:57:13 +09:00
Eugen Rochko 1d773b3a46
Add missing formatting to the text in hero widget (#8089) 2018-07-28 23:52:20 +02:00
Thibaut Girka d8544e7003 Use same margin for navbar and column for consistency 2018-07-28 23:26:18 +02:00
Thibaut Girka 69ea4a01e1 Hide navigation bar text so it can fit on small screens 2018-07-28 23:26:18 +02:00
Thibaut Girka 37302c63c3 Fix glitch-soc columns padding on mobile (fixes #561) 2018-07-28 23:26:18 +02:00
Thibaut Girka 93d4e9a58d Preserve hashtags in threaded mode (fixes #584) 2018-07-28 23:25:57 +02:00
Thibaut Girka 28a59e4e80 Move CW field just above main textarea 2018-07-28 23:25:42 +02:00
Thibaut Girka 358e3a4c32 Get rid of Collapsable, use CSS instead 
Change inspired by 691107263c
 2018-07-28 23:25:42 +02:00
Thibaut Girka 7317b7b231 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
Thibaut Girka d3783b864c Refactor reply indicator and show compact list of attachments 2018-07-28 23:24:15 +02:00
Thibaut Girka 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
Eugen Rochko 79a1f667c5 Order invites by recent first (#8091) 
Fix #8085
 2018-07-28 17:15:17 -04:00
Eugen Rochko cc94b1d95a Prevent ActivityPub movedTo recursion (#8092) 
Fix #8051
 2018-07-28 17:14:55 -04:00
Mélanie Chauvel (ariasuni) 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
Eugen Rochko bb71538bb5
Redesign public profiles and toots (#8068) 2018-07-28 19:25:33 +02:00
Marcin Mikołajczak e23b26178a i18n: Update Polish translation (#8084) 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2018-07-29 02:20:45 +09:00
Eugen Rochko 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
Thibaut Girka 3fa9bf7cc2 Double CircleCI's timeout for assets:precompile… 2018-07-27 10:38:46 +02:00
Thibaut Girka c057aeb76b [Glitch] Add documentation for “p” hotkey 
Port ed50c2393a0f12f88f1102f8cf8beca3bf711158 to glitch-soc
 2018-07-26 22:19:01 +02:00
Thibaut Girka a8911616b6 Add hotkey variants to keyboard shortcuts description 
Port 89c6d2bd6bc014ca6487c8f2569f8252fb3ef5dc to glitch-soc
 2018-07-26 22:19:01 +02:00
ThibG b156fc4b4d
Merge pull request #603 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2018-07-26 22:17:10 +02:00
Thibaut Girka 6141c2a035 Merge branch 'master' into glitch-soc/merge-upstream 2018-07-26 21:22:43 +02:00
Thibaut Girka 82ab5aacb2 Prevent scrolling main frame when navigating in image gallery with arrow keys 2018-07-26 08:42:25 +02:00
ThibG 3c35b34b61 Improve keyboard shortcuts descriptions (#8066) 
* Add hotkey variants to keyboard shortcuts description

* Add documentation for “p” hotkey

* yarn manage:translations
 2018-07-26 04:51:25 +02:00