Commit Graph

7114 Commits

Author SHA1 Message Date
Luke Pulverenti
4936ebf74c Merge branch 'beta' of https://github.com/MediaBrowser/Emby into beta 2016-01-06 12:33:49 -05:00
Luke Pulverenti
0996872738 Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev 2016-01-06 12:33:12 -05:00
Luke Pulverenti
359360a8a2 bump version 2016-01-06 12:33:04 -05:00
Luke Pulverenti
d341d89fef restore changes 2016-01-06 12:32:32 -05:00
Luke Pulverenti
58de8c5768 Merge branch 'beta' into dev 2016-01-06 12:28:34 -05:00
Luke Pulverenti
c6580287f5 Merge branch 'dev' into beta 2016-01-06 12:28:05 -05:00
Luke Pulverenti
b67683e0b5 fix merge conflict 2016-01-06 12:27:04 -05:00
Luke Pulverenti
3a1d2ef5d0 fix merge conflict 2016-01-06 12:21:01 -05:00
Luke
f19e3ca7a8 Merge pull request #1394 from MediaBrowser/master
merge from master
2016-01-06 12:20:07 -05:00
Luke
59a9bc2881 Merge pull request #1393 from MediaBrowser/master
merge from master
2016-01-06 12:19:29 -05:00
Luke Pulverenti
bab526f5e0 3.0.5802 2016-01-06 12:03:05 -05:00
Luke Pulverenti
bdb2fca820 disable pismo for now 2016-01-06 11:57:55 -05:00
Luke Pulverenti
b92c2fadb9 disable pismo for now 2016-01-06 11:57:15 -05:00
Luke Pulverenti
4270dbfb38 add Indonesian as selectable language 2016-01-06 11:47:38 -05:00
Luke Pulverenti
ed3c06f0ca add Indonesian as selectable language 2016-01-06 11:46:39 -05:00
Luke Pulverenti
278951566b update tmdb throttle 2016-01-06 11:35:30 -05:00
Luke Pulverenti
91545b8da7 update tmdb throttle 2016-01-06 11:34:09 -05:00
Luke Pulverenti
2cefb62b2e add robots.txt 2016-01-05 12:31:05 -05:00
Luke Pulverenti
22b7c4ab91 add robots.txt 2016-01-05 12:30:13 -05:00
Luke Pulverenti
29e3b8a29b separate artists with semi-colon 2016-01-05 12:27:46 -05:00
Luke Pulverenti
e9e3099f46 update meta tags 2016-01-05 12:27:07 -05:00
Luke Pulverenti
534262a51b update translations 2016-01-05 12:26:59 -05:00
Luke Pulverenti
e9077668ae update installer locations 2016-01-05 12:26:22 -05:00
Luke Pulverenti
ce59f19bc0 separate artists with semi-colon 2016-01-05 12:05:30 -05:00
Luke Pulverenti
dcab536173 update meta tags 2016-01-05 11:45:36 -05:00
Luke Pulverenti
c9543bd60e update translations 2016-01-05 11:45:19 -05:00
Luke Pulverenti
475c54e283 merge media encoder changes from dev 2016-01-04 21:49:30 -05:00
Luke Pulverenti
30229982ba auto install vcredist 2016-01-04 14:40:59 -05:00
Luke Pulverenti
8ec08ef310 update installer locations 2016-01-04 13:57:49 -05:00
Luke Pulverenti
6f53f7ee1d update mp3 transcoding 2016-01-04 12:47:00 -05:00
Luke Pulverenti
e71a3c516a 3.0.5801 2016-01-03 23:54:04 -05:00
Luke Pulverenti
a35592e0d8 update mp3 transcoding 2016-01-03 23:49:25 -05:00
Luke Pulverenti
a8cbea89f1 revert segment length change 2016-01-03 23:49:11 -05:00
Luke Pulverenti
3788383181 update the updater 2016-01-03 21:56:43 -05:00
Luke Pulverenti
598f79fafe update the updater 2016-01-03 21:31:22 -05:00
Luke Pulverenti
1135ad0fe2 update mp3 transcoding 2016-01-03 16:35:19 -05:00
Luke Pulverenti
f60a77b6b6 update the updater 2016-01-03 15:24:18 -05:00
Luke Pulverenti
5acc026c83 update github updater 2016-01-03 14:42:14 -05:00
Luke Pulverenti
98a7f5b5d7 revert segment length change 2016-01-03 14:01:43 -05:00
Luke Pulverenti
316b7da1a3 update github updater 2016-01-03 14:01:05 -05:00
Luke Pulverenti
3560e61596 add release description 2016-01-02 20:33:44 -05:00
Luke Pulverenti
82b8d60720 get stable and beta server packages from github 2016-01-02 20:23:09 -05:00
Luke Pulverenti
8c2327278c update version 2016-01-02 18:54:15 -05:00
Luke Pulverenti
b2548a83b6 restore changes 2016-01-02 18:45:21 -05:00
Luke
3cdfd57ee0 Merge pull request #1390 from MediaBrowser/master
merge from master
2016-01-02 18:43:17 -05:00
Luke Pulverenti
5e3b9e80ad fix merge conflicts 2016-01-02 18:42:39 -05:00
Luke Pulverenti
a8c482ba7e fix merge conflict 2016-01-02 18:27:01 -05:00
Luke Pulverenti
895f4a1be4 fix merge conflict 2016-01-02 18:26:29 -05:00
Luke Pulverenti
e76d198a86 fix merge conflict 2016-01-02 18:26:05 -05:00
Luke Pulverenti
0e3dc12460 restore changes 2016-01-02 18:20:08 -05:00