mastodon

Commit Graph

Author	SHA1	Message	Date
Eugen Rochko	960181fd99	Fix look of the modals	8 years ago
Eugen Rochko	2a7602cad4	Merge branch 'master' of https://github.com/blackle/mastodon into blackle-master	8 years ago
blackle	06444bf050	Allow user to disable the boost confirm dialog in preferences	8 years ago
Valentin Ouvrard	b723ee73fc	Add (commented) volume in docker-compose && Mitigating the HTTPoxy 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;	8 years ago
Gavin Mogan	c35bda0551	fix(*): ruby version was updated in .ruby-version but not Vagrant. Make them match (#1502 )	8 years ago
blackle	f53fb6aa66	Bypass boost confirm modal if alt is pressed	8 years ago
Yann GUERN	a85d4473aa	Avoid user enumeration with devise paranoid mode (#1527 )	8 years ago
Corey Dutson	c9b9225951	Adjust css for user detail page (#1463 ) - 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)	8 years ago
David Libeau	11898a6461	Add Mastodon.tools (#1457 )	8 years ago
blackle	01e5447e35	Add boost confirm modal	8 years ago
Matt Jankowski	4ada50985a	Pagination improvements (#1445 ) * 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	8 years ago
Effy Elden	a283786463	Add note about minimum docker-compose version (#1264 ) Add a note to ensure users are using the right version of docker-compose.	8 years ago
Eugen	12f72e1740	When avatar/header are GIF, generate static versions (#1428 ) * 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	8 years ago
Matt Jankowski	b57eed4584	Remove order prior to .find_in_batches (#1470 ) 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.	8 years ago
Gavin Mogan	3672a799d4	Dev Tooling fixes (eslint/editorconfig) (#1398 ) * 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	8 years ago
Matthias Jouan	3fd5385e7b	Add username as a title for mentions (#1385 ) Add a title attribute on mention links for both notifications and mentions in statuses. Related to #1350	8 years ago
Ash Furrow	d439855a6d	Adds error message to mastodon:confirm_email task. (#1476 )	8 years ago
Eugen	2810013b93	API param to exclude notification types from response (#1341 ) * Add exclude_types param to /api/v1/notifications * Exclude notification types in web UI through exclude_types in the API	8 years ago
Matt Jankowski	0687ab8ae3	Clean up generation of account webfinger string (#1477 ) * Consolidate webfinger string creation under Account#to_webfinger_s * Introduce Account#local_username_and_domain for consolidation	8 years ago
Matt Jankowski	64dbde0dbf	Version bumps for ruby and misc gems (#1159 ) * 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	8 years ago
Chris Martin	ae57b3a8c5	Add more specific class names to notification divs (#1120 )	8 years ago
Alexander Mankuta	0dbbc16c69	More SMTP customization (#1372 ) * 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	8 years ago
Rachel H	f690320fb9	Keep newlines in xml (#1397 )	8 years ago
Stephen Burgess	553170b77a	Fix #1097 When onClick is falsy, do not make status content clickable (#1434 )	8 years ago
Jessica Stokes	8a6096a3de	Allow typing a toot while an image uploads (#1429 ) 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! ✨	8 years ago
Matt Jankowski	d2f6d9b9fb	Fix issue with missing emojify class in views (#1455 ) * Add missing emojify class to landing strip * Add missing emojify class to simple_status partial	8 years ago
Matt Jankowski	dbe9f33fdc	Admin base controller (#1465 ) * 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	8 years ago
Alexsander Akers	1be6aa0c7f	Fix references to "v1" API (#1460 ) References to `vi` API version replaced with `v1`	8 years ago
Corey Dutson	087ca3009b	Adjust background of emoji panel (#1461 ) 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	8 years ago
Jessica Stokes	db7c7d1af1	Improve scrolling behaviour (#1415 ) * 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	8 years ago
Ram Lmn	42fb4faa0f	Fix icon and emoji sizes (#1403 ) Fixes icons and emoji size issues described in #1233.	8 years ago
Ryan Freebern	9bb398ee91	Minor clarifications (#1386 )	8 years ago
Ratmir Karabut	9043b32183	Add Russian translation (ru) (#1023 ) * Add Russian translation (ru) * Fix a missing comma * Fix the wording for better consistency	8 years ago
Jantso Porali	e30bbb1cb0	Fix for Import issue from URL (#1416 )	8 years ago
Gavin Mogan	8bdf02812c	Add search to emoji picker (#1395 )	8 years ago
Eugen	93db265be7	Do not store last visited URL from API controllers (#1330 ) 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"}	8 years ago
Eugen	c172919745	Fix #1339 - better Atom titles (#1343 )	8 years ago
Eugen	15d442cf9d	Fix /api/v1/accounts/update_credentials tests (#1357 )	8 years ago
Ornithologist Coder	43f955e31f	Minor change to Entity on API.md (Relationship) (#1356 )	8 years ago
Hugo Gameiro	4ea4ef9d0f	update portuguese translation (#1280 ) added the missing fields and improved the translation	8 years ago
ThibG	d19ed18388	Get handle from atom feed's author/email field instead of guessing from URL (#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.	8 years ago
David Authier	f0bd439486	Use HTTP Accept-Language to detect locale (#1166 ) * 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	8 years ago
Ornithologist Coder	b16fbd52b2	Minor API.md changes (#1351 )	8 years ago
Ornithologist Coder	3b34c28bee	Minor change on API.md (#1352 )	8 years ago
R Tucker	8bfdbf0aa6	Add comment to settings.yml to nudge admins towards editing values via Web 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)	8 years ago
David Celis	d4fe6cd2bf	Allow users to update their Account in the API (#1179 ) * 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>	8 years ago
Matt Jankowski	ea6c930c04	Helper cleanup (#1348 ) * Remove unused helper files * Add coverage for application helper * Add coverage for StreamEntriesHelper #display_name	8 years ago
StefOfficiel	12e29c9660	Update fr.jsx (#1329 ) * Update fr.jsx * Remove duplicate translation	8 years ago
Olivier Humbert	082bef3027	French translation update (#1271 ) * Update confirmation_instructions.fr.html.erb consistency across the French translation * Update consistency across the French translation * Update fr.yml a bunch of consistency across the French translation + a few typos * Update doorkeeper.fr.yml consistency across the French translation (punctuation)	8 years ago
spf	e6b48a7048	French typo (#1257 ) * French typo * Datetime french translation	8 years ago

1 2 3 4 5 ...

2080 Commits (960181fd99cad30f860356a04d8237c19e9c82c8) All Branches Search

2080 Commits (960181fd99cad30f860356a04d8237c19e9c82c8)

All Branches