namekuji/chuckya
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
8479 commits 8 branches 15 tags 274 MiB
Commit graph

8479 commits

This branch
This branch
All branches
Author SHA1 Message Date
Aaron Brady
8c279b1648 Update docker-compose to cope with build-time assets (#8156) 
#7780 means that asset compilation happens as a build step.

Having the assets and packs volumes defined in `docker-compose.yml` breaks this. For people who run under Docker Compose, I believe this will fix their CSS (which even running the asset recompilation separately did not).
 2018-08-09 22:37:48 +02:00
Eugen Rochko
aff6a15061
When follow is removed, remove endorsement (#8149) 2018-08-09 15:24:29 +02:00
Eugen Rochko
0dcc1950d1
Update /terms and /about/more to use public layout (#8142) 2018-08-09 12:58:20 +02:00
Eugen Rochko
f2404de871
Public profile endorsements (accounts picked by profile owner) (#8146) 2018-08-09 09:56:53 +02:00
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
 2018-08-09 08:50:42 +02:00
Eugen Rochko
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
Thibaut Girka
7d1dd59496 Good bye, CW rainbows 
Accessibility issues largely outweigh the joke and consistency with upstream.
 2018-08-07 18:49:49 +02:00
Mozinet
58cc673882 Update fr.yml for 3 spelling mistakes and a typo (#8135) 2018-08-08 01:02:34 +09:00
Thibaut Girka
c700778922 Scroll to linked status in public status view 2018-08-07 16:58:00 +02:00
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).
 2018-08-06 15:16:02 +02:00
Thibaut Girka
617c3a8006 Restore glitch-soc's 500 characters limit for bios (fixes #625) 2018-08-06 08:20:29 +02:00
Thibaut Girka
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
ThibG
c52bcc0331 Serialize text-less statuses as '.' over OStatus (fixes #7856) (#8126) 2018-08-05 12:22:23 +02:00
Marcin Mikołajczak
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
ThibG
dad8a1baf2 Render custom emoji in display name on public profile (#8115) 2018-08-02 15:08:29 +02:00
Thibaut Girka
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
ThibG
cf0f8eb742
Merge pull request #621 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2018-08-02 11:57:52 +02:00
Thibaut Girka
bf1d3ae3b8 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	config/settings.yml
 2018-08-01 22:20:25 +02:00
Yamagishi Kazutoshi
4da03a298a Do not show pinned toots when min_id is set (#8111) 2018-08-01 17:57:02 +02:00
Thibaut Girka
71b318dedc Delete leftovers from keyword_mutes 2018-08-01 16:49:27 +02:00
ThibG
20e75666b2
Merge pull request #619 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2018-08-01 15:29:35 +02:00
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.
 2018-08-01 00:18:42 +02:00
Thibaut Girka
7ab46b73bd Reintroduce glitch-soc avatar styling in public pages 2018-08-01 00:18:42 +02:00
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
Eugen Rochko
cc56f2230a
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
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
mimikun
9ae53ad59e Fix nodejs 8.x install in vagrant (#8105) 2018-07-31 14:38:31 +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