about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2018-12-18[Glitch] Always display tab navigation on local/federated timeline even when ↵Thibaut Girka
empty Port 90b64c006998ec3bae365007781c61e8a79eeeef to glitch-soc
2018-12-18Do not replace history stateThibaut Girka
This is both for consistency with account timelines and to not mess with the logic used to decide whether going back in the browser's history is going to make us leave the WebUI.
2018-12-18[Glitch] Enable media timelineThibaut Girka
Port 8182b615183b83fb6651fb23912abda3cc4ccf03 to glitch-soc
2018-12-18[Glitch] Hide section headline for timelines in productionThibaut Girka
Port 4eeda6772796bcd08b8c63ec2e1f3e68a95cbca4 to glitch-soc
2018-12-18[Glitch] Change column params on pinned timelineThibaut Girka
Port 06252ec71ed67cb84e6730fe7148552dc6481c7a to glitch-soc
2018-12-18[Glitch] Save onlyMedia prop when pinning columnThibaut Girka
Port 5ea643b27908b14bd89ff068fc87e446e8cbcd32 to glitch-soc
2018-12-18[Glitch] Add exact attribute to WrappedRoute for community timelineThibaut Girka
Port 46061dc041b0a2a4a3907976cc3432abdb1d67ec to glitch-soc
2018-12-18[Glitch] Add media timelineThibaut Girka
Port 7403e5d306d36c83bfb80cd900235373186cd51a to glitch-soc
2018-12-18Merge pull request #862 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2018-12-18[Glitch] Make notifications quick-filter use consistent style with profile tabsThibaut Girka
Port 12ab15e584e78d209b59a893405a0cde83f49035 to glitch-soc
2018-12-18[Glitch] Add notification quick-filter bar in the frontend appThibaut Girka
Port 13dce126655f856f23d02373fa2e333e74bdc36e to glitch-soc
2018-12-18[Glitch] Responsive design for profile directoryThibaut Girka
Port SCSS changes from 087e11897137dc1f2811c21c3ccc6cec3ccdedb3 to glitch flavour
2018-12-18Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/controllers/admin/base_controller.rb Some refactoring made upstream, no real conflict. - app/javascript/mastodon/features/compose/components/compose_form.js Updated using upstream's code but using maxChars instead of the hardcoded length of 500 characters per toot. - app/javascript/styles/mastodon/components.scss Upstream redesigned the onboarding modal. Not sure why we had a conflict there.
2018-12-18Back to the getting-started when pins the timeline. (#9561)kedama
2018-12-18Add spec for AccountableConcern#log_action (#9559)ysksn
2018-12-18Bump nokogiri from 1.8.5 to 1.9.1 (#9557)dependabot[bot]
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.8.5 to 1.9.1. - [Release notes](https://github.com/sparklemotion/nokogiri/releases) - [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md) - [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.8.5...v1.9.1) Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-12-18fix CSP / X-Frame-Options for media embeds (#9558)jomo
2018-12-18Fix tootctl accounts rotate not updating public keys (#9556)Eugen Rochko
This allowed you to brick your system when running that command, because the accounts would continue to advertise the old public key, but sign things with the new one
2018-12-17Sandbox toot embeds in the embed modalThibaut Girka
It should not be necessary thanks to our Content Security Policy, but best be sure in case a server's CSP is incorrect. Also, avoids a CSP warning about loading remote scripts.
2018-12-17[Glitch] Minor scrollable list fixesThibaut Girka
* Make sure loading indicator has enough vertical space * Respect reduce_motion setting for loading indicator Port 4ede51743e5b9121a49e9131f91cf012fab410f8 to glitch-soc
2018-12-17Make notifications quick-filter use consistent style with profile tabs (#9554)Eugen Rochko
2018-12-17 Ignore low-confidence CharlockHolmes guesses when parsing link cards (#9510)ThibG
* Add failing test for windows-1251 link cards * Ignore low-confidence CharlockHolmes guesses Fixes #9466 * Fix no method error when charlock holmes cannot detect charset
2018-12-17Minor scrollable list fixes (#9551)ThibG
* Make sure loading indicator has enough vertical space * Respect reduce_motion setting for loading indicator
2018-12-17Split out is_changing_upload from is_submittingThibaut Girka
Fixes #855
2018-12-17Move #set_user to Admin::BaseController (#9470)ysksn
* Move #set_user to Admin::BaseController * Rename Admin::TwoFactorAuthenticationsController from `#set_user` to `#set_target_user` .
2018-12-17Add spec for Api::V1::Timelines::DirectController (#9547)ysksn
2018-12-17Add specs for Api::V1::Instances::PeersController (#9546)ysksn
2018-12-17Add spec for Api::V1::EndorsementsController (#9543)ysksn
2018-12-17Add spec for Api::V1::Instances::ActivityController (#9545)ysksn
2018-12-17Add new first-time tutorial (#9531)Eugen Rochko
* Prepare to load onboarding as a full page * Update the first-time introduction * Improve responsive design * Replace speech bubble with logo * Increase text size and reword first paragraph
2018-12-17Bump omniauth from 1.8.1 to 1.9.0 (#9544)dependabot[bot]
Bumps [omniauth](https://github.com/omniauth/omniauth) from 1.8.1 to 1.9.0. - [Release notes](https://github.com/omniauth/omniauth/releases) - [Commits](https://github.com/omniauth/omniauth/compare/v1.8.1...v1.9.0) Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-12-17Add specs for Accounts::PinsController (#9542)ysksn
2018-12-17Fix regression in #9539 (#9541)Eugen Rochko
2018-12-17Remove "most popular" tab from profile directory, add responsive design (#9539)Eugen Rochko
* Remove "most popular" tab from profile directory, add responsive design * Remove unused translations
2018-12-17Do no retry web push workers if the server returns a 4xx response (#9434)Eugen Rochko
Add timeout of 10s to web push requests
2018-12-16Split out is_changing_upload from is_submitting (#9536)ThibG
There is no reason to disable the composer textarea when some media metadata is being modified, nor is there any reason to focus the textarea when some media metadata has been modified (prevents clicking one image's description field right after having modified another).
2018-12-16Remove PostgreSQL statement timeout (#9537)Eugen Rochko
Revert #9382
2018-12-16Merge pull request #856 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2018-12-16[Glitch] Fix padding on select elements in preferencesThibaut Girka
Port c58c00651b13520e22f0a59737d23a68e63b4840 to glitch-soc
2018-12-16[Glitch] Make animated header resoect `auto_play_gif`Thibaut Girka
Port part of 7c48688d85d0ab64501cea6b8a516867a786bb4c to glitch-soc
2018-12-16Add notification quick-filter bar in the frontend app (#9399)Paweł Ngei
* create FilterBar componer and its container, unstyled * introduce basic styling for FilterBar * add selection css * allow FilterBar to display active CSS with js * connect the FilterBar to the Redux state * change getNotifications to use filter * remove temporary comments * add an option to turn the FilterBar off in settings * fix showFilterBar data type to boolean * fix eslint errors * add English and Polish translations * allowed filter bar overflow to accomodate for longer languages * fix mispelled translation key * add unified CSS look * replace text in FilterBar with icons * add tooltips * replace text @ with an icon * introduce simple and advanced filtering view * add ability to toggle the advanced view * add Polish translations * change Advanced View description to be more clear * make each filter flush notifications and load new ones, fixing pagination * simplify getNotifications once frontend filtering is not needed for FilterBar * add a semicolon * Revert "simplify getNotifications once frontend filtering is not needed for FilterBar" This reverts commit 9f4be7857135b0327814bd22a3e8a4e7b546f7cc. * reset filter to 'all' when turning off FilterBar
2018-12-16Dockerfile: Nodejs 8.12 -> 8.14 (#9532)Isatis
2018-12-15Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/controllers/directories_controller.rb - app/controllers/settings/applications_controller.rb - app/controllers/settings/base_controller.rb - app/controllers/settings/deletes_controller.rb - app/controllers/settings/exports_controller.rb - app/controllers/settings/follower_domains_controller.rb - app/controllers/settings/imports_controller.rb - app/controllers/settings/migrations_controller.rb - app/controllers/settings/notifications_controller.rb - app/controllers/settings/preferences_controller.rb - app/controllers/settings/sessions_controller.rb - app/controllers/settings/two_factor_authentication/confirmations_controller.rb - app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb - app/controllers/settings/two_factor_authentications_controller.rb Conflicts were due to some refactoring already made in glitch-soc when introducing flavours.
2018-12-15I18n: Correct pluralization of Czech (#9527)Aditoo17
* I18n: Correct pluralization of Czech * I18n: Correct pluralization of Czech
2018-12-14On mobile, go back in browser history upon posting, unless threaded mode is ↵Thibaut Girka
enabled
2018-12-14Bump aws-sdk-s3 from 1.27.0 to 1.30.0 (#9429)dependabot[bot]
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.27.0 to 1.30.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/commits) Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-12-14Add spec for Admin::ActionLogsController#index (#9522)ysksn
2018-12-14Add specs for RemoteInteractionController (#9524)ysksn
2018-12-14Add spec for Admin::DashboardController#index (#9523)ysksn
2018-12-14When posting in mobile mode, go back to previous history location (#9502)ThibG
Fixes #7112
generated by cgit-pink (git 2.37.1) at 2024-12-23 04:12:40 +0000