about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2018-05-08Merge remote-tracking branch 'glitchsoc/master' into gs-masterDavid Yip
2018-05-07Merge pull request #468 from ThibG/glitch-soc/features/reports-improvementsbeatrix
Various improvements to the reports modal
2018-05-07Merge pull request #467 from ThibG/glitch-soc/fixes/fix-boost-colorbeatrix
Fix color of disabled boost buttons (fixes #466)
2018-05-07Hide media in report modal regardless of whether they are marked sensitiveThibaut Girka
The rationale behind this is that if the user wants to report violent media, they might not want to see it repeatedly. The “sensitive” property is still kept, displaying different messages for hidden media depending on whether they are marked as sensitive.
2018-05-07[Glitch] Allow report modal to be up to 80% of viewport heightThibaut Girka
Port bddb330a8a08b7459c299fb56ae8770c3ac69af5 to glitch-soc
2018-05-07[Glitch] Also display replies in report modalThibaut Girka
Port c88e12fca622c46a361a5c751a529e77aa5bf2ba to glitch-soc
2018-05-07Fix color of disabled boost buttons (fixes #466)Thibaut Girka
2018-05-06Merge pull request #465 from ThibG/glitch-soc/rollback-scroll-changesDavid Yip
Glitch soc/rollback scroll changes
2018-05-06Merge pull request #464 from ThibG/glitch-soc/fixes/high-contrast-colorsDavid Yip
Fix glitch high-contrast skin text colors
2018-05-06Revert "[Glitch] Prevent timeline from moving when cursor is hovering over it"Thibaut Girka
This reverts commit 553cc2824040ba0b745644eb4633840129ffc13b.
2018-05-06Revert "[Glitch] Do not re-position scroll when loading more (inserting ↵Thibaut Girka
items from below)" This reverts commit 32974a58dcf5a8db39a9c0378f923a40d787cad3.
2018-05-06Fix glitch high-contrast skin text colorsThibaut Girka
Port from 3c5006ec7fa98ec53df619b0e6e52b3bbdb6f046
2018-05-06Merge pull request #462 from ThibG/glitch-soc/features/dropdowns-accessibilitybeatrix
Improve accessibility of toot dropdown menu
2018-05-06Merge pull request #461 from ThibG/glitch-soc/fixes/emoji-picker-placementbeatrix
[Glitch] Place emoji picker top if it is closer to the bottom of the viewport
2018-05-06Merge pull request #460 from ↵beatrix
ThibG/glitch-soc/features/do-not-scroll-when-mouse-over Prevent timeline from moving when cursor is hovering over it
2018-05-06Merge pull request #459 from ThibG/glitch-soc/features/text-color-variablesbeatrix
Add text color variables + minor SCSS fixes + high contrast skin
2018-05-06Merge pull request #458 from ↵beatrix
monsterpit-daggertooth/glitch-fix-escape-metachars-in-mutes Escape regex metachars in keyword mutes
2018-05-06Merge pull request #449 from ThibG/glitch-soc/features/upstream-account-itemsbeatrix
Support upstream bio items / custom account fields
2018-05-06Fix color of status icons in glitch-soc high contrast skinThibaut Girka
2018-05-06Merge pull request #457 from m4sk1n/glitch-lightThibG
Add a light theme by @Sylvhem
2018-05-05minor fixThibaut Girka
2018-05-05[Glitch] Add high-contrast themeThibaut Girka
2018-05-05Move attachment-lists out of lists.scssThibaut Girka
2018-05-05[Glitch] Fix text color in "show more" link inside boost confirmation modalThibaut Girka
Port ba917e15f66c7848fe943e571d1ec5eeb549b59d to glitch-soc
2018-05-05Fix link colors in report modalThibaut Girka
2018-05-05[Glitch] Add color variables of texts for better accesibilityThibaut Girka
Port 74dae9458d118b066cd74b16aab2aa9cafbf3fba and related to glitch-soc
2018-05-05[Glitch] Update SCSS of admin and setting pagesThibaut Girka
Port the SCSS changes from cb74c0cfe4aa89f9656c054253665ef4965b41df to glitch-soc
2018-05-05[Glitch] Improve styling of closed registrations messageThibaut Girka
Port SCSS changes from 5acd5315f23b4472f31c4a0bb612b7356032defc to glitch-soc
2018-05-05[Glitch] Do not re-position scroll when loading more (inserting items from ↵Thibaut Girka
below) Port 8c601b54ccf530bd193b4500fee439aa4e9162d0 to glitch-soc
2018-05-05[Glitch] Prevent timeline from moving when cursor is hovering over itThibaut Girka
Port 58852695c8ec490239ed3812f82971f8c1e6c172 to glitch-soc
2018-05-05Improve accessibility of toot dropdown menuThibaut Girka
* Prevent Enter keypresses from triggering dropdown display toggle twice * Give focus to first/selected item of dropdown menus * Implement keyboard navigation in generic dropdown menus Partial port from ef7d64c80109074b39983b50cc8cf701c337cdcc to glitch-soc
2018-05-05[Glitch] Place emoji picker top if it is closer to the bottom of the viewportThibaut Girka
Port ad5d3134e406c2bcfceca6a1b7dd3dceb6ec1061 to glitch-soc
2018-05-04Escape metachars in keywordsDaggertooth
2018-05-04Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip
Conflicts: app/controllers/follower_accounts_controller.rb app/controllers/following_accounts_controller.rb db/schema.rb
2018-05-04Store URIs of follows, follow requests and blocks for ActivityPub (#7160)Eugen Rochko
Same URI passed between follow request and follow, since they are the same thing in ActivityPub. Local URIs are generated during creation using UUIDs and are passed to serializers.
2018-05-04Add a light themeMarcin Mikołajczak
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-05-04Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-05-04Do not render first page of following and followers collections unless ↵ThibG
explicitly asked to (#7357)
2018-05-04Better pagination for ActivityPub outbox (#7356)Eugen Rochko
2018-05-04Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip
Conflicts: CONTRIBUTING.md
2018-05-04Merge branch 'merge-upstream' into gs-masterDavid Yip
2018-05-04Merge pull request #456 from m4sk1n/glitch-contrastDavid Yip
“Enable” high contrast theme
2018-05-04Improve “how to translate” (#7358)Marcin Mikołajczak
2018-05-04Add translate guide to CONTRIBUTING.md (#7355)Yamagishi Kazutoshi
2018-05-04“Enable” high contrast themeMarcin Mikołajczak
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-05-04Remove duplicate posix-spawn entry from Gemfile.David Yip
2018-05-04Make posix-spawn spec in Gemfile match what's in Gemfile.lock.David Yip
2018-05-04Merge remote-tracking branch 'origin/master' into merge-upstreamDavid Yip
Conflicts: Gemfile.lock
2018-05-04Show remote reports in admin UI as coming from domain rather than user (#7347)Eugen Rochko
Fix #6994
2018-05-04Marginally improve convert/ffmpeg calls performance with posix-spawn (#7346)Eugen Rochko