about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2018-08-31[Glitch] Show compose form on delete & redraft when in mobile layoutThibaut Girka
Port 025fbb8285cdedf495d9e4d015db611b0c622cbb to glitch-soc
2018-08-31Fix search results on compose boxThibaut Girka
2018-08-31Fix account header showing on search pageThibaut Girka
2018-08-31[Glitch] On the mobile UI, move the search column to the rightThibaut Girka
Port 20bb90ced60fdac4ca254b43dad5615b1549da26 to glitch-soc
2018-08-31[Glitch] Hide search from Compose on mobile devicesThibaut Girka
Port 0893b1669548858daee79ab1260fb98646a0b3fa to glitch-soc
2018-08-31[Glitch] Add search item to tab bar for mobile devicesThibaut Girka
Port c9cbb8de703e321c0d152813a2e22471ffe5eef7 to glitch-soc
2018-08-31[Glitch] Use withRouter for TabsBarThibaut Girka
Port 61e62757816cd8cfe38944d509f8ec13d7d86912 to glitch-soc
2018-08-31[Glitch] Move "compose" on mobile to floating action buttonThibaut Girka
Port e72db6d9dd53a9d44f641bdf6bce7e64548e7d94 to glitch-soc
2018-08-31[Glitch] When search enabled, display hint in search popoutThibaut Girka
Port 7901f9f63e156732ab10154c34f3c2d188471a9d to glitch-soc
2018-08-30Add bookmarks to archive takeoutThibaut Girka
2018-08-30Restrict querySelectorAll to the upload form componentThibaut Girka
2018-08-30Add confirmation dialog when posting media without descriptionThibaut Girka
Fixes #211
2018-08-29[Glitch] Reduce padding of profile metadata boxes to allow more textThibaut Girka
Port 9463bba5fb6873fa70e05f239079ee1a0072b70c to glitch-soc
2018-08-29Add opt-in feature to have the spoilers field always on (fixes #634)Thibaut Girka
2018-08-29Merge pull request #690 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2018-08-29Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-08-29Replace '貼' with '嘟' for 'toot' (#8421)caasi Huang
Replace '貼' with '嘟' so the web front-end looks more consistent.
2018-08-29Add ffmpeg buildpack for scalingo (#8500)Satsuki Yanagi
* Add ffmpeg buildpack for scalingo. * Add environment variable to install ffprobe Note: For existing applications, admins needs to add 'WITH_FFPROBE=true' to environment variable.
2018-08-29formatter spec fixes & clarification (#8481)sundevour
updates some "context" and "it" lines to have clearer explanations updates "context" lines to properly describe function input, and "it" lines to describe results
2018-08-29Reduce padding of profile metadata boxes to allow more text (#8491)Mélanie Chauvel (ariasuni)
2018-08-29Fix followers/follows layout issues from #8418 (#8505)Jakub Mendyk
* Add alwaysShowScrollbar prop to ScrollableList * Fix followers/follows layout issues from #8418
2018-08-29Delete .gitkeep file since the app/javascript/mastodon directory is no ↵Drew Schuster
longer empty (#8510)
2018-08-28Fix CSP with S3/SWIFT hostsThibaut Girka
2018-08-28[Glitch] Add CSS class to repliesThibaut Girka
Port 2bbec9f4dab1441391983ce920b6a0094f0e0348 to glitch-soc
2018-08-28[Glitch] Preserve hashtag casing in web UI hashtag historyThibaut Girka
Port f9b23a5d6247445ea5b70b431c934a4bb99213bc to glitch-soc
2018-08-28[Glitch] Implement tag auto-completion by historyThibaut Girka
Port 460e380d386367b6809d319859e13d17a6a2acea to glitch-soc
2018-08-28Preserve hashtag casing in threaded modeThibaut Girka
Inspired by f9b23a5d6247445ea5b70b431c934a4bb99213bc
2018-08-28Merge pull request #684 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2018-08-28Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-08-28Adjust CSP to fix image resizingThibaut Girka
2018-08-28Display pending message on admin relays UI (#8494)Eugen Rochko
* Add missing specs for relay accept/reject * Display pending message on admin relays UI
2018-08-27[Glitch] Add missing video descriptionsThibaut Girka
Port ac092d03e7a781d27aff9cb9ea4637be9c5f2a2a to glitch-soc
2018-08-27[Glitch] Wait until relationship is loaded before showing follow buttonThibaut Girka
Port cd049454be9cb8bf5fb6bc5316539432316033aa to glitch-soc
2018-08-27Merge pull request #675 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2018-08-27Add CSS class to replies (#8473)Maciek Baron
2018-08-27Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: app/controllers/api/v1/mutes_controller.rb config/locales/simple_form.pl.yml
2018-08-27Include MOV in upload button tooltip. (#8480)M Somerville
2018-08-27Weblate translations (2018-08-27) (#8483)Renato "Lond" Cerqueira
* Translated using Weblate (French) Currently translated at 100.0% (312 of 312 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (Corsican) Currently translated at 100.0% (312 of 312 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/co/ * Translated using Weblate (Greek) Currently translated at 100.0% (312 of 312 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Danish) Currently translated at 100.0% (312 of 312 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/da/ * Translated using Weblate (Corsican) Currently translated at 99.7% (682 of 684 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/co/ * Translated using Weblate (Danish) Currently translated at 86.1% (589 of 684 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/da/ * Translated using Weblate (French) Currently translated at 99.4% (680 of 684 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (Japanese) Currently translated at 99.7% (682 of 684 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Corsican) Currently translated at 100.0% (312 of 312 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/co/ * Translated using Weblate (French) Currently translated at 100.0% (312 of 312 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (Japanese) Currently translated at 100.0% (312 of 312 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (Czech) Currently translated at 100.0% (312 of 312 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/ * Translated using Weblate (Czech) Currently translated at 99.7% (682 of 684 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ * Translated using Weblate (Czech) Currently translated at 100.0% (312 of 312 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/ * Translated using Weblate (Czech) Currently translated at 98.6% (675 of 684 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ * Translated using Weblate (Czech) Currently translated at 99.8% (683 of 684 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ * Translated using Weblate (Arabic) Currently translated at 0.1% (1 of 684 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Polish) Currently translated at 98.9% (677 of 684 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pl/ * Translated using Weblate (Polish) Currently translated at 100.0% (312 of 312 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pl/ * Translated using Weblate (Polish) Currently translated at 98.7% (81 of 82 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pl/ * Translated using Weblate (Persian) Currently translated at 100.0% (312 of 312 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/ * Normalize translations ran yarn build:development && i18n-tasks normalize && yarn manage:translations && i18n-tasks remove-unused
2018-08-26Better singulars of account followers/toots. (#8471)M Somerville
2018-08-26Make Api::V1::MutesController paginate properly (#8472)Jakub Mendyk
Fixes #8463
2018-08-26Add more hotkeys to legend (#8469)Marcin Mikołajczak
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-08-26Add CLI task for rotating keys (#8466)Eugen Rochko
* If an Update is signed with known key, skip re-following procedure Because it means the remote actor did *not* lose their database * Add CLI method for rotating keys bin/tootctl accounts rotate [USERNAME] Generates a new RSA key per account and sends out an Update activity signed with the old key. * Key rotation: Space out Update fan-outs every 5 minutes per 1000 accounts * Skip suspended accounts in key rotation
2018-08-26Bump interactions count when a follow happens (#8468)Eugen Rochko
2018-08-26Add thor to Gemfile directly (#8467)Eugen Rochko
It's a common dependency, but just in case
2018-08-26Fix low-hanging rubocop gripes (#8458)Quint Guvernator
* rubocop: quit being so picky * rubocop: miscellany * rubocop: prefer present to blank
2018-08-26Merge pull request #674 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2018-08-26Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-08-26Add aria-label to notifications (#8460)Eugen Rochko
Fix #8192
2018-08-26Fix NUM_DAYS in rake mastodon:media:remove_remote and print warning (#8462)Eugen Rochko
Remove old deprecated rake tasks
2018-08-26Delay e-mail notifications by 2 minutes (#8438)Eugen Rochko
Fix #8430