Commit Graph

  • 32d756fb22 Hide 'Do not display on public timeline' for reply toots. Fixes #412. Effy Elden 2017-01-15 06:10:23 +11:00
  • f63f0c4625 Fix too late return Eugen 2017-01-14 02:22:16 +01:00
  • 7cde08e30b Improve extended about page layout Eugen Rochko 2017-01-13 20:27:02 +01:00
  • c01dd089ff Adding about/more page with extended information that can be set up by an admin Eugen Rochko 2017-01-13 20:14:21 +01:00
  • e25170f960 Add extended about page stub Eugen Rochko 2017-01-13 03:24:41 +01:00
  • 2939e9898b Extend rails-settings-cached to merge db-saved hash values with defaults Eugen Rochko 2017-01-13 02:42:22 +01:00
  • ca50ceeaf0 Add settings for contact information Eugen Rochko 2017-01-12 20:54:14 +01:00
  • b11fdc3ae3 Migrate from ledermann/rails-settings to rails-settings-cached which allows global settings with YAML-defined defaults. Add admin page for editing global settings. Add "site_description" setting that would show as a paragraph on the frontpage Eugen Rochko 2017-01-12 20:46:24 +01:00
  • babc6a1528 Merge pull request #461 from vjackson725/master Eugen 2017-01-12 13:50:17 +01:00
  • 91dc21c469 fix Vagrantfile so that the correct ruby is installed vjackson725 2017-01-12 23:20:55 +11:00
  • 8f54a8851a Add rake task for clearing out media from silenced accounts Eugen Rochko 2017-01-12 04:19:04 +01:00
  • 4a2ee43e80 Fix #457 - escape JSON in INITIAL_STATE (this bug only ever allowed a user to xss themselves rather than anyone else) Eugen Rochko 2017-01-12 03:54:50 +01:00
  • 7951e7ffd5 Add ruby version to Gemfile, move devDependencies in package.json to dependencies, fix bug in process feed service Eugen Rochko 2017-01-11 15:39:31 +01:00
  • 10739df458 Merge pull request #456 from ineffyble/fix-repo-url Eugen 2017-01-11 14:19:19 +01:00
  • 3ad0496ccb Better animations Eugen Rochko 2017-01-11 04:21:49 +01:00
  • f876a8681d Update the Mastodon repository URL from Gargron/ to tootsuite/ in various places Effy Elden 2017-01-11 13:24:14 +11:00
  • 4292cf60ae Fix env variable name Eugen 2017-01-10 22:01:13 +01:00
  • 18b11100e7 Fix issue when settings are not defined for column type Eugen Rochko 2017-01-10 17:33:32 +01:00
  • 312c51b5c8 Home column filters Eugen Rochko 2017-01-10 17:25:10 +01:00
  • 1e9d2c4b1e Add "not found" component to UI Eugen Rochko 2017-01-10 13:50:40 +01:00
  • a1db2a191b Add link to list of apps Eugen 2017-01-10 12:23:30 +01:00
  • 67a31454ad Merge pull request #450 from blackle/master Eugen 2017-01-10 12:21:06 +01:00
  • 917cf0bf5d simplify emojification on public pages with .emojify class blackle 2017-01-09 22:40:45 -05:00
  • 205ba00017 Fix sandboxed iOS login again Eugen Rochko 2017-01-09 19:43:53 +01:00
  • 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 #437 Eugen Rochko 2017-01-08 19:12:54 +01:00
  • 38bc85e695 Merge pull request #443 from blackle/master Eugen 2017-01-08 13:36:02 +01:00
  • a8e30060ae Merge pull request #446 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 #437 from krainboltgreene/patch-1 Eugen 2017-01-08 04:14:54 +01:00
  • e8d6f6c8c1 Merge pull request #436 from krainboltgreene/patch-2 Eugen 2017-01-08 04:00:22 +01:00
  • db8a088502 Update badges Eugen 2017-01-08 03:47:33 +01: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 #434 from vjackson725/fix_vagrantfile Eugen 2017-01-08 02:58:43 +01:00
  • 4447c4c7c8 Merge pull request #435 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 #432 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 #430 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 #429 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 #428 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 #425 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 #147 - 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
  • 92bd5f62f6 Merge pull request #417 from ineffyble/twitter-card-metadata Eugen 2017-01-06 01:16:45 +01:00
  • 6917099a6a Merge pull request #418 from ticky/upgrade-emojione Eugen 2017-01-06 01:13:34 +01:00
  • 7b9f8766e8 Fix #416 - 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 #415 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 #406 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 #403 from ticky/use-system-fonts Eugen 2017-01-05 13:37:48 +01:00
  • c3c9879b5e Merge pull request #404 from mistydemeo/emoji Eugen 2017-01-05 13:37:29 +01:00
  • df89cb5488 Merge pull request #399 from ticky/public-timeline-de-hoist Eugen 2017-01-05 13:36:55 +01:00
  • 92638308ee Merge pull request #400 from ticky/differentiate-settings-links Eugen 2017-01-05 13:36:13 +01:00
  • 26ec24fa1d Merge pull request #401 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 #394 from ticky/email-reblog-to-boost Eugen 2017-01-05 03:35:22 +01:00
  • 3b604d2786 Merge pull request #395 from ticky/hide-media-list-if-no-media Eugen 2017-01-05 03:34:49 +01:00
  • 879aa9ad26 Merge pull request #397 from ticky/friendlier-unknown-errors Eugen 2017-01-05 03:34:06 +01:00
  • 52850c51db Merge pull request #396 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