about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2017-04-11Merge branch 'master' of https://github.com/blackle/mastodon into blackle-masterEugen Rochko
2017-04-11Better background-photo.jpeg (#1560)Komic
Fixed the nasty banding & recompressed it at about the same level
2017-04-11Increase breakpoint size for bio on account show (#1559)Matt Jankowski
2017-04-11Remove unused methods from StreamEntriesHelper (#1365)Matt Jankowski
Removes: - avatar_for_status_url - relative_time - reblogged_by_me_class - favourited_by_me_class
2017-04-11Remove unused AtomBuilderHelper (#1364)Matt Jankowski
This was used in the views/atom/user_stream.xml.ruby file, which no longer is used.
2017-04-11Moving docs to tootsuite/documentation (#1550)Eugen
2017-04-11Allow user to disable the boost confirm dialog in preferencesblackle
2017-04-11Add (commented) volume in docker-compose && Mitigating the HTTPoxy ↵Valentin Ouvrard
Vulnerability (#1253) * enable commented volume in docker-compose.yml * Disable unworking Nginx root directory && Mitigating the HTTPoxy Vulnerability * add my instance to the list * enable GZIP on nginx.conf * readd root /home/mastodon/live/public;
2017-04-11fix(*): ruby version was updated in .ruby-version but not Vagrant. Make them ↵Gavin Mogan
match (#1502)
2017-04-11Bypass boost confirm modal if alt is pressedblackle
2017-04-11Avoid user enumeration with devise paranoid mode (#1527)Yann GUERN
2017-04-11Adjust css for user detail page (#1463)Corey Dutson
- details a background for contrast - add 5px padding to the top of the `details-counters` children to line them up with the bio to the right (Which has a 5px padding on the top)
2017-04-10Add Mastodon.tools (#1457)David Libeau
2017-04-10Add boost confirm modalblackle
2017-04-11Pagination improvements (#1445)Matt Jankowski
* Replace will_paginate with kaminari * Use #page instead of #paginate in controllers * Replace will_paginate.page_gap with pagination.truncate in i18n * Customize kaminari views to match prior styles * Set kaminari options to match prior behavior * Replace will_paginate with paginate in views
2017-04-11Add note about minimum docker-compose version (#1264)Effy Elden
Add a note to ensure users are using the right version of docker-compose.
2017-04-11When avatar/header are GIF, generate static versions (#1428)Eugen
* When avatar/header are GIF, generate static versions. Account API returns "avatar"/"avatar_static", "header"/"header_static" Static version is the same as original for other cases Web UI de-animates avatars in toots, lists of users Fix #441, fix #596, prerequisite for #1064 * Fix JS test * Add rake task to generate static avatars/headers from GIF ones, add test
2017-04-11Remove order prior to .find_in_batches (#1470)Matt Jankowski
The `Status` class has a default order on it, so when this query gets built and gets all the way to `find_in_batches` there is an order already there. When `find_in_batches` is run it discards any existing order on the query, and emits a warning to the logs if there is one there. This change removes the order prior calling `find_in_batches`, which will stop the logged warning from occurring as well.
2017-04-11Dev Tooling fixes (eslint/editorconfig) (#1398)Gavin Mogan
* Add eslint to dev dependancies so it gets installed for the repo yarn add --dev eslint babel-eslint eslint-plugin-reac project specific version of eslint, you can globally install eslint-cli if you want the global runtime, or add .bin to your path * fix eslint errors about inconsitent returns * eslint ignore the same as git ignore. allows for eslint . * Add editorconfig file so everyones editor will be setup to follow the same standards
2017-04-11Add username as a title for mentions (#1385)Matthias Jouan
Add a title attribute on mention links for both notifications and mentions in statuses. Related to #1350
2017-04-11Adds error message to mastodon:confirm_email task. (#1476)Ash Furrow
2017-04-10API param to exclude notification types from response (#1341)Eugen
* Add exclude_types param to /api/v1/notifications * Exclude notification types in web UI through exclude_types in the API
2017-04-10Clean up generation of account webfinger string (#1477)Matt Jankowski
* Consolidate webfinger string creation under Account#to_webfinger_s * Introduce Account#local_username_and_domain for consolidation
2017-04-10Version bumps for ruby and misc gems (#1159)Matt Jankowski
* Update rspec-rails to version 3.5.2 * Update addressable to version 2.5.1 * Update autoprefixer-rails to version 6.7.7.1 * Update bullet to version 5.5.1 * Update domain_name to version 0.5.20170404 * Update letter_opener_web to version 1.3.1 * Upate redis-rails to version 5.0.2 * Update active_record_query_trace to version 1.5.4 * Update capistrano-rails to version 1.2.3 * Update dotenv-rails to version 2.2.0 * Update pg to version 0.20.0 * Update tilt to version 2.0.7 * Update warden to version 1.2.7 * Update tins to version 1.13.2 * Update terminal-table to version 1.7.3 * Update oj to version 2.18.5 * Update simplecov to version 0.14.1 * Update uglifier to version 3.1.13 * Update hashdiff to version 0.3.2 * Update webmock to version 2.3.2 * Update devise to version 4.2.1 * Use ruby version 2.4.1 * Update sass to version 3.4.23 * Update puma to version 3.8.2 * Update will_paginate to version 3.1.5 * Update font-awesome-rails to version 4.7.0.1 * Update fuubar to version 2.2.0 * Update pry-rails to version 0.3.6 * Update simple-navigation to version 4.0.5 * Update rubocop to version 0.48.1 * Update doorkeeper to version 4.2.5 * Update faker to version 1.7.3 * Update aws-sdk to version 2.9.5 * Update fabrication to version 2.16.1 * Update hamlit-rails to version 0.2.0 * Update http to version 2.2.1 * Update httplog to version 0.99.2 * Update sidekiq to version 4.2.10 * Update rspec-sidekiq to version 3.0.0 * Update pghero to version 1.6.4 * Update rack-cors to version 0.4.1 * Update i18n-tasks to version 0.9.13 * Update ruby-oembed to version 0.12.0 * Update jquery-rails to version 4.3.1 * Update simple_form to version 3.4.0 * Update react-rails to version 1.11.0 * Update aws-sdk to version 2.9.6 * Update sidekiq-unique-jobs to version 5.0.0 * Update uglifier to version 3.2.0
2017-04-10Add more specific class names to notification divs (#1120)Chris Martin
2017-04-10More SMTP customization (#1372)Alexander Mankuta
* Allow SMTP auth method customization * Add SMTP openssl_verify_mode option support Allows one use self-signed certs with their SMTP server. * Add SMTP enable_starttls_auto option support
2017-04-10Keep newlines in xml (#1397)Rachel H
2017-04-10Fix #1097 When onClick is falsy, do not make status content clickable (#1434)Stephen Burgess
2017-04-10Allow typing a toot while an image uploads (#1429)Jessica Stokes
This patch stops disabling the toot text field when an image is uploading. Instead, you can type to your heart's content and when the image uploads it'll append the image URL, and restore the position of your cursor to wherever it was in the toot text just prior. Effectively, the image URL is appended to the toot, and typing is not interrupted at all! ✨
2017-04-10Fix issue with missing emojify class in views (#1455)Matt Jankowski
* Add missing emojify class to landing strip * Add missing emojify class to simple_status partial
2017-04-10Admin base controller (#1465)Matt Jankowski
* Add Admin::BaseController to wrap admin area Extracts the setting of the `admin` layout and verifying that users are admins to a common base class for the admin/ controllers. * Add basic coverage for admin/reports and admin/settings controllers
2017-04-10Fix references to "v1" API (#1460)Alexsander Akers
References to `vi` API version replaced with `v1`
2017-04-10Adjust background of emoji panel (#1461)Corey Dutson
Addresses #1451 which notes the emoji picker is too light. I agree, so I submit this adjustment. Changes: Changed the background to a darkened version of another system color
2017-04-10Improve scrolling behaviour (#1415)Jessica Stokes
* Replace column margin with padding This improves horizontal scrolling behaviour significantly; scrolled flex elements are... a little weird. * Move clear column button styling to css
2017-04-10Fix icon and emoji sizes (#1403)Ram Lmn
Fixes icons and emoji size issues described in #1233.
2017-04-10Minor clarifications (#1386)Ryan Freebern
2017-04-10Add Russian translation (ru) (#1023)Ratmir Karabut
* Add Russian translation (ru) * Fix a missing comma * Fix the wording for better consistency
2017-04-10Fix for Import issue from URL (#1416)Jantso Porali
2017-04-10Add search to emoji picker (#1395)Gavin Mogan
2017-04-09Do not store last visited URL from API controllers (#1330)Eugen
Sign-in redirects you back to last visited URL, but in case of API requests, this sometimes redirected users to an API URL that, of course, greeted them with an {"error":"The access token is invalid"}
2017-04-09Fix #1339 - better Atom titles (#1343)Eugen
2017-04-09Fix /api/v1/accounts/update_credentials tests (#1357)Eugen
2017-04-09Minor change to Entity on API.md (Relationship) (#1356)Ornithologist Coder
2017-04-09update portuguese translation (#1280)Hugo Gameiro
added the missing fields and improved the translation
2017-04-09Get handle from atom feed's author/email field instead of guessing from URL ↵ThibG
(#1344) The goal of this change is to enhance Mastodon's handling of remote domains for which the APIs reside on a different host (see issue #1032). Indeed, when a remote user unknown to Mastodon is mentionned, only its profile URL (e.g. https://social.example.org/users/User) is known, and Mastodon has to build a @username@domain handle for it. To do so, Mastodon fetches the user's atom feed (e.g., https://social.example.org/users/User.atom) and uses its content to get the username part of the handle, and the URL's host part to build the domain (e.g., @User@social.example.org). This handle is then used for a Webfinger request. In the case where example.org serves the Webfinger info for @User@example.org and all feeds and APIs are hosted at social.example.org, Mastodon will still build @User@social.example.org and fail at resolving the account's details through Webfinger. This patch changes this behaviour by using the author's email address from the atom feed to build the handle. In Mastodon-generated atom feeds, the email address is always the handle it expects for federation.
2017-04-09Use HTTP Accept-Language to detect locale (#1166)David Authier
* Use HTTP Accept-Language to detect locale * Fix gem order to comply with codeclimate * Sort gem to comply with rubocop * I18n.default_locale fallback when there is no accept-language header
2017-04-09Minor API.md changes (#1351)Ornithologist Coder
2017-04-09Minor change on API.md (#1352)Ornithologist Coder
2017-04-09Add comment to settings.yml to nudge admins towards editing values via Web ↵R Tucker
UI (#1289) * Put a useful message for new admins on /about/more I totally failed to realize this file was just defaults. I think this message would be a good default for people like me. * Revert default site description, expand comment This will keep setup-related stuff from leaking into public views, while still hopefully keeping over-eager admins from editing this file unnecessarily before RTFMing. (e.g., me)
2017-04-09Allow users to update their Account in the API (#1179)David Celis
* Allow users to update their Account in the API It would be nice for API clients to be able to allow users to update their accounts without having to wrap Mastodon in a web view. This patch adds an API endpoint to let users submit a PATCH for their account. Signed-off-by: David Celis <me@davidcel.is> * Add /api/v1/accounts/update_credentials to the API docs Signed-off-by: David Celis <me@davidcel.is>
generated by cgit-pink (git 2.37.1) at 2024-12-04 00:46:49 +0000