Commit graph

39662 commits

Author SHA1 Message Date
Eugen
4447c4c7c8 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
Kurtis Rainbolt-Greene
e5d9009d71 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
vjackson725
db3d5d811c 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
Eugen
7a0a13ab53 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
blackle
8a571158c9 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
Eugen
cec7e69827 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
blackle
e1ca354956 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
Eugen
679aa35e15 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
blackle
57ff221c0f 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
Eugen
165df323ae 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
blackle
61211b509c 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
2fbb38e4b2 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
be6ae3546f 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
5c7add2176 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
Eugen Rochko
7ddec6e7c3 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
11ea7336e9 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
46fb634c79 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
Effy Elden
f1289ca3c0 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
989c3f4002 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
1bfbce7b45 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
72c3a41bef 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
Eugen Rochko
8b28b82141 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
Greg V
18deeb9db5 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
92bd5f62f6 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
6917099a6a 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