glitchier-soc

Commit Graph

Author	SHA1	Message	Date
Thibaut Girka	35ee061e42	Merge upstream SCSS changes for /about, /about/more and /terms Port various commits to glitch-soc, mainly commits `9e8366d4cb` and `0dcd212735`.	6 years ago
Thibaut Girka	1e18374e53	Merge upstream styling for public profile endorsements Port the SCSS part of `6e3cb11f3c` to glitch-soc	6 years ago
Thibaut Girka	5ed6f6db1d	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	3fd47f9bc0	Introduce OAuth scopes for bookmarks	6 years ago
Eugen Rochko	0dcd212735	Adjust responsive design for /about/more and /terms (#8158 ) Follow-up to #8142	6 years ago
Eugen Rochko	d0b6cbfb92	When follow is removed, remove endorsement (#8149 )	6 years ago
Eugen Rochko	9e8366d4cb	Update /terms and /about/more to use public layout (#8142 )	6 years ago
Eugen Rochko	6e3cb11f3c	Public profile endorsements (accounts picked by profile owner) (#8146 )	6 years ago
Evgeny Petrov	f1fe022a13	[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	3a8d839200	Remove protocol handler registration (#8127 ) Browser UI too confusing / scares people, protocol URIs not used much	6 years ago
Thibaut Girka	2107ea78c3	Good bye, CW rainbows Accessibility issues largely outweigh the joke and consistency with upstream.	6 years ago
Thibaut Girka	929324cf60	Scroll to linked status in public status view	6 years ago
ThibG	80d02cf8f9	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	dc85e5a379	Restore glitch-soc's 500 characters limit for bios (fixes #625 )	6 years ago
Thibaut Girka	dfe8240f8d	Import upstream's emojify function in settings.js This fixes updating the profile preview when changing display name.	6 years ago
ThibG	193ebf3cf4	Serialize text-less statuses as '.' over OStatus (fixes #7856 ) (#8126 )	6 years ago
Marcin Mikołajczak	b5d5fc9855	i18n: Make Polish translation more gender neutral + update (#8119 ) Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	6 years ago
ThibG	8f61dfe044	Render custom emoji in display name on public profile (#8115 )	6 years ago
Thibaut Girka	d99f8674ab	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	30c9fef4d4	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: config/settings.yml	6 years ago
Yamagishi Kazutoshi	9e0015e834	Do not show pinned toots when min_id is set (#8111 )	6 years ago
Thibaut Girka	52b61a8b71	Delete leftovers from keyword_mutes	6 years ago
Thibaut Girka	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.	6 years ago
Thibaut Girka	d87eac4663	Reintroduce glitch-soc avatar styling in public pages	6 years ago
Thibaut Girka	89b05c7d68	[Glitch] Do not hide hashtag timeline in mobile view, make it full-window Port `d39e0ad4d5` to glitch-soc	6 years ago
Thibaut Girka	658fc6bc1e	[Glitch] Compensate for scrollbar disappearing when media modal Port `a78672ae50` to glitch-soc	6 years ago
Thibaut Girka	28cdf3da09	[Glitch] Show media modal on public timeline Port `c1427f90f6` to glitch-soc	6 years ago
Thibaut Girka	8c4fc00ece	[Glitch] Add missing formatting to the text in hero widget Port `bdb76122bc` to glitch-soc	6 years ago
Thibaut Girka	ca256cca22	Port profile redesign to glitch-soc Port `13df3889f0` to glitch-soc	6 years ago
Thibaut Girka	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”.	6 years ago
Eugen Rochko	934d50daf0	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	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.	6 years ago
Thibaut Girka	919fc15097	Disallow remote users from viewing local-only toots	6 years ago
Eugen Rochko	d39e0ad4d5	Do not hide hashtag timeline in mobile view, make it full-window (#8093 )	6 years ago
Eugen Rochko	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	6 years ago
Eugen Rochko	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	6 years ago
Eugen Rochko	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	6 years ago
Eugen Rochko	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.	6 years ago
Thibaut Girka	f5b880a429	[Glitch] Resize images by area instead of fixed dimensions Port WebUI part of `91aadec929` to glitch-soc	6 years ago
Thibaut Girka	f866d00fa2	Merge commit 'dad7cd6d77f1bb090a7a64df405a920a1a1b2d83' into glitch-soc/merge-upstream Merge upstream changes right before the public profile redesign.	6 years ago
Thibaut Girka	f37bf7c0a3	Don't reset scroll position when opening a modal	6 years ago
Thibaut Girka	4e8532cc1a	Allow modals to be closed by pressing “back”	6 years ago
Thibaut Girka	32d4005516	Treat the App Setting link as a proper link (fixes #375 )	6 years ago
Thibaut Girka	8a9882ee34	[Glitch] Improve WebUI account action bar Mostly a port of `2ccef52a4f` to glitch-soc	6 years ago
Thibaut Girka	a3d318ec76	[Glitch] Fix accounts' display name/bio not being set from initial state Port `6e72faaa78` to glitch-soc	6 years ago
Yamagishi Kazutoshi	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	6 years ago
Yamagishi Kazutoshi	2d000a877b	Do not scroll up when modal is opened (#8095 )	6 years ago
Eugen Rochko	f53755aaad	Fix size/dimension values in avatar/header hint localizations (#8088 )	6 years ago
Eugen Rochko	bdb76122bc	Add missing formatting to the text in hero widget (#8089 )	6 years ago
Thibaut Girka	9a1015327b	Use same margin for navbar and column for consistency	6 years ago

1 2 3 4 5 ...

5045 Commits (35ee061e42ff29af07289844be68e01d40148f5b)