Commit graph

  • 5d558c14b4 Merge branch 'blackle-master' Eugen Rochko 2017-01-09 14:13:46 +01:00
  • def1f8c5b3 Merge branch 'master' of https://github.com/blackle/mastodon into blackle-master Eugen Rochko 2017-01-09 14:12:40 +01:00
  • d6a456dc71 Merge branch 'blackle-dropdown' Eugen Rochko 2017-01-09 14:12:00 +01:00
  • 3bddd647e0 Merge branch 'dropdown' of https://github.com/blackle/mastodon into blackle-dropdown Eugen Rochko 2017-01-09 14:10:32 +01:00
  • 75f80bef10 Persist UI settings, add missing localizations for German Eugen Rochko 2017-01-09 14:00:55 +01:00
  • 23ebf60b95 Improve initialState loading Eugen Rochko 2017-01-09 12:37:15 +01:00
  • 131bae89fd Generate key for each input so we can upload the same file even after deleting blackle 2017-01-08 21:00:13 -05:00
  • d64c454cfe Switch to compose view when tapping 'mention' in dropdown on mobile blackle 2017-01-08 05:04:01 -05:00
  • 2e71bb031b Fix Paperclip timeout setting. Fix bug introduced in Eugen Rochko 2017-01-08 19:12:54 +01:00
  • 38bc85e695 Merge pull request from blackle/master Eugen 2017-01-08 13:36:02 +01:00
  • a8e30060ae Merge pull request from blackle/dropdown2 Eugen 2017-01-08 13:34:27 +01:00
  • 05e964688d Expand dropdown leftways on status view blackle 2017-01-08 06:32:37 -05:00
  • b4f09bae1d Add call-to developers on getting started page blackle 2017-01-08 00:23:22 -05:00
  • 69643338f6 Merge pull request from krainboltgreene/patch-1 Eugen 2017-01-08 04:14:54 +01:00
  • e8d6f6c8c1 Merge pull request from krainboltgreene/patch-2 Eugen 2017-01-08 04:00:22 +01:00
  • c74f6f2c0d Woops, missed the outer bit Kurtis Rainbolt-Greene 2017-01-07 18:55:24 -08:00
  • db8a088502 Update badges Eugen 2017-01-08 03:47:33 +01:00
  • 37b6a925b4 Switching to ActiveRecord features Kurtis Rainbolt-Greene 2017-01-07 18:19:34 -08:00
  • f02ffc1dbd Now we can use the new name in queries Kurtis Rainbolt-Greene 2017-01-07 18:11:07 -08:00
  • abe3ae1cc2 Simplifying followers mappings Kurtis Rainbolt-Greene 2017-01-07 18:09:00 -08:00
  • 4a7e3e5082 Less complicated determination Kurtis Rainbolt-Greene 2017-01-07 17:59:51 -08:00
  • 6d097d559b Merge pull request from vjackson725/fix_vagrantfile Eugen 2017-01-08 02:58:43 +01:00
  • 4447c4c7c8 Merge pull request from krainboltgreene/patch-1 Eugen 2017-01-08 02:58:19 +01:00
  • e5d9009d71 Using "rails style" order arguments Kurtis Rainbolt-Greene 2017-01-07 17:55:40 -08:00
  • db3d5d811c Fix Vagrantfile to include yarn vjackson725 2017-01-08 12:38:04 +11:00
  • 7a0a13ab53 Merge pull request from blackle/volume-icon Eugen 2017-01-08 02:36:12 +01:00
  • 8a571158c9 Show correct volume icons on video player blackle 2017-01-07 20:21:50 -05:00
  • cec7e69827 Merge pull request from blackle/logout_mobile Eugen 2017-01-08 01:24:06 +01:00
  • e1ca354956 Show logout button on getting started so it's available on mobile blackle 2017-01-07 18:41:57 -05:00
  • 679aa35e15 Merge pull request from blackle/emojify_usernames Eugen 2017-01-08 00:19:24 +01:00
  • 57ff221c0f Emojify display names in notifcations blackle 2017-01-07 18:16:14 -05:00
  • 165df323ae Merge pull request from blackle/contrast Eugen 2017-01-07 22:51:15 +01:00
  • 61211b509c Improve contrast of bio and username text in account info blackle 2017-01-07 16:39:30 -05:00
  • 2fbb38e4b2 Merge pull request from ineffyble/vagrant Eugen 2017-01-07 18:31:59 +01:00
  • be6ae3546f Replace getting started icon on desktop nav bar with asterisk instead of hamburger Eugen Rochko 2017-01-07 15:46:39 +01:00
  • 5c7add2176 Fix - Unreblogging will leave original status in feeds Eugen Rochko 2017-01-07 15:44:22 +01:00
  • 7ddec6e7c3 Add read timeout to paperclip when it's downloading remote images Eugen Rochko 2017-01-07 15:43:56 +01:00
  • 11ea7336e9 Tweak Vagrant info in README Effy Elden 2017-01-08 01:30:48 +11:00
  • 46fb634c79 Improve Vagrantfile, load environment variables from .env.vagrant, always forward localhost:3000 Effy Elden 2017-01-08 01:28:49 +11:00
  • f1289ca3c0 Add Vagrant development environment support Effy Elden 2017-01-07 23:22:24 +11:00
  • 989c3f4002 Add tab bar alternative to desktop UI, upgrade react & react-redux Eugen Rochko 2017-01-06 22:09:55 +01:00
  • 1bfbce7b45 Clean up h-card mess of divs Eugen Rochko 2017-01-06 20:24:51 +01:00
  • 72c3a41bef Fix h-card classes and remote follow button appearing when it shouldn't Eugen Rochko 2017-01-06 20:15:24 +01:00
  • 8b28b82141 Merge branch 'myfreeweb-master' Eugen Rochko 2017-01-06 20:09:34 +01:00
  • 18deeb9db5 Add Microformats2 markup Greg V 2017-01-06 18:08:40 +03:00
  • bf9d3fafbd Merge 295fc0e612 into 92bd5f62f6 June Rhodes 2017-01-06 13:48:57 +00:00
  • 92bd5f62f6 Merge pull request from ineffyble/twitter-card-metadata Eugen 2017-01-06 01:16:45 +01:00
  • 6917099a6a Merge pull request from ticky/upgrade-emojione Eugen 2017-01-06 01:13:34 +01:00
  • 7b9f8766e8 Fix - Generate random unique 14-byte (19 characters) shortcodes for local attachments, use them in URLs. Check status privacy before redirecting to actual file. Eugen Rochko 2017-01-06 00:21:12 +01:00
  • 28a2f79dff
    Upgrade EmojiOne to 2.2.7 Jessica Stokes 2017-01-05 15:16:13 -08:00
  • 819bfb75c6 Add twitter:card metatag to enable Twitter Cards support Effy Elden 2017-01-06 09:47:40 +11:00
  • 9f21eb6064 Merge pull request from ineffyble/master Eugen 2017-01-05 23:15:01 +01:00
  • 10a9ebae3b Add tag property to desktop notifications, preventing duplicates (i.e. when multiple Mastodon tabs are open) Effy Elden 2017-01-06 08:26:45 +11:00
  • 00b9ba64c9 Fixed unexpected error Eugen Rochko 2017-01-05 14:23:59 +01:00
  • a1de2e332d Fix compose form bug Eugen Rochko 2017-01-05 14:18:38 +01:00
  • ca7dce4a5a Fix selection resetting in compose form after unrelated data updates Eugen Rochko 2017-01-05 14:06:09 +01:00
  • 10e6288444 Revert to Roboto for all Eugen Rochko 2017-01-05 13:59:58 +01:00
  • 3354dc117b Merge pull request from Gargron/revert-404-emoji Eugen 2017-01-05 13:45:37 +01:00
  • 9e6ceb3201 Revert "Display native emoji on browsers which support it" Eugen 2017-01-05 13:45:21 +01:00
  • 87f76d4095 Merge pull request from ticky/use-system-fonts Eugen 2017-01-05 13:37:48 +01:00
  • c3c9879b5e Merge pull request from mistydemeo/emoji Eugen 2017-01-05 13:37:29 +01:00
  • df89cb5488 Merge pull request from ticky/public-timeline-de-hoist Eugen 2017-01-05 13:36:55 +01:00
  • 92638308ee Merge pull request from ticky/differentiate-settings-links Eugen 2017-01-05 13:36:13 +01:00
  • 26ec24fa1d Merge pull request from mistydemeo/new_toot_cursor_position Eugen 2017-01-05 13:35:14 +01:00
  • 53b765f4b1 Bump emoji requirement to Unicode 9 Misty De Meo 2017-01-04 22:47:51 -08:00
  • c318e6e42e Display native emoji on browsers which support it Misty De Meo 2017-01-04 22:23:02 -08:00
  • 1f3c895ffb
    Use system fonts on more platforms Jessica Stokes 2017-01-04 20:24:27 -08:00
  • c100b83b98 Automatically position cursor when writing a reply toot Misty De Meo 2017-01-04 20:04:14 -08:00
  • 7ac55d2674
    Differentiate settings links Jessica Stokes 2017-01-04 19:47:02 -08:00
  • 05cc5636d8
    Remove hamburger from "getting started" Jessica Stokes 2017-01-04 19:30:39 -08:00
  • 9c493b1ea2
    Replace "Public" in tab bar with "More" hamburger Jessica Stokes 2017-01-04 19:30:22 -08:00
  • 0c600e9db6
    Move "getting started" to its own route Jessica Stokes 2017-01-04 19:30:02 -08:00
  • 9bb1b97d2a Merge pull request from ticky/email-reblog-to-boost Eugen 2017-01-05 03:35:22 +01:00
  • 3b604d2786 Merge pull request from ticky/hide-media-list-if-no-media Eugen 2017-01-05 03:34:49 +01:00
  • 879aa9ad26 Merge pull request from ticky/friendlier-unknown-errors Eugen 2017-01-05 03:34:06 +01:00
  • 52850c51db Merge pull request from ticky/fix-cmd-enter Eugen 2017-01-05 03:34:01 +01:00
  • cc46c6b493
    Friendlier unknown errors Jessica Stokes 2017-01-04 18:31:45 -08:00
  • 1da73ecade
    Fix Command-enter tooting Jessica Stokes 2017-01-04 18:29:43 -08:00
  • 6c28886317 Improve background jobs params and error handling Eugen Rochko 2017-01-05 03:28:21 +01:00
  • 251b04298e Fix undesired delivering of private toot to remote accounts that follow author Eugen Rochko 2017-01-05 03:17:23 +01:00
  • 98729d50c8 Make shortcode emojis work, make getting started area scrollable Eugen Rochko 2017-01-05 03:14:33 +01:00
  • cbcb7e1241
    Don't render the media list when there's no media Jessica Stokes 2017-01-04 18:10:45 -08:00
  • bb033c1d37
    "Reblog" -> "boost" in more places Jessica Stokes 2017-01-04 18:00:50 -08:00
  • db21724a5a Merge pull request from ticky/qol-for-four-inch-phones Eugen 2017-01-05 02:57:13 +01:00
  • aaee8c9b5d
    Disallow compose navbar from being shrunk Jessica Stokes 2017-01-04 17:44:41 -08:00
  • 312736cd1b
    Stop Mastodon friend from overlapping text 🐘 Jessica Stokes 2017-01-04 17:33:05 -08:00
  • 5b75f6d0f3
    Make tabs bar take up less room on 4-inch phones Jessica Stokes 2017-01-04 17:32:11 -08:00
  • 3807b0b171
    Improve quality of life for 4-inch phones Jessica Stokes 2017-01-04 17:25:48 -08:00
  • 98b83aca37 Fix - relative timestamps now contain an exact datetime in title Eugen Rochko 2017-01-04 15:43:28 +01:00
  • 2b0b7ff1b8 Fix - /web now loads a page Eugen Rochko 2017-01-04 15:35:36 +01:00
  • 1bbcd71cd4 Fix - fix redirect after sign-up (to login page instead of homepage) Eugen Rochko 2017-01-04 15:31:25 +01:00
  • da58596828 Merge 4942eeed08 into 18f59df09e Andrea Faulds 2017-01-03 19:09:08 +00:00
  • 18f59df09e Merge pull request from TrevInc/master Eugen 2017-01-03 19:58:34 +01:00
  • febe2449bb Merge pull request from TrevInc/bio-media-query Anthony Bellew 2017-01-03 11:55:59 -07:00
  • 1fcb807d91 Reduce height of media query to hide avatar/bio Anthony Bellew 2017-01-03 11:55:36 -07:00
  • de154dbd5d Merge pull request from Gargron/master Anthony Bellew 2017-01-03 11:51:35 -07:00
  • e6657d7342 Merge pull request from mitchhentges/file-drop-ui Eugen 2017-01-03 12:59:21 +01:00
  • 4d300e2507 On file-drag, show a border around textarea Mitchell Hentges 2017-01-03 00:36:48 -08:00
  • 3125dd8920 Add "back" button on column headers of public and hashtag timelines. The "back" button takes you back to getting started page Eugen Rochko 2017-01-03 01:15:42 +01:00
  • 86be6d48c9 Fix accidental distribution of hidden stream entries to PuSH subscribers Eugen Rochko 2017-01-03 00:44:23 +01:00