Commit Graph

  • ee6b885468 Merge branch 'blackle-master' Eugen Rochko 2017-01-09 14:13:46 +0100
  • 5d558c14b4 Merge branch 'blackle-master' Eugen Rochko 2017-01-09 14:13:46 +0100
  • 394f185e91 Merge branch 'master' of https://github.com/blackle/mastodon into blackle-master Eugen Rochko 2017-01-09 14:12:40 +0100
  • def1f8c5b3 Merge branch 'master' of https://github.com/blackle/mastodon into blackle-master Eugen Rochko 2017-01-09 14:12:40 +0100
  • 609748016f Merge branch 'blackle-dropdown' Eugen Rochko 2017-01-09 14:12:00 +0100
  • d6a456dc71 Merge branch 'blackle-dropdown' Eugen Rochko 2017-01-09 14:12:00 +0100
  • a1783b80b2 Merge branch 'dropdown' of https://github.com/blackle/mastodon into blackle-dropdown Eugen Rochko 2017-01-09 14:10:32 +0100
  • 3bddd647e0 Merge branch 'dropdown' of https://github.com/blackle/mastodon into blackle-dropdown Eugen Rochko 2017-01-09 14:10:32 +0100
  • 4293e132d1 Persist UI settings, add missing localizations for German Eugen Rochko 2017-01-09 14:00:55 +0100
  • 75f80bef10 Persist UI settings, add missing localizations for German Eugen Rochko 2017-01-09 14:00:55 +0100
  • c1c814e6a1 Improve initialState loading Eugen Rochko 2017-01-09 12:37:15 +0100
  • 23ebf60b95 Improve initialState loading Eugen Rochko 2017-01-09 12:37:15 +0100
  • 62167338b8 Generate key for each input so we can upload the same file even after deleting blackle 2017-01-08 21:00:13 -0500
  • 131bae89fd Generate key for each input so we can upload the same file even after deleting blackle 2017-01-08 21:00:13 -0500
  • a697b5473a Switch to compose view when tapping 'mention' in dropdown on mobile blackle 2017-01-08 05:04:01 -0500
  • d64c454cfe Switch to compose view when tapping 'mention' in dropdown on mobile blackle 2017-01-08 05:04:01 -0500
  • f29df16eea Fix Paperclip timeout setting. Fix bug introduced in #437 Eugen Rochko 2017-01-08 19:12:54 +0100
  • 2e71bb031b Fix Paperclip timeout setting. Fix bug introduced in #437 Eugen Rochko 2017-01-08 19:12:54 +0100
  • 9f3e2737e9 Merge pull request #443 from blackle/master Eugen 2017-01-08 13:36:02 +0100
  • 38bc85e695 Merge pull request #443 from blackle/master Eugen 2017-01-08 13:36:02 +0100
  • 2ee3e2f4a4 Merge pull request #446 from blackle/dropdown2 Eugen 2017-01-08 13:34:27 +0100
  • a8e30060ae Merge pull request #446 from blackle/dropdown2 Eugen 2017-01-08 13:34:27 +0100
  • 9d66dfecf6 Expand dropdown leftways on status view blackle 2017-01-08 06:32:37 -0500
  • 05e964688d Expand dropdown leftways on status view blackle 2017-01-08 06:32:37 -0500
  • 1adfe59c14 Add call-to developers on getting started page blackle 2017-01-08 00:23:22 -0500
  • b4f09bae1d Add call-to developers on getting started page blackle 2017-01-08 00:23:22 -0500
  • 72843ea705 Merge pull request #437 from krainboltgreene/patch-1 Eugen 2017-01-08 04:14:54 +0100
  • 69643338f6 Merge pull request #437 from krainboltgreene/patch-1 Eugen 2017-01-08 04:14:54 +0100
  • c65508da26 Merge pull request #436 from krainboltgreene/patch-2 Eugen 2017-01-08 04:00:22 +0100
  • e8d6f6c8c1 Merge pull request #436 from krainboltgreene/patch-2 Eugen 2017-01-08 04:00:22 +0100
  • 5bbd50e180 Update badges Eugen 2017-01-08 03:47:33 +0100
  • db8a088502 Update badges Eugen 2017-01-08 03:47:33 +0100
  • 5cecff7f2a Simplifying followers mappings Kurtis Rainbolt-Greene 2017-01-07 18:09:00 -0800
  • abe3ae1cc2 Simplifying followers mappings Kurtis Rainbolt-Greene 2017-01-07 18:09:00 -0800
  • ff835f3377 Less complicated determination Kurtis Rainbolt-Greene 2017-01-07 17:59:51 -0800
  • 4a7e3e5082 Less complicated determination Kurtis Rainbolt-Greene 2017-01-07 17:59:51 -0800
  • e715e3e009 Merge pull request #434 from vjackson725/fix_vagrantfile Eugen 2017-01-08 02:58:43 +0100
  • 6d097d559b Merge pull request #434 from vjackson725/fix_vagrantfile Eugen 2017-01-08 02:58:43 +0100
  • e7132be958 Merge pull request #435 from krainboltgreene/patch-1 Eugen 2017-01-08 02:58:19 +0100
  • 4447c4c7c8 Merge pull request #435 from krainboltgreene/patch-1 Eugen 2017-01-08 02:58:19 +0100
  • 82b0eb2ae4 Using "rails style" order arguments Kurtis Rainbolt-Greene 2017-01-07 17:55:40 -0800
  • e5d9009d71 Using "rails style" order arguments Kurtis Rainbolt-Greene 2017-01-07 17:55:40 -0800
  • 4f9cc841b2 Fix Vagrantfile to include yarn vjackson725 2017-01-08 12:38:04 +1100
  • db3d5d811c Fix Vagrantfile to include yarn vjackson725 2017-01-08 12:38:04 +1100
  • 3f639be601 Merge pull request #432 from blackle/volume-icon Eugen 2017-01-08 02:36:12 +0100
  • 7a0a13ab53 Merge pull request #432 from blackle/volume-icon Eugen 2017-01-08 02:36:12 +0100
  • 85cc2dd826 Show correct volume icons on video player blackle 2017-01-07 20:21:50 -0500
  • 8a571158c9 Show correct volume icons on video player blackle 2017-01-07 20:21:50 -0500
  • 00c9ce1eff Merge pull request #430 from blackle/logout_mobile Eugen 2017-01-08 01:24:06 +0100
  • cec7e69827 Merge pull request #430 from blackle/logout_mobile Eugen 2017-01-08 01:24:06 +0100
  • 8ceae22535 Show logout button on getting started so it's available on mobile blackle 2017-01-07 18:41:57 -0500
  • e1ca354956 Show logout button on getting started so it's available on mobile blackle 2017-01-07 18:41:57 -0500
  • 177d9cd8fe Merge pull request #429 from blackle/emojify_usernames Eugen 2017-01-08 00:19:24 +0100
  • 679aa35e15 Merge pull request #429 from blackle/emojify_usernames Eugen 2017-01-08 00:19:24 +0100
  • 75c2397ed1 Emojify display names in notifcations blackle 2017-01-07 18:16:14 -0500
  • 57ff221c0f Emojify display names in notifcations blackle 2017-01-07 18:16:14 -0500
  • 94d1457cd7 Merge pull request #428 from blackle/contrast Eugen 2017-01-07 22:51:15 +0100
  • 165df323ae Merge pull request #428 from blackle/contrast Eugen 2017-01-07 22:51:15 +0100
  • a914180df6 Improve contrast of bio and username text in account info blackle 2017-01-07 16:39:30 -0500
  • 61211b509c Improve contrast of bio and username text in account info blackle 2017-01-07 16:39:30 -0500
  • c398d2d82b Merge pull request #425 from ineffyble/vagrant Eugen 2017-01-07 18:31:59 +0100
  • 2fbb38e4b2 Merge pull request #425 from ineffyble/vagrant Eugen 2017-01-07 18:31:59 +0100
  • d019f1632c Replace getting started icon on desktop nav bar with asterisk instead of hamburger Eugen Rochko 2017-01-07 15:46:39 +0100
  • be6ae3546f Replace getting started icon on desktop nav bar with asterisk instead of hamburger Eugen Rochko 2017-01-07 15:46:39 +0100
  • 126aba0e13 Fix #147 - Unreblogging will leave original status in feeds Eugen Rochko 2017-01-07 15:44:22 +0100
  • 5c7add2176 Fix #147 - Unreblogging will leave original status in feeds Eugen Rochko 2017-01-07 15:44:22 +0100
  • 438446b397 Add read timeout to paperclip when it's downloading remote images Eugen Rochko 2017-01-07 15:43:56 +0100
  • 7ddec6e7c3 Add read timeout to paperclip when it's downloading remote images Eugen Rochko 2017-01-07 15:43:56 +0100
  • 7afe78b1d6 Tweak Vagrant info in README Effy Elden 2017-01-08 01:30:48 +1100
  • 11ea7336e9 Tweak Vagrant info in README Effy Elden 2017-01-08 01:30:48 +1100
  • 6ef79c6948 Improve Vagrantfile, load environment variables from .env.vagrant, always forward localhost:3000 Effy Elden 2017-01-08 01:28:49 +1100
  • 46fb634c79 Improve Vagrantfile, load environment variables from .env.vagrant, always forward localhost:3000 Effy Elden 2017-01-08 01:28:49 +1100
  • 2b92e4a37a Add Vagrant development environment support Effy Elden 2017-01-07 23:22:24 +1100
  • f1289ca3c0 Add Vagrant development environment support Effy Elden 2017-01-07 23:22:24 +1100
  • 0dac73b5cc Add tab bar alternative to desktop UI, upgrade react & react-redux Eugen Rochko 2017-01-06 22:09:55 +0100
  • 989c3f4002 Add tab bar alternative to desktop UI, upgrade react & react-redux Eugen Rochko 2017-01-06 22:09:55 +0100
  • 26390b1997 Clean up h-card mess of divs Eugen Rochko 2017-01-06 20:24:51 +0100
  • 1bfbce7b45 Clean up h-card mess of divs Eugen Rochko 2017-01-06 20:24:51 +0100
  • ecd7a46f98 Fix h-card classes and remote follow button appearing when it shouldn't Eugen Rochko 2017-01-06 20:15:24 +0100
  • 72c3a41bef Fix h-card classes and remote follow button appearing when it shouldn't Eugen Rochko 2017-01-06 20:15:24 +0100
  • 9b5dabfa90 Merge branch 'myfreeweb-master' Eugen Rochko 2017-01-06 20:09:34 +0100
  • 8b28b82141 Merge branch 'myfreeweb-master' Eugen Rochko 2017-01-06 20:09:34 +0100
  • 8d6361b40b Add Microformats2 markup Greg V 2017-01-06 18:08:40 +0300
  • 18deeb9db5 Add Microformats2 markup Greg V 2017-01-06 18:08:40 +0300
  • 2804ccc958 Merge pull request #417 from ineffyble/twitter-card-metadata Eugen 2017-01-06 01:16:45 +0100
  • 92bd5f62f6 Merge pull request #417 from ineffyble/twitter-card-metadata Eugen 2017-01-06 01:16:45 +0100
  • c517908c5b Merge pull request #418 from ticky/upgrade-emojione Eugen 2017-01-06 01:13:34 +0100
  • 6917099a6a Merge pull request #418 from ticky/upgrade-emojione Eugen 2017-01-06 01:13:34 +0100
  • 0df070596e 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 +0100
  • 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 +0100
  • 73ce525d4b Upgrade EmojiOne to 2.2.7 Jessica Stokes 2017-01-05 15:16:13 -0800
  • 28a2f79dff
    Upgrade EmojiOne to 2.2.7 Jessica Stokes 2017-01-05 15:16:13 -0800
  • fe31b43b75 Add twitter:card metatag to enable Twitter Cards support Effy Elden 2017-01-06 09:47:40 +1100
  • 819bfb75c6 Add twitter:card metatag to enable Twitter Cards support Effy Elden 2017-01-06 09:47:40 +1100
  • 8855b9aa8c Merge pull request #415 from ineffyble/master Eugen 2017-01-05 23:15:01 +0100
  • 9f21eb6064 Merge pull request #415 from ineffyble/master Eugen 2017-01-05 23:15:01 +0100
  • 30cc139fad Add tag property to desktop notifications, preventing duplicates (i.e. when multiple Mastodon tabs are open) Effy Elden 2017-01-06 08:26:45 +1100
  • 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 +1100
  • 6bbc2c7954 Fixed unexpected error Eugen Rochko 2017-01-05 14:23:59 +0100
  • 00b9ba64c9 Fixed unexpected error Eugen Rochko 2017-01-05 14:23:59 +0100