about summary refs log tree commit diff
path: root/app
AgeCommit message (Collapse)Author
2018-08-01Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: config/settings.yml
2018-08-01Do not show pinned toots when min_id is set (#8111)Yamagishi Kazutoshi
2018-08-01Delete leftovers from keyword_mutesThibaut Girka
2018-08-01Fix toot styling on public pagesThibaut Girka
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-01Reintroduce glitch-soc avatar styling in public pagesThibaut Girka
2018-08-01[Glitch] Do not hide hashtag timeline in mobile view, make it full-windowThibaut Girka
Port 13ac8ca66ab01c92e4ebcc7221efb3d474c9fd0b to glitch-soc
2018-08-01[Glitch] Compensate for scrollbar disappearing when media modalThibaut Girka
Port 60df87f6f0fb8afd9a4e750917eff7c425b62891 to glitch-soc
2018-08-01[Glitch] Show media modal on public timelineThibaut Girka
Port e0b1e17bd04d7f9b533ab462aee4544a5f5fb926 to glitch-soc
2018-08-01[Glitch] Add missing formatting to the text in hero widgetThibaut Girka
Port 1d773b3a4691b153ff0c658db53007293905d86b to glitch-soc
2018-08-01Port profile redesign to glitch-socThibaut Girka
Port bb71538bb503159177d46d8956bd466973c0876b to glitch-soc
2018-08-01Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
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-07-31Add separate setting for sidebar text (site_short_description) (#8107)Eugen Rochko
* Add separate setting for sidebar text (site_short_description) * Fix tests
2018-07-31Drop glitch-style account bio fieldsThibaut Girka
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-31Disallow remote users from viewing local-only tootsThibaut Girka
2018-07-31Do not hide hashtag timeline in mobile view, make it full-window (#8093)Eugen Rochko
2018-07-31Compensate for scrollbar disappearing when media modal visible (#8100)Eugen Rochko
* Compensate for scrollbar disappearing when media modal visible Make auth pages backgrounds lighter * Fix typo
2018-07-30Enforce username format for remote users, too (#8102)Eugen Rochko
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-30Fix incorrect context definition for the "featured" keyword (#8090)Eugen Rochko
* Fix incorrect context definition for the "featured" keyword Fix #8077 * Adjust context definition for movedTo
2018-07-30Convert MOV and WEBM to MP4, raise maximum limit to 40MB (#8101)Eugen Rochko
Separate size limits for images and video. Images remain at 8MB, while videos can be up to 40MB.
2018-07-30[Glitch] Resize images by area instead of fixed dimensionsThibaut Girka
Port WebUI part of 0fb0037ca7ea9910b490818a1cc13f4005ba6134 to glitch-soc
2018-07-30Merge commit 'e23b26178a71f90d64fe2a3e9e4468f265ecc71c' into ↵Thibaut Girka
glitch-soc/merge-upstream Merge upstream changes right before the public profile redesign.
2018-07-30Don't reset scroll position when opening a modalThibaut Girka
2018-07-30Allow modals to be closed by pressing “back”Thibaut Girka
2018-07-30Treat the App Setting link as a proper link (fixes #375)Thibaut Girka
2018-07-30[Glitch] Improve WebUI account action barThibaut Girka
Mostly a port of 2ccef52a4f5be49e5c3b2256a3c5d4f193a3fe32 to glitch-soc
2018-07-30[Glitch] Fix accounts' display name/bio not being set from initial stateThibaut Girka
Port 20d1be18af8c10b6f1bc5597643b85ac6dbae9f2 to glitch-soc
2018-07-30Weblate translations (2018-07-30) (#8096)Yamagishi Kazutoshi
* 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-29Do not scroll up when modal is opened (#8095)Yamagishi Kazutoshi
2018-07-29Fix size/dimension values in avatar/header hint localizations (#8088)Eugen Rochko
2018-07-28Add missing formatting to the text in hero widget (#8089)Eugen Rochko
2018-07-28Use same margin for navbar and column for consistencyThibaut Girka
2018-07-28Hide navigation bar text so it can fit on small screensThibaut Girka
2018-07-28Fix glitch-soc columns padding on mobile (fixes #561)Thibaut Girka
2018-07-28Preserve hashtags in threaded mode (fixes #584)Thibaut Girka
2018-07-28Move CW field just above main textareaThibaut Girka
2018-07-28Get rid of Collapsable, use CSS insteadThibaut Girka
Change inspired by 691107263c5e05973f9af9e1937abbc27430f54e
2018-07-28Refactor reply indicator and show compact list of attachmentsThibaut Girka
2018-07-28Show reply indicator for empty toots, not undefined toots (fixes #610)Thibaut Girka
Fix a regression introduced by 612b00d1bb91c6b11f00fdb273dd8cd2ca883b12
2018-07-28Order invites by recent first (#8091)Eugen Rochko
Fix #8085
2018-07-28Prevent ActivityPub movedTo recursion (#8092)Eugen Rochko
Fix #8051
2018-07-28Improve account bar css (#8087)Mélanie Chauvel (ariasuni)
* 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-28Redesign public profiles and toots (#8068)Eugen Rochko
2018-07-29i18n: Update Polish translation (#8084)Marcin Mikołajczak
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-07-28Resize images by area instead of fixed dimensions (#8083)Eugen Rochko
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-26[Glitch] Add documentation for “p” hotkeyThibaut Girka
Port ed50c2393a0f12f88f1102f8cf8beca3bf711158 to glitch-soc
2018-07-26Add hotkey variants to keyboard shortcuts descriptionThibaut Girka
Port 89c6d2bd6bc014ca6487c8f2569f8252fb3ef5dc to glitch-soc
2018-07-26Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-07-26Prevent scrolling main frame when navigating in image gallery with arrow keysThibaut Girka
2018-07-26Improve keyboard shortcuts descriptions (#8066)ThibG
* Add hotkey variants to keyboard shortcuts description * Add documentation for “p” hotkey * yarn manage:translations
2018-07-26Prevent scrolling main frame when navigating in image gallery with arrow ↵ThibG
keys (#8073)
generated by cgit-pink (git 2.37.1) at 2024-11-17 04:03:26 +0000