about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2017-04-12locale-fr: fix typo (#1603)karlyeurl
In this case, the adjective applies to a feminine noun.
2017-04-12Improve docker update instructions (#1619)Eugen
2017-04-12vector (svg) logo with correct inner shape and colors (#1362)Julien Deswaef
* vector (svg) logo with correct inner shape and colors * minimized svg logo
2017-04-12Fix target blank on "open_in_web" link (#1612)David Libeau
When you render the "embed" view in an iframe, this link bugs when clicked, due to missing target blank.
2017-04-12Request documentation (#1616)Shel R
This addition to the submission guidelines requests that contributors remember to document their code. It's not a hard fast rule just a reminder.
2017-04-12Quick best practice cleanup of views/helpers (#1546)Matt Jankowski
* Remove trailing whitespace * Use query methods instead of explicit .blank? checks
2017-04-12Webfinger resource to extract username from resource string (#1607)Matt Jankowski
* Add WebfingerResource class to extract usernames * Use WebfingerResource in xrd#webfinger
2017-04-12Focus textarea when text is inserted (#1320)Rachel H
Place space after uploaded filenames
2017-04-12Allow import/export of mutes list (#1541)Matt Jankowski
* Allow export of mutes list * Allow importing of mutes list * Refactor to use Settings::Exports::BaseController and DRY up exports code
2017-04-12Add unit tests for https://github.com/tootsuite/mastodon/pull/1574 (#1584)Henry Smith
2017-04-12Added missing Spanish translations strings (#1292)Carlos A. Escobar
* Added missing Spanish translations strings * fix bad translation * resolve conflict with tootsuite/master * agreements from spanish community * Add some missing strings
2017-04-12[web] Moving docs link to tootsuite/documentation (#1581)lindwurm
related: https://github.com/tootsuite/mastodon/commit/1236529e39a7e2534fdd34686a749b5a386c109b and https://github.com/tootsuite/mastodon/commit/fc47c1d00e507f0bee2575c91822d68b72a22bac Signed-off-by: lindwurm <lindwurm.q@gmail.com>
2017-04-12Make Reporting admin section translatable (#1549)Thomas Citharel
* Make Reporting admin section translatable And translate it into english and french Signed-off-by: Thomas Citharel <tcit@tcit.fr> * Make subject of emails translatable and improve french translation Signed-off-by: Thomas Citharel <tcit@tcit.fr> * Make error pages translatable and translate them in english and french Signed-off-by: Thomas Citharel <tcit@tcit.fr> * Translate site setting section * Insert instance in registration emails and improve them a bit Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-04-12Working translation for Norwegian. (#1611)Thor Harald Johansen
2017-04-12Params compact deprecation warning (#1580)Matt Jankowski
* Move filter_link_to class formation to separate method in admin/accounts helper * Remove deprecated #compact method usage on strong parameters
2017-04-12Simplify the way the embed view is created (#1590)Matt Jankowski
* Add coverage for embedded status view * Refactor embed view to eliminate @external_links variable
2017-04-12Default to json type for webfinger requests (#1583)Matt Jankowski
2017-04-12Clean up stylesheet organization (#1591)Matt Jankowski
2017-04-12Silence more scope order warnings (#1604)Matt Jankowski
2017-04-12Fix issue with intermittent api/v1/notifications failure (#1606)Matt Jankowski
The spec was checking the activity_id of the activities held in notifications within the controller. Because the activities are different models, it is possible that they are created with the same database IDs, and when they are this spec fails because an activity which should not count as a match is counted as one.
2017-04-12Fix redirect link on Tuning.md (#1595)Christopher Su
2017-04-12Add Traditional Chinese, Hong Kong translation (zh-HK) (#1544)Koala Yeung
* Added Chinese Traditional Hong Kong (zh-HK) for Ruby * Added translations for Ruby. * Added Chinese Traditional Hong Kong (zh-HK) for JS * Added translations for javascript code. * Rearrange language references in mastodon.jsx * Break `addLocaleData` into multiple lines. Make future commit more readable. * Roughly re-sort the languages in alphabetical orders (only manually put English on top because it is default). * Sort application.rb locale with alphabetical order With exception that English (default language) goes first. Improve code readability. * Resort language selection box alphabetically Sort HUMAN_LOCALES in the alphabetical order of display name (except English, the default language, come first). Improve usability.
2017-04-12update Docker section of README (#1231)Eric Blade
Re-ordered the steps so it doesn't read "Do this, but first, do this other step" Added note about keeping the REDIS and DB settings as they are for Docker use Add which variables you will NEED to set to make the Mastodon work Add how to generate the secrets Add how to connect to your Mastodon Add a note to read the Production-guide
2017-04-11Change default log level in production from :debug to :info for less I/O (#1579)Eugen
2017-04-11Improve emoji picker look (#1493)Eugen
* Improve emoji picker look * Add hover animation to emojis in picker
2017-04-11Fix #1491 - Fix broken notifications, broken Link header parsing for ↵Eugen
exclude_types (#1548)
2017-04-11Add task in order to delete unconfirmed users (older than 2days) (#1571)d0p1
* add task in order to delete unconfirmed user * change 7 days to 2
2017-04-11Fix #1535 - #1372 set a wrong default on :openssl_verify_mode (#1563)Eugen
2017-04-11Refactor exports controller (#1567)Matt Jankowski
* Add basic coverage for settings/exports controller * Remove unused @account variable from settings/exports controller * Add coverage for download export actions * Remove deprecated `render :text` in favor of `send_data` for csv downloads * Add model to handle exports * Use Export class in settings/exports controller * Simplify settings/exports controller methods * Move settings/export to more restful routes
2017-04-11Fix console error when scrolling a column with no scrollable content (#1574)Henry Smith
2017-04-11[about] Moving docs link to tootsuite/documentation (#1573)lindwurm
related: https://github.com/tootsuite/mastodon/commit/1236529e39a7e2534fdd34686a749b5a386c109b Signed-off-by: lindwurm <lindwurm.q@gmail.com>
2017-04-11Update french locale (#1525)Thomas Citharel
* Update devise.fr.yml fixing minor typos * add missing strings * Fix a translation and add translation for devise part Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-04-11Add Japanese translation (#1552)pinfort
* add device.ja.yml * update device.ja.yml * add file simple_form.ja.yml * 👍Added doorkeeper.ja.yml * add ja.yml * Update doorkeeper.ja.yml fixed url to uri * update ja.yml * fix some translations * fix japanese grammar of a translate * fix some translates * fix ja.yml * add ja.jsx * add Japanese user mail views * Added japanese translate locales * Added :ja to available_locales こっちも * Added "日本語" to HUMAN_LOCALES * Imported/Added ja to addLocaleData * update ja.jsx
2017-04-11Revised finnish translation (#1537)jukper
2017-04-11Update language files (#1516)Jantso Porali
* update faq with default language * update translation for about page * update Minio config Thanks to @Gargon for helping me. I hope this will help others as well * update import and export translation * translate emails to finnish * add finnish translation for emails * add finnish translation for emails * add finnish translation * add missing dot * update finnish language to emails * add finnish translation for emails * add dot and fix typo * updated some minor typos * remove language change due breaking emails And by dev request * updated minio config by dev request * updated about page translation * fix for Amazon S3/Minio instance setups If you were using S3 or Minio for your files, this will fix the Import issue :) * update translation according to issue #1515 See issue #1515 * update translation for issue #1515 see issue #1515
2017-04-11Imports controller errors (#1553)Matt Jankowski
* Add spec for settings/imports controller * Add failing spec for settings/imports#create * Fix broken imports * Refactor ImportWorker
2017-04-11Merge branch 'master' of github.com:tootsuite/mastodonEugen Rochko
2017-04-11Merge branch 'blackle-master'Eugen Rochko
2017-04-11Fix look of the modalsEugen Rochko
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