about summary refs log tree commit diff
path: root/app
AgeCommit message (Collapse)Author
2018-08-10Merge upstream styling for public profile endorsementsThibaut Girka
Port the SCSS part of f2404de871f0bdfda5c9aeeeb4c6c4d10a8da8ab to glitch-soc
2018-08-10Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
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.
2018-08-10Introduce OAuth scopes for bookmarksThibaut Girka
2018-08-10Adjust responsive design for /about/more and /terms (#8158)Eugen Rochko
Follow-up to #8142
2018-08-09When follow is removed, remove endorsement (#8149)Eugen Rochko
2018-08-09Update /terms and /about/more to use public layout (#8142)Eugen Rochko
2018-08-09Public profile endorsements (accounts picked by profile owner) (#8146)Eugen Rochko
2018-08-09[RU] Translation update: (#8147)Evgeny Petrov
* [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-08Remove protocol handler registration (#8127)Eugen Rochko
Browser UI too confusing / scares people, protocol URIs not used much
2018-08-07Good bye, CW rainbowsThibaut Girka
Accessibility issues largely outweigh the joke and consistency with upstream.
2018-08-07Scroll to linked status in public status viewThibaut Girka
2018-08-06Scroll to linked status in public status view (fixes #7884) (#8130)ThibG
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-06Restore glitch-soc's 500 characters limit for bios (fixes #625)Thibaut Girka
2018-08-05Import upstream's emojify function in settings.jsThibaut Girka
This fixes updating the profile preview when changing display name.
2018-08-05Serialize text-less statuses as '.' over OStatus (fixes #7856) (#8126)ThibG
2018-08-03i18n: Make Polish translation more gender neutral + update (#8119)Marcin Mikołajczak
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-08-02Render custom emoji in display name on public profile (#8115)ThibG
2018-08-02Fix styling of toot prepended text on public profilesThibaut Girka
Fixes how “Pinned toot”, “… boosted” etc. are styled on public profiles.
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
generated by cgit-pink (git 2.37.1) at 2024-12-04 23:03:22 +0000