Commit graph

1014 commits

Author SHA1 Message Date
Kurtis Rainbolt-Greene
5cecff7f2a Simplifying followers mappings
Deduplicating some logic and switching to pluck, to avoid pulling the entire model in memory.
2017-01-07 18:09:00 -08:00
Kurtis Rainbolt-Greene
ff835f3377 Less complicated determination 2017-01-07 17:59:51 -08:00
Eugen
e715e3e009 Merge pull request #434 from vjackson725/fix_vagrantfile
Fix Vagrantfile to include yarn
2017-01-08 02:58:43 +01:00
Eugen
e7132be958 Merge pull request #435 from krainboltgreene/patch-1
Using "rails style" order arguments
2017-01-08 02:58:19 +01:00
Kurtis Rainbolt-Greene
82b0eb2ae4 Using "rails style" order arguments 2017-01-07 17:55:40 -08:00
vjackson725
4f9cc841b2 Fix Vagrantfile to include yarn
The current Vagrantfile fails to build upon provisioning, as it lacks yarn.

Change the Vagrantfile to add the yarn repository, and install yarn.
2017-01-08 12:38:04 +11:00
Eugen
3f639be601 Merge pull request #432 from blackle/volume-icon
Show correct volume icons on video player
2017-01-08 02:36:12 +01:00
blackle
85cc2dd826 Show correct volume icons on video player 2017-01-07 20:23:15 -05:00
Eugen
00c9ce1eff Merge pull request #430 from blackle/logout_mobile
Show logout button on getting started so it's available on mobile
2017-01-08 01:24:06 +01:00
blackle
8ceae22535 Show logout button on getting started so it's available on mobile 2017-01-07 18:41:57 -05:00
Eugen
177d9cd8fe Merge pull request #429 from blackle/emojify_usernames
Emojify display names in notifcations
2017-01-08 00:19:24 +01:00
blackle
75c2397ed1 Emojify display names in notifcations 2017-01-07 18:16:14 -05:00
Eugen
94d1457cd7 Merge pull request #428 from blackle/contrast
Improve contrast of bio and username text in account info
2017-01-07 22:51:15 +01:00
blackle
a914180df6 Improve contrast of bio and username text in account info 2017-01-07 16:39:30 -05:00
Eugen
c398d2d82b Merge pull request #425 from ineffyble/vagrant
Add Vagrant support for easy development environments
2017-01-07 18:31:59 +01:00
Eugen Rochko
d019f1632c Replace getting started icon on desktop nav bar with asterisk instead of hamburger 2017-01-07 15:46:39 +01:00
Eugen Rochko
126aba0e13 Fix #147 - Unreblogging will leave original status in feeds 2017-01-07 15:44:22 +01:00
Eugen Rochko
438446b397 Add read timeout to paperclip when it's downloading remote images 2017-01-07 15:43:56 +01:00
Effy Elden
7afe78b1d6 Tweak Vagrant info in README 2017-01-08 01:30:48 +11:00
Effy Elden
6ef79c6948 Improve Vagrantfile, load environment variables from .env.vagrant, always forward localhost:3000 2017-01-08 01:28:49 +11:00
Effy Elden
2b92e4a37a Add Vagrant development environment support 2017-01-07 23:22:24 +11:00
Eugen Rochko
0dac73b5cc Add tab bar alternative to desktop UI, upgrade react & react-redux 2017-01-06 22:09:55 +01:00
Eugen Rochko
26390b1997 Clean up h-card mess of divs 2017-01-06 20:24:51 +01:00
Eugen Rochko
ecd7a46f98 Fix h-card classes and remote follow button appearing when it shouldn't 2017-01-06 20:15:24 +01:00
Eugen Rochko
9b5dabfa90 Merge branch 'myfreeweb-master' 2017-01-06 20:09:34 +01:00
Greg V
8d6361b40b Add Microformats2 markup
h-feed, h-card and h-entry
2017-01-06 18:10:10 +03:00
Eugen
2804ccc958 Merge pull request #417 from ineffyble/twitter-card-metadata
Twitter Cards support
2017-01-06 01:16:45 +01:00
Eugen
c517908c5b Merge pull request #418 from ticky/upgrade-emojione
Upgrade EmojiOne to 2.2.7
2017-01-06 01:13:34 +01:00
Eugen Rochko
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.
2017-01-06 00:29:12 +01:00
Jessica Stokes
73ce525d4b Upgrade EmojiOne to 2.2.7
Adds support for, among other things, 🏳️‍🌈
2017-01-05 15:16:13 -08:00
Effy Elden
fe31b43b75 Add twitter:card metatag to enable Twitter Cards support 2017-01-06 09:47:40 +11:00
Eugen
8855b9aa8c Merge pull request #415 from ineffyble/master
Prevent duplicate desktop notifications
2017-01-05 23:15:01 +01:00
Effy Elden
30cc139fad Add tag property to desktop notifications, preventing duplicates (i.e. when multiple Mastodon tabs are open) 2017-01-06 08:26:45 +11:00
Eugen Rochko
6bbc2c7954 Fixed unexpected error 2017-01-05 14:23:59 +01:00
Eugen Rochko
3f1dff3dfd Fix compose form bug 2017-01-05 14:18:38 +01:00
Eugen Rochko
b2ea21b3c9 Fix selection resetting in compose form after unrelated data updates 2017-01-05 14:11:18 +01:00
Eugen Rochko
45e5326307 Revert to Roboto for all 2017-01-05 13:59:58 +01:00
Eugen
5dc5c3b90a Merge pull request #406 from Gargron/revert-404-emoji
Revert "Display native emoji on browsers which support it"
2017-01-05 13:45:37 +01:00
Eugen
8b35bd2b92 Revert "Display native emoji on browsers which support it" 2017-01-05 13:45:21 +01:00
Eugen
06a9a0a0f4 Merge pull request #403 from ticky/use-system-fonts
Use system fonts on more platforms
2017-01-05 13:37:48 +01:00
Eugen
9f3babd80f Merge pull request #404 from mistydemeo/emoji
Display native emoji on browsers which support it
2017-01-05 13:37:29 +01:00
Eugen
d8197c27eb Merge pull request #399 from ticky/public-timeline-de-hoist
Public timeline de-hoist
2017-01-05 13:36:55 +01:00
Eugen
30adea06fb Merge pull request #400 from ticky/differentiate-settings-links
Differentiate settings links
2017-01-05 13:36:13 +01:00
Eugen
e506caf59e Merge pull request #401 from mistydemeo/new_toot_cursor_position
Automatically position cursor when writing a reply toot
2017-01-05 13:35:14 +01:00
Misty De Meo
8579c4ae01 Bump emoji requirement to Unicode 9 2017-01-04 22:47:51 -08:00
Misty De Meo
8dfb4048cc Display native emoji on browsers which support it 2017-01-04 22:23:02 -08:00
Jessica Stokes
6860c6bcfd Use system fonts on more platforms
This allows other platforms such as Windows, macOS and iOS to use their system fonts rather than downloading a copy of Roboto. It also makes the app feel a little closer to native on those platforms!
2017-01-04 20:24:27 -08:00
Misty De Meo
8745871737 Automatically position cursor when writing a reply toot 2017-01-04 20:04:14 -08:00
Jessica Stokes
c22ecd7f3b Differentiate settings links
The "settings" links in the Getting Started section (or, if #399 were to happen, "more" menu) and compose sections are now different; the "compose" link is "Edit profile," while the one in the Getting Started section is now "Preferences."

All languages have been updated to accommodate this, based on the existing usages of these phrases in language files in the Rails part of the app!

addresses part of #384
2017-01-04 19:47:02 -08:00
Jessica Stokes
1ff1f5d344 Remove hamburger from "getting started" 2017-01-04 19:30:39 -08:00