about summary refs log tree commit diff
path: root/app
AgeCommit message (Collapse)Author
2019-04-24Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-04-24Fix file uploadThibaut Girka
2019-04-23Fix settings modalThibaut Girka
2019-04-23Fix sign up button not saying sign up when invite is used (#10623)Eugen Rochko
Fix #10616
2019-04-22Do not leak local-only toots to remote mentioned usersThibaut Girka
2019-04-22Load custom CSS rules after standard onesThibaut Girka
Fixes #933 Due to glitch-soc's theming system, JS and CSS files are imported in a slightly different order, and custom CSS rules were loaded *before* everything else. They will now be loaded *after* everything else, which is a bit different from upstream but should work better overall.
2019-04-22Add support for lists in statusesThibaut Girka
2019-04-22Do not switch to italic for status media buttonsThibaut Girka
2019-04-22Accept richer text from remote statusesThibaut Girka
Support abbr, del, pre, blockquote, code, strong, b, em, i, and h1…h5 HTML elements in remote statuses, add corresponding CSS.
2019-04-22[Glitch] Fix modal items cannot scroll on touch deviceskedama
Port d763d39d2628bef123cdc801b2a3a3922b7e37f2 to glitch-soc
2019-04-22Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/javascript/mastodon/features/compose/components/compose_form.js Upstream cleaned up a bit, including on lines in which we replaced the hardcoded 500 character limit with a maxChar constant. Applied the changes while keeping maxChar instead of 500. - app/javascript/packs/public.js Moved upstream's new animated avatar hover handling in app/javascript/core/public.js - app/javascript/styles/fonts/montserrat.scss Upstream fixed local font name, applied those changes. - app/javascript/styles/fonts/roboto.scss Upstream fixed local font name, applied those changes. - lib/mastodon/version.rb Upstream made repo URL configurable, did the same, but default to glitch-soc
2019-04-22Fix ReferenceError in dropdownThibaut Girka
2019-04-22Fix broken reference to handleSubmitThibaut Girka
2019-04-22CleanupThibaut Girka
2019-04-22Move ComposerPublisher to ComposeThibaut Girka
2019-04-22Add OptionsContainerThibaut Girka
2019-04-22Move composer Dropdown from features/composer to features/composeThibaut Girka
2019-04-22Move ComposerTextareaIcons to TextareaIconsThibaut Girka
2019-04-22ComposerTextarea → AutosuggestTextareaThibaut Girka
2019-04-22ComposerUploadForm → UploadForm + UploadFormContainerThibaut Girka
2019-04-22Move PollForm from features/composer to features/composeThibaut Girka
2019-04-22Inline spoiler inputThibaut Girka
2019-04-22ComposerReply → ReplyIndicatorThibaut Girka
2019-04-22Refactor Compose*Warning → ContainerWarningThibaut Girka
Regression: only one warning at a time
2019-04-22features/composer/index.js → ComposeFormThibaut Girka
2019-04-22DrawerHeader → Header + HeaderContainerThibaut Girka
2019-04-22DrawerAccount → NavigationBar + NavigationContainerThibaut Girka
2019-04-22[Glitch] Show suggested follows on search screen in mobile layoutEugen Rochko
Port ad510db3a19640267f94062756d558a45472af14 to glitch-soc
2019-04-22DrawerResults → SearchResults + SearchResultsContainerThibaut Girka
2019-04-22Rework DrawerResults to make them closer to upstreamThibaut Girka
2019-04-22Move DrawerSearch to Search + SearchContainerThibaut Girka
2019-04-22Inline DrawerSearchPopout in DrawerSearchThibaut Girka
2019-04-22Refactor a bit DrawerSearch to make it closer to upstreamThibaut Girka
2019-04-22Rename flavours/glitch/features/drawer to flavours/glitch/features/composeThibaut Girka
2019-04-22Allow switching between singe-option and multiple-option polls (#10603)ThibG
2019-04-22Fix modal items cannot scroll on touch devices (#10605)kedama
2019-04-22Minor code cleanup (#10613)ThibG
2019-04-21Default to the web domain (eg. mastodon.lubar.me) instead of the local ↵Ben Lubar
domain (eg. lubar.me) for keybase proofs (#10565)
2019-04-21Add hi.json (#10573)Yamagishi Kazutoshi
2019-04-21Update hy.json (#10591)partev
2019-04-21Treat meta[property] as a space-separated list (#10604)Daniel Aleksandersen
The @property attribute in HTML is a space-separated list of values. This change normalizes whitespace and finds the desired value in the list instead of requiring an exact single-value match. More details: https://www.ctrl.blog/entry/rdfa-socialmedia-metadata.html
2019-04-21Animate avatar GIFs on-hover on public profiles (#10549)Jessica
* Third time is the charm? * Use full asset URL for data-static and data-original ̀image_tag` expands to the full asset URL, we have to do the same in `data` attributes so that it can work when assets and user data are stored on a different host
2019-04-21Update NL (Dutch) translation (#10601)jeroenpraat
* Update NL language strings Have to do it this way, cause this file is locked on Weblate * fix * Update simple_form.nl.yml * Update nl.yml
2019-04-21Use correct local names for fonts (#10594)ThibG
2019-04-21Configrationable repository url (#10600)Sho Kusano
* config: Add GITHUB_REPOSITORY for repository name * config: Add SOURCE_BASE_URL for repository url * Show source_url and repository name on getting started
2019-04-19[Glitch] Allow modal secondary button to shrink and allow wider confirmation ↵Thibaut Girka
modals Port 7f75792bf305eea297c63731600af3b02968aea4 to glitch-soc
2019-04-19Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-04-19Fix keybase indication on dashboardThibaut Girka
2019-04-19Allow turning keybase off instance-wideThibaut Girka
2019-04-17Shift+click on column Back button to return to last pinable columnThibaut Girka
generated by cgit-pink (git 2.37.1) at 2024-11-06 13:32:20 +0000