CatCatNya/catstodon
4
2
Fork 0
forked from glitch-soc-github-mirror/mastodon
Code Issues 12 Pull requests Projects 1 Releases 12 Wiki Activity

Commit graph

  • 0afed995ce Fix the fix Eugen Rochko 2017-02-09 21:22:49 +01:00
  • 6331ed16e5 Fix #614 - extra reply-boolean on statuses to account for cases when replied-to status is not in the system at time of distribution; fix #607 - reset privacy settings to defaults when cancelling replies Eugen Rochko 2017-02-09 20:25:39 +01:00
  • c424df5192 Progress on moving color styles to Sass Eugen Rochko 2017-02-09 01:20:09 +01:00
  • 942a2e7d68 Fix reblogs not having content warnings forwarded Eugen 2017-02-08 18:05:46 +01:00
  • d96e031dfc Fix #611 - Layout setting in registrations controller Eugen 2017-02-08 03:04:29 +01:00
  • aa1213e089 Add postgres setup instructions to docs Eugen Rochko 2017-02-07 23:57:30 +01:00
  • 1d273e4430 Change blocked users icon to fa-ban in getting started view (#608) Isabelle Knott 2017-02-07 17:48:50 -05:00
  • 02e91a96dd Make streaming API use one pattern-matching redis pubsub connection Refresh timelines when streaming API reconnects in the UI Eugen Rochko 2017-02-07 14:37:12 +01:00
  • 9d5fb49cd8 Merge pull request #603 from evanminto/activitypub-account Eugen 2017-02-07 02:08:40 +01:00
  • 28cbb6dc21 Add AS2 format to RABL files Evan Minto 2017-02-06 17:00:55 -08:00
  • 8a081ce588 Fix wrong prediction of whether toot will apear on public timeline in UI Eugen Rochko 2017-02-07 00:40:35 +01:00
  • 714e41d472 Fix preferences save Eugen Rochko 2017-02-07 00:23:38 +01:00
  • ac035108aa Add "clear notifications" button, exclude posts from people who have blocked *you* from public/hashtag timelines Eugen Rochko 2017-02-07 00:06:40 +01:00
  • c8252759df Add streaming API channels for local-only statuses Eugen Rochko 2017-02-06 23:46:14 +01:00
  • 347a153b3d Add API modifiers to limit returned toots from public/hashtag timelines to only those from local users; Add link to "extended information" to getting started in the UI; Add defaults for posting privacy; Change how publish button looks depending on posting privacy chosen Eugen Rochko 2017-02-06 23:16:20 +01:00
  • 53234e5947 Add trailing newline Evan Minto 2017-02-06 12:15:47 -08:00
  • da7f24c238 Add test Evan Minto 2017-02-06 12:14:02 -08:00
  • 3fa5d05997 Simplify RABL Evan Minto 2017-02-06 11:39:08 -08:00
  • 94e213c6c1 Reuse existing controller and route Evan Minto 2017-02-06 01:19:05 -08:00
  • 4d2be9f432 Add unique request IDs to streaming API to improve logs Eugen Rochko 2017-02-05 23:37:25 +01:00
  • 0af3401553 Don't allow people to follow people they blocked without unblocking first Eugen Rochko 2017-02-05 20:58:09 +01:00
  • eee8afb0b7 Remove bios from blocked users list, filter out broken entries from API response Eugen Rochko 2017-02-05 19:39:00 +01:00
  • c5a08eb56e Add link to blocked users to getting started page Eugen Rochko 2017-02-05 19:22:05 +01:00
  • 920ba5fc4e Fix #61 - Add list of blocked users to the UI; clean up failed push notifications API Try to fix Travis CI setup Eugen Rochko 2017-02-05 19:18:11 +01:00
  • 77e13c2bc9 Removing failed push notification API, make context loads use cache Eugen Rochko 2017-02-05 17:51:44 +01:00
  • 19b9e1e2c3 Preheat status cache Eugen Rochko 2017-02-05 17:24:18 +01:00
  • 6fa4e01139 Fix showing ellipsis even when link hasn't been cut off Eugen Rochko 2017-02-05 15:29:16 +01:00
  • 87830f99e7 Fix #552 - Replace image links with image icons in status text in the UI Eugen Rochko 2017-02-05 15:25:55 +01:00
  • ff2da21d3c Fix content warning margin Eugen Rochko 2017-02-05 14:50:58 +01:00
  • b5bf807a34 Remove react-dnd as it was interfering with text selection. Move content warning mentions preview into area where actual content would be Eugen Rochko 2017-02-05 04:11:14 +01:00
  • fb6aa7ad5c Add tracking of delay to streaming API Eugen Rochko 2017-02-05 03:19:04 +01:00
  • 6cdcac1396 Fix #598 - arrow keys to navigate media; fix #481 - non-exact matches no longer overshadow requirement for remote-lookup Eugen Rochko 2017-02-05 03:01:23 +01:00
  • 44fad0160f Add next/previous navigation in modal for media attachments Eugen Rochko 2017-02-05 02:48:11 +01:00
  • 21972bb398 No replies filter on home timeline no longer hides self-replies Eugen Rochko 2017-02-05 02:02:46 +01:00
  • dbb7e5a644 Getting started on draggable columns Eugen Rochko 2017-02-05 01:58:25 +01:00
  • ce273c08cd Merge branch 'hoodiek-master' Eugen Rochko 2017-02-05 01:29:00 +01:00
  • a012e4c7ff Fix column settings not being scrollable on short screens Eugen Rochko 2017-02-05 01:27:31 +01:00
  • af007f2def Display mentions prepended to the content warning Eugen Rochko 2017-02-05 01:19:27 +01:00
  • 8bd8ea7c04 Remove unnecessary leftover code Evan Minto 2017-02-04 14:49:24 -08:00
  • e2fbf8bc74 Add an account endpoint for ActivityPub and link to it on HTML profile pages Evan Minto 2017-02-04 14:46:23 -08:00
  • d4d3a10c25 untested!! spoiler hotfix for replies hoodie 2017-02-04 17:33:46 -05:00
  • ccb8ac8573 Make the streaming API also handle websockets (because trying to get the browser EventSource interface to work flawlessly was a nightmare). WARNING: This commit makes the web UI connect to the streaming API instead of ActionCable like before. This means that if you are upgrading, you should set that up beforehand. Eugen Rochko 2017-02-04 00:34:31 +01:00
  • 8c0bc1309f Add CORS to the streaming API Eugen Rochko 2017-02-03 18:27:42 +01:00
  • ac3f5a8316 easier comprehension of toot settings and properties (#595) hoodie 2017-02-03 09:54:23 -05:00
  • 7b7a356aed fix extraneous text in 2fa readme (#592) James 2017-02-02 15:10:22 -08:00
  • 9cf7da4934 Add tootyfruity Eugen 2017-02-02 20:27:53 +01:00
  • 9faf4c9dea Update Sponsors.md Eugen 2017-02-02 20:14:02 +01:00
  • 1511efc8d2 Update Sponsors.md Eugen 2017-02-02 19:43:21 +01:00
  • d33dfce34f Updated list of top sponsors Eugen 2017-02-02 19:40:15 +01:00
  • df507f5e6e Fix streaming API queries Eugen Rochko 2017-02-02 17:10:59 +01:00
  • 889b814385 Fix bug Eugen Rochko 2017-02-02 16:57:09 +01:00
  • aa2fa227e9 Adding documentation for streaming API. Fixing filtering bug Eugen Rochko 2017-02-02 16:35:06 +01:00
  • 61ce15d94b Make node read the right .env file Eugen Rochko 2017-02-02 16:11:36 +01:00
  • d1a01dbbdd Add redis configuration to streaming API Eugen Rochko 2017-02-02 15:29:41 +01:00
  • b6c922f169 Fix potential resource leaks in streaming server Eugen Rochko 2017-02-02 15:20:31 +01:00
  • 1ee4a17f37 Add logging and filtering to the node.js streaming API Eugen Rochko 2017-02-02 13:56:14 +01:00
  • 0cfd3188b4 Add streaming API in Node.js Eugen Rochko 2017-02-02 01:31:09 +01:00
  • 17ae7d132c Prevent potential issue with public/hashtag statuses arriving after they have been loaded and favourited/reblogged from another source Eugen Rochko 2017-02-02 00:45:57 +01:00
  • ede04cdb24 Move rendering of JSON payloads for public/hashtag timelines to FanOutOnWriteService. The only recipient-specific part on them is reblogged/favourited. But since only newly created statuses appear on them, it is safe to assume that both attributes would be false Eugen Rochko 2017-02-02 00:39:17 +01:00
  • d9ca46b464 Cleaning up format of broadcast real-time messages, removing redis-backed "mentions" timeline as redundant (given notifications) Eugen Rochko 2017-02-02 00:03:31 +01:00
  • 1da0ce5c7c Looks like log level :debug is required for activerecord times to be tracked Eugen Rochko 2017-02-01 12:13:16 +01:00
  • 65402d9c09 Fix activerecord logging in production Eugen Rochko 2017-02-01 11:34:50 +01:00
  • bf60f2898d Fix #529 - Make hashtag timelines show conversations, fix hashtag loading in the UI Eugen Rochko 2017-01-31 22:34:33 +01:00
  • 8ef79d8dc9 Revert to animating avatars by default Eugen Rochko 2017-01-31 19:16:35 +01:00
  • 8b9c537d5a Fix elephant friend Eugen Rochko 2017-01-31 19:08:24 +01:00
  • 52d68be157 Fix CORS issue on avatars resampling Eugen Rochko 2017-01-31 19:05:26 +01:00
  • b84d1533d4 Fix text overlapping image in Edge and on mobile (#582) tom 2017-01-31 13:06:03 -05:00
  • c2fbd144cf Add "open in web" link to detailed public status pages Eugen Rochko 2017-01-30 23:01:37 +01:00
  • 86b3cb5120 Fix not reloading account/fetching relationship on newly independent components Eugen Rochko 2017-01-30 22:35:36 +01:00
  • f21e7d6ac0 Make profile header scroll along with contents. AccountTimeline, Followers and Following are no longer nested inside a common parent (<Account>), instead they all embed <HeaderContainer /> Eugen Rochko 2017-01-30 21:40:55 +01:00
  • a2a85e8549 Add capistrano to development environment Eugen Rochko 2017-01-30 20:03:17 +01:00
  • 404d2050d3 Add explicit "load more" link to the bottom of StatusList and notifications Eugen Rochko 2017-01-30 18:04:15 +01:00
  • 02cd2e42b2 Improve avatar resampling of non-animated canvas Eugen Rochko 2017-01-30 15:43:48 +01:00
  • 57159804b8 Merge branch 'PurpleBooth-add-missing-back-on-follow' Eugen Rochko 2017-01-30 15:22:31 +01:00
  • 9bde804ba2 Resolve confusion between ColumnBackButton and the slim version that the public timeline has been using Eugen Rochko 2017-01-30 15:22:04 +01:00
  • b1571b1e1d
         Add missing back button to "Follow Requests" Billie Thompson 2017-01-28 23:49:42 +00:00
  • b12bdd2aea Add 2-FA instructions for non-technical users (#580) James 2017-01-29 10:26:27 -08:00
  • 2165a0ec63 Update some API docs Eugen 2017-01-29 14:40:57 +01:00
  • a30e669df2 Fix avatar scaling on high-DPI displays (#573) Misty De Meo 2017-01-29 05:26:50 -08:00
  • ff90a5ff84 Update sample .env Eugen Rochko 2017-01-29 13:06:58 +01:00
  • aa52d5fd1e Add more links to main docs page Eugen Rochko 2017-01-29 12:59:02 +01:00
  • ca8a9d5941 Fix JSON formatting in docs Eugen Rochko 2017-01-29 12:55:12 +01:00
  • fe9306f346 Update docs with information about push notifications Eugen Rochko 2017-01-29 12:53:50 +01:00
  • e70e721a0d Add tests for new API Eugen Rochko 2017-01-29 12:35:55 +01:00
  • 83ccdeb87a Fix tests Eugen Rochko 2017-01-29 12:25:10 +01:00
  • 3f075c7794 API for apps to register for push notifications Eugen Rochko 2017-01-29 01:30:32 +01:00
  • 1992575d57 Fix #569 - seeds.rb Eugen Rochko 2017-01-29 00:12:27 +01:00
  • 9b2c728251 Fix settings design on mobile Eugen Rochko 2017-01-28 21:57:03 +01:00
  • 23b997ae55 Split 2FA login into two prompts Eugen Rochko 2017-01-28 20:43:38 +01:00
  • 36c57ef8af Add pixel background to modal images Eugen Rochko 2017-01-28 04:04:09 +01:00
  • f4bc9620a9 Update settings to re-use admin layout, one big navigation tree, improve settings forms Eugen Rochko 2017-01-28 03:56:10 +01:00
  • 04bce0cdf2 Clean up Eugen Rochko 2017-01-27 20:38:35 +01:00
  • 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 +01:00
  • ba192f12e3 Added optional two-factor authentication Eugen Rochko 2017-01-27 20:28:46 +01:00
  • 237cb41ab4 Less ambiguous sensitive content toggle label (#556) Zachary Spector 2017-01-27 13:31:14 -05:00
  • 2a6773d59b Merge pull request #557 from hoodiek/master Eugen 2017-01-27 18:41:05 +01:00
  • 6c37285580 fix button outline showing on clicks for prettiness hoodie 2017-01-27 12:39:36 -05:00
  • dc3e0529ca Update broken links, add new sponsor Eugen Rochko 2017-01-27 17:01:21 +01:00
  • 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 +01:00
  • 9f57c7d4a6 Updated translation doc to get working links nicolas 2017-01-27 13:17:33 +01:00
  • f8bd44a747 Fix font weight Eugen Rochko 2017-01-26 23:34:40 +01:00
  • 87667e371c Merge pull request #549 from ineffyble/docs/add-default-account-to-dev-documentation Eugen 2017-01-26 23:03:41 +01:00
  • f7aef16668 Merge pull request #548 from PurpleBooth/make-fonts-local Eugen 2017-01-26 23:02:48 +01:00
  • 55fa8e61e2
         Move the fonts from Google Fonts to local assets Billie Thompson 2017-01-26 14:06:40 +00:00
  • 6ba302b725 Merge pull request #550 from wchristian/oauth_docs2 Eugen 2017-01-26 20:41:53 +01:00
  • f6a5977f0b Fix key names in statsd Eugen Rochko 2017-01-26 19:46:52 +01:00
  • d567f21d4f Improve StatsD instrumentation Eugen Rochko 2017-01-26 19:08:05 +01:00
  • 7329fbd8a4 Fix up timeout, improve contrast on "show more", add responsive style for extremely wide monitors Eugen Rochko 2017-01-26 18:48:56 +01:00
  • 12eddb5cbe document that /oauth/token does not always return json Christian Walde 2017-01-26 16:27:16 +01:00
  • ae2147d40f Add default account details to developer documentation. Effy Elden 2017-01-27 02:03:13 +11:00
  • 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 +01:00
  • 2f18c77e44 Merge pull request #526 from wchristian/oauth_docs Eugen 2017-01-26 12:23:47 +01:00
  • 446d6f1643 Merge pull request #543 from ineffyble/tweak/seed-default-admin-account-on-dev-environments Eugen 2017-01-26 12:22:32 +01:00
  • c3a3ce8172 Merge pull request #541 from TrevInc/master Eugen 2017-01-26 11:07:42 +01:00
  • 589837cfc7 Removed line break before spoiler link, changed color of bg for spoiler link Anthony Bellew 2017-01-26 03:07:02 -07:00
  • ebe5095665 Add Padding to inline styles for spoiler Anthony Bellew 2017-01-26 03:03:26 -07:00
  • 8f18c8f9ad Added inline spoiler button styles Anthony Bellew 2017-01-26 03:02:42 -07:00
  • d53294b933 Merge pull request #542 from ineffyble/tweak/redirect-admin-path-to-admin-settings Eugen 2017-01-26 10:44:20 +01:00
  • 95b0bf9815 Merge pull request #544 from ineffyble/tweak/add-default-local-domain-for-vagrant-environments Eugen 2017-01-26 10:43:54 +01:00
  • 94eccbc5de Add a default LOCAL_DOMAIN=mastodon.dev to .env.vagrant Effy Elden 2017-01-26 19:22:59 +11:00
  • 198ea2522e Seed a default, confirmed, admin account on development environments Effy Elden 2017-01-26 19:22:00 +11:00
  • 07b9a10d4d Add redirect for /admin => /admin/settings Effy Elden 2017-01-26 18:59:35 +11:00
  • d944946c52 Moved brackets outside of localized strings at Gargron's suggestion Anthony Bellew 2017-01-26 00:24:52 -07:00
  • baa52984e9 Add brackets to visually distinguish show more / show less text Anthony Bellew 2017-01-25 20:56:33 -07:00
  • 3d890c4073 Merge pull request #3 from tootsuite/master Anthony Bellew 2017-01-25 20:53:57 -07:00
  • 905c829179 Improve infinite scroll on notifications Eugen Rochko 2017-01-26 04:30:40 +01:00
  • 57f7cf8349 Follow request authorizations faster Eugen Rochko 2017-01-26 03:56:26 +01:00
  • eb62778bec Fix #537 - opengraph description should display spoiler text when present Eugen Rochko 2017-01-26 03:45:14 +01:00
  • 1c507ff172 Fix #538 - Darken buttons to increase contrast Eugen Rochko 2017-01-26 03:32:00 +01:00
  • 3a310e8f63 Fix CSS mistake Eugen Rochko 2017-01-26 03:17:48 +01:00
  • 97d9517b6b Merge pull request #534 from yiskah/patch-2 Eugen 2017-01-26 02:51:27 +01:00
  • 0a391a2872 Merge pull request #536 from blackle/leftclick Eugen 2017-01-26 02:50:55 +01:00
  • 6bba337080 Only open status on left mouse press blackle 2017-01-25 20:43:41 -05:00
  • 33e09cc76b Increase color contrast on getting started text shel 2017-01-25 20:19:37 -05:00
  • 3b6af5245b clarify the intended use of the oauth api call as per this issue: Christian Walde 2017-01-25 18:31:15 +01:00
  • 97da56d02b Fix loading of avatars before drawing them to canvas Eugen Rochko 2017-01-25 17:23:17 +01:00
  • 00fa850bdc Fix #187, address #441 - <Avatar> component now plays gifs only while hovered Eugen Rochko 2017-01-25 17:07:57 +01:00
  • 3beb24ad55 Use <summary> to encode content warnings instead Eugen Rochko 2017-01-25 16:53:30 +01:00
  • 0430f7c0fa Fix spoiler_text not having "not null" constraint Eugen Rochko 2017-01-25 15:24:19 +01:00
  • 51a7047367 Fix order of migrations Eugen Rochko 2017-01-25 15:01:00 +01:00
  • ca04002c93 Add content warning example to docs Eugen Rochko 2017-01-25 02:54:28 +01:00
  • ab94ad3504 Add description of Mastodon's current protocol extensions Eugen Rochko 2017-01-25 02:46:16 +01:00
  • 41f5459af5 Merge pull request #524 from blackle/master Eugen 2017-01-25 02:16:36 +01:00
  • ca13ec04a8 fix up spoilers blackle 2017-01-24 20:14:20 -05:00
  • 10ffd455a8 Fix #522 - prevent blocked users from reblogging Eugen Rochko 2017-01-25 01:48:46 +01:00
  • ca28d9c2ae Merge branch 'blackle-master' Eugen Rochko 2017-01-25 01:29:40 +01:00
  • 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 +01:00
  • f8da0dd490 Merge branch 'master' into master Eugen 2017-01-24 21:56:06 +01:00
  • 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 +01:00
  • 326c75b35b Merge pull request #521 from mistydemeo/fix_invisible_css Eugen 2017-01-24 21:26:18 +01:00
  • adda642c63 Fix invisible CSS class Misty De Meo 2017-01-24 11:07:46 -08:00
  • e47b8e778b Fix links in toots opening the toot at first Eugen Rochko 2017-01-24 18:51:09 +01:00
  • 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 +01:00
  • b06a375ee4 Merge branch 'blackle-boostspin' Eugen Rochko 2017-01-24 14:28:54 +01:00
  • 4f3264d291 Merge branch 'master' into boostspin Eugen 2017-01-24 14:27:13 +01:00
  • 4a146a0d18 Make boost animation an SVG that uses SCSS colours blackle 2017-01-23 21:02:13 -05:00
  • 21c209636d Set isLoading false on timelines when request fails Eugen Rochko 2017-01-24 13:04:12 +01:00
  • 1f5792c834 API now respects ?limit param as long as it's within 2x default limit Eugen Rochko 2017-01-24 04:22:10 +01:00
  • d9022884c6 Smarter infinite scroll Eugen Rochko 2017-01-24 04:12:10 +01:00
  • bf0f6eb62d Implement a click-to-view spoiler system blackle 2017-01-12 23:54:26 -05:00
  • 1761d3f9c3 Fix mistake Eugen Rochko 2017-01-23 22:18:08 +01:00
  • d00189b55a Domains with reject_media? set to true won't download avatars either Eugen Rochko 2017-01-23 21:55:29 +01:00
  • 8aab692034 Less re-rendering Eugen Rochko 2017-01-23 21:40:48 +01:00
  • 434cf8237e Optional domain block attribute that prevents media attachments from being downloaded Eugen Rochko 2017-01-23 21:36:08 +01:00
  • 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 +01:00
  • 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 +01:00
  • f2e08ff568 Remove unneeded block check Eugen Rochko 2017-01-23 17:40:23 +01:00
  • 6d98a73180 Domain blocks now have varying severity - auto-suspend vs auto-silence Eugen Rochko 2017-01-23 17:38:38 +01:00
  • ef2b924679 Forgot to commit Eugen Rochko 2017-01-23 17:18:41 +01:00
  • f855d645b2 Move all hex colors in SASS to variables and all variations to darken/lighten Eugen Rochko 2017-01-23 16:01:46 +01:00
  • 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 +01:00
  • aa9c51a34c Fix a couple unhandled exceptions Eugen Rochko 2017-01-23 13:56:57 +01:00
  • a1894786cf Potentially fix notifications issue Eugen Rochko 2017-01-23 13:43:14 +01:00
  • 7c015ece45 Fix oembed controller test Eugen Rochko 2017-01-23 13:36:17 +01:00
  • 6062680dd4 Merge pull request #513 from mistydemeo/fix_textarea_selection_clicking Eugen 2017-01-23 11:34:36 +01:00
  • 33fd8a7d95 Textarea: fix clicking on name suggestions Misty De Meo 2017-01-22 22:57:58 -08:00
  • 1953e3b6ed Fix inflection Eugen 2017-01-22 23:08:51 +01:00
  • 956da43e19 Fix error Eugen 2017-01-22 23:07:31 +01:00
  • cea9fb31fe Mitigate inconsistent notifications Eugen 2017-01-22 21:50:17 +01:00
  • 61aee0006e Override Rack::Request to use the same trusted proxy settings as Rails Eugen Rochko 2017-01-22 21:01:28 +01:00
  • 67befe5463 Allow to specify trusted proxies through env Eugen Rochko 2017-01-22 20:35:49 +01:00
  • c66718afff Merge pull request #509 from ineffyble/docs/developer-docs-additions Eugen 2017-01-22 17:07:39 +01:00
  • f3cac0b93b Update README.md to match new documentation (missed from previous commit) Effy Elden 2017-01-23 00:11:09 +11:00
  • 10fe63d4db Merge pull request #508 from ineffyble/docs/developer-docs-additions Eugen 2017-01-22 11:43:07 +01:00
  • 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 +11:00
  • 536cde4e99 Rename main docs page so it renders in github Eugen Rochko 2017-01-21 22:54:49 +01:00
  • 2baf0fabb4 Improve API docs formatting Eugen Rochko 2017-01-21 22:53:02 +01:00
  • e92a1cf436 Add wiki contents to docs/ instead Eugen Rochko 2017-01-21 22:49:08 +01:00
  • 500278eb4c Merge branch 'ineffyble-fix/error-pages' Eugen Rochko 2017-01-21 22:31:19 +01:00
  • 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 +01:00
  • b4a4eb73ae Merge branch 'fix/error-pages' of https://github.com/ineffyble/mastodon into ineffyble-fix/error-pages Eugen Rochko 2017-01-21 22:20:01 +01:00
  • f036c6440b Merge branch 'ineffyble-master' Eugen Rochko 2017-01-21 22:19:27 +01:00
  • e028406db4 Fix code style Eugen Rochko 2017-01-21 22:19:13 +01:00
  • d72dd38c13 Merge branch 'master' of https://github.com/ineffyble/mastodon into ineffyble-master Eugen Rochko 2017-01-21 22:15:22 +01:00
  • 3a4b5961be Method to fetch a single notification Eugen Rochko 2017-01-21 22:14:13 +01:00
  • deedf133d3 Merge pull request #506 from ineffyble/fix/issue-492-add-missing-header-image Eugen 2017-01-21 20:56:11 +01:00
  • 77746240aa Change missing.png header to 1x1 transparent PNG Effy Elden 2017-01-22 06:42:42 +11:00
  • 106dd1a484 Add a default missing.png header image - fixes #492 Effy Elden 2017-01-22 05:19:31 +11:00
  • 6b666db112 Merge pull request #505 from ineffyble/fix/issue-503 Eugen 2017-01-21 12:37:51 +01:00
  • 8f21f5522f Call uniq on the string version of mb_chars tags Effy Elden 2017-01-21 21:02:42 +11:00