Commit Graph

  • f4bc9620a9 Update settings to re-use admin layout, one big navigation tree, improve settings forms Eugen Rochko 2017-01-28 03:56:10 +0100
  • 04bce0cdf2 Clean up Eugen Rochko 2017-01-27 20:38:35 +0100
  • 76e970c856 Do not automatically login after password reset, as it would circumvent two-factor auth (if enabled) Do not require e-mail address changes to be re-confirmed, it's only trouble for no real benefit Eugen Rochko 2017-01-27 20:34:22 +0100
  • ba192f12e3 Added optional two-factor authentication Eugen Rochko 2017-01-27 20:28:46 +0100
  • 237cb41ab4 Less ambiguous sensitive content toggle label (#556) Zachary Spector 2017-01-27 13:31:14 -0500
  • 2a6773d59b Merge pull request #557 from hoodiek/master Eugen 2017-01-27 18:41:05 +0100
  • 6c37285580 fix button outline showing on clicks for prettiness hoodie 2017-01-27 12:39:36 -0500
  • dc3e0529ca Update broken links, add new sponsor Eugen Rochko 2017-01-27 17:01:21 +0100
  • 450ad43180 Do not run FetchLinkCardService on local URLs, increase file size limit to 8MB, fix ProcessFeedService pushing status into distribution if called a second time while the first is still running (i.e. when a PuSH comes after a Salmon slap), fix not running escape on spoiler text before emojify Eugen Rochko 2017-01-27 16:55:06 +0100
  • 9f57c7d4a6 Updated translation doc to get working links nicolas 2017-01-27 13:17:33 +0100
  • f8bd44a747 Fix font weight Eugen Rochko 2017-01-26 23:34:40 +0100
  • 87667e371c Merge pull request #549 from ineffyble/docs/add-default-account-to-dev-documentation Eugen 2017-01-26 23:03:41 +0100
  • f7aef16668 Merge pull request #548 from PurpleBooth/make-fonts-local Eugen 2017-01-26 23:02:48 +0100
  • 55fa8e61e2
    Move the fonts from Google Fonts to local assets Billie Thompson 2017-01-26 14:06:40 +0000
  • 6ba302b725 Merge pull request #550 from wchristian/oauth_docs2 Eugen 2017-01-26 20:41:53 +0100
  • f6a5977f0b Fix key names in statsd Eugen Rochko 2017-01-26 19:46:52 +0100
  • d567f21d4f Improve StatsD instrumentation Eugen Rochko 2017-01-26 19:08:05 +0100
  • 7329fbd8a4 Fix up timeout, improve contrast on "show more", add responsive style for extremely wide monitors Eugen Rochko 2017-01-26 18:48:56 +0100
  • 12eddb5cbe document that /oauth/token does not always return json Christian Walde 2017-01-26 16:27:16 +0100
  • ae2147d40f Add default account details to developer documentation. Effy Elden 2017-01-27 02:03:13 +1100
  • cc5c1e5feb Removed accidental n+1 query from notifications, updated some deps, improved how "show more" link looks Eugen Rochko 2017-01-26 14:52:07 +0100
  • 2f18c77e44 Merge pull request #526 from wchristian/oauth_docs Eugen 2017-01-26 12:23:47 +0100
  • 446d6f1643 Merge pull request #543 from ineffyble/tweak/seed-default-admin-account-on-dev-environments Eugen 2017-01-26 12:22:32 +0100
  • c3a3ce8172 Merge pull request #541 from TrevInc/master Eugen 2017-01-26 11:07:42 +0100
  • 589837cfc7 Removed line break before spoiler link, changed color of bg for spoiler link Anthony Bellew 2017-01-26 03:07:02 -0700
  • ebe5095665 Add Padding to inline styles for spoiler Anthony Bellew 2017-01-26 03:03:26 -0700
  • 8f18c8f9ad Added inline spoiler button styles Anthony Bellew 2017-01-26 03:02:42 -0700
  • d53294b933 Merge pull request #542 from ineffyble/tweak/redirect-admin-path-to-admin-settings Eugen 2017-01-26 10:44:20 +0100
  • 95b0bf9815 Merge pull request #544 from ineffyble/tweak/add-default-local-domain-for-vagrant-environments Eugen 2017-01-26 10:43:54 +0100
  • 94eccbc5de Add a default LOCAL_DOMAIN=mastodon.dev to .env.vagrant Effy Elden 2017-01-26 19:22:59 +1100
  • 198ea2522e Seed a default, confirmed, admin account on development environments Effy Elden 2017-01-26 19:22:00 +1100
  • 07b9a10d4d Add redirect for /admin => /admin/settings Effy Elden 2017-01-26 18:59:35 +1100
  • d944946c52 Moved brackets outside of localized strings at Gargron's suggestion Anthony Bellew 2017-01-26 00:24:52 -0700
  • baa52984e9 Add brackets to visually distinguish show more / show less text Anthony Bellew 2017-01-25 20:56:33 -0700
  • 3d890c4073 Merge pull request #3 from tootsuite/master Anthony Bellew 2017-01-25 20:53:57 -0700
  • 905c829179 Improve infinite scroll on notifications Eugen Rochko 2017-01-26 04:30:40 +0100
  • 57f7cf8349 Follow request authorizations faster Eugen Rochko 2017-01-26 03:56:26 +0100
  • eb62778bec Fix #537 - opengraph description should display spoiler text when present Eugen Rochko 2017-01-26 03:45:14 +0100
  • 1c507ff172 Fix #538 - Darken buttons to increase contrast Eugen Rochko 2017-01-26 03:32:00 +0100
  • 3a310e8f63 Fix CSS mistake Eugen Rochko 2017-01-26 03:17:48 +0100
  • 97d9517b6b Merge pull request #534 from yiskah/patch-2 Eugen 2017-01-26 02:51:27 +0100
  • 0a391a2872 Merge pull request #536 from blackle/leftclick Eugen 2017-01-26 02:50:55 +0100
  • 6bba337080 Only open status on left mouse press blackle 2017-01-25 20:43:41 -0500
  • 33e09cc76b Increase color contrast on getting started text shel 2017-01-25 20:19:37 -0500
  • 3b6af5245b clarify the intended use of the oauth api call as per this issue: Christian Walde 2017-01-25 18:31:15 +0100
  • 97da56d02b Fix loading of avatars before drawing them to canvas Eugen Rochko 2017-01-25 17:23:17 +0100
  • 00fa850bdc Fix #187, address #441 - <Avatar> component now plays gifs only while hovered Eugen Rochko 2017-01-25 17:07:57 +0100
  • 3beb24ad55 Use <summary> to encode content warnings instead Eugen Rochko 2017-01-25 16:53:30 +0100
  • 0430f7c0fa Fix spoiler_text not having "not null" constraint Eugen Rochko 2017-01-25 15:24:19 +0100
  • 51a7047367 Fix order of migrations Eugen Rochko 2017-01-25 15:01:00 +0100
  • ca04002c93 Add content warning example to docs Eugen Rochko 2017-01-25 02:54:28 +0100
  • ab94ad3504 Add description of Mastodon's current protocol extensions Eugen Rochko 2017-01-25 02:46:16 +0100
  • 41f5459af5 Merge pull request #524 from blackle/master Eugen 2017-01-25 02:16:36 +0100
  • ca13ec04a8 fix up spoilers blackle 2017-01-24 20:14:20 -0500
  • 10ffd455a8 Fix #522 - prevent blocked users from reblogging Eugen Rochko 2017-01-25 01:48:46 +0100
  • ca28d9c2ae Merge branch 'blackle-master' Eugen Rochko 2017-01-25 01:29:40 +0100
  • 999cde94a6 Instead of using spoiler boolean and spoiler_text, simply check for non-blank spoiler_text Federate spoiler_text using warning attribute on <content /> instead of a <category term="spoiler" /> Clean up schema file from accidental development migrations Eugen Rochko 2017-01-25 00:49:08 +0100
  • f8da0dd490 Merge branch 'master' into master Eugen 2017-01-24 21:56:06 +0100
  • 8a880a3d46 Make blocks create entries and unfollows instantly, but do the clean up in the background instead. Should fix delay where blocked person can interact with blocker for a short time before background job gets processed Eugen Rochko 2017-01-24 21:40:41 +0100
  • 326c75b35b Merge pull request #521 from mistydemeo/fix_invisible_css Eugen 2017-01-24 21:26:18 +0100
  • adda642c63 Fix `invisible` CSS class Misty De Meo 2017-01-24 11:07:46 -0800
  • e47b8e778b Fix links in toots opening the toot at first Eugen Rochko 2017-01-24 18:51:09 +0100
  • 80cefd5b3c Fix #204, fix #515 - URL truncating is now a style so copypasting is not affected, replaced onClick handler with onMouseUp/Down to detect text selection not trigger onClick handler then Eugen Rochko 2017-01-24 17:05:44 +0100
  • b06a375ee4 Merge branch 'blackle-boostspin' Eugen Rochko 2017-01-24 14:28:54 +0100
  • 4f3264d291 Merge branch 'master' into boostspin Eugen 2017-01-24 14:27:13 +0100
  • 4a146a0d18 Make boost animation an SVG that uses SCSS colours blackle 2017-01-23 21:02:13 -0500
  • 21c209636d Set isLoading false on timelines when request fails Eugen Rochko 2017-01-24 13:04:12 +0100
  • 1f5792c834 API now respects ?limit param as long as it's within 2x default limit Eugen Rochko 2017-01-24 04:22:10 +0100
  • d9022884c6 Smarter infinite scroll Eugen Rochko 2017-01-24 04:12:10 +0100
  • bf0f6eb62d Implement a click-to-view spoiler system blackle 2017-01-12 23:54:26 -0500
  • 1761d3f9c3 Fix mistake Eugen Rochko 2017-01-23 22:18:08 +0100
  • d00189b55a Domains with reject_media? set to true won't download avatars either Eugen Rochko 2017-01-23 21:55:29 +0100
  • 8aab692034 Less re-rendering Eugen Rochko 2017-01-23 21:40:48 +0100
  • 434cf8237e Optional domain block attribute that prevents media attachments from being downloaded Eugen Rochko 2017-01-23 21:36:08 +0100
  • cca82bf0a2 Move merging/unmerging of timelines into background. Move blocking into background as well since it's a computationally expensive Eugen Rochko 2017-01-23 21:29:34 +0100
  • f392030ab8 Add /api/v1/notifications/clear, non-existing link cards for statuses will now return empty hash instead of throwing a 404 error. When following, merge into timeline will filter statuses Eugen Rochko 2017-01-23 21:09:27 +0100
  • f2e08ff568 Remove unneeded block check Eugen Rochko 2017-01-23 17:40:23 +0100
  • 6d98a73180 Domain blocks now have varying severity - auto-suspend vs auto-silence Eugen Rochko 2017-01-23 17:38:38 +0100
  • ef2b924679 Forgot to commit Eugen Rochko 2017-01-23 17:18:41 +0100
  • f855d645b2 Move all hex colors in SASS to variables and all variations to darken/lighten Eugen Rochko 2017-01-23 16:01:46 +0100
  • d4d56b8af0 Fix #365, 1/2 of #408 - replace rails_autolink with URI.regexp, run link_hashtags on simplified_format Eugen Rochko 2017-01-23 14:45:09 +0100
  • aa9c51a34c Fix a couple unhandled exceptions Eugen Rochko 2017-01-23 13:56:57 +0100
  • a1894786cf Potentially fix notifications issue Eugen Rochko 2017-01-23 13:43:14 +0100
  • 7c015ece45 Fix oembed controller test Eugen Rochko 2017-01-23 13:36:17 +0100
  • 6062680dd4 Merge pull request #513 from mistydemeo/fix_textarea_selection_clicking Eugen 2017-01-23 11:34:36 +0100
  • 33fd8a7d95 Textarea: fix clicking on name suggestions Misty De Meo 2017-01-22 22:57:58 -0800
  • 1953e3b6ed Fix inflection Eugen 2017-01-22 23:08:51 +0100
  • 956da43e19 Fix error Eugen 2017-01-22 23:07:31 +0100
  • cea9fb31fe Mitigate inconsistent notifications Eugen 2017-01-22 21:50:17 +0100
  • 61aee0006e Override Rack::Request to use the same trusted proxy settings as Rails Eugen Rochko 2017-01-22 21:01:28 +0100
  • 67befe5463 Allow to specify trusted proxies through env Eugen Rochko 2017-01-22 20:35:49 +0100
  • c66718afff Merge pull request #509 from ineffyble/docs/developer-docs-additions Eugen 2017-01-22 17:07:39 +0100
  • f3cac0b93b Update README.md to match new documentation (missed from previous commit) Effy Elden 2017-01-23 00:11:09 +1100
  • 10fe63d4db Merge pull request #508 from ineffyble/docs/developer-docs-additions Eugen 2017-01-22 11:43:07 +0100
  • 92a98f73aa Add separate sections for Heroku and Vagrant deployments. Add guide for instance administration. Move 'Contribution guide' to 'Development guide'. Effy Elden 2017-01-22 19:50:40 +1100
  • 536cde4e99 Rename main docs page so it renders in github Eugen Rochko 2017-01-21 22:54:49 +0100
  • 2baf0fabb4 Improve API docs formatting Eugen Rochko 2017-01-21 22:53:02 +0100
  • e92a1cf436 Add wiki contents to docs/ instead Eugen Rochko 2017-01-21 22:49:08 +0100
  • 500278eb4c Merge branch 'ineffyble-fix/error-pages' Eugen Rochko 2017-01-21 22:31:19 +0100
  • e22a56183a Improve error page layouting. 500 page has to stay static because it's used from nginx when Rails fails. Eugen Rochko 2017-01-21 22:30:47 +0100