Commit Graph

10614 Commits

Author SHA1 Message Date
Luke Pulverenti
362d8d5c96 Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev 2016-03-27 23:39:02 -04:00
Luke
ca2062c753 Merge pull request #1608 from MediaBrowser/master
merge from master
2016-03-27 23:39:00 -04:00
Luke Pulverenti
96f6985b4b restore version 2016-03-27 23:38:31 -04:00
Luke
2e46231724 Merge pull request #1607 from MediaBrowser/master
merge from master
2016-03-27 23:38:22 -04:00
Luke Pulverenti
68a398da3e rework nav drawer 2016-03-27 23:37:33 -04:00
Luke
fe482f3ac3 update mac release 2016-03-27 19:11:27 -04:00
Luke Pulverenti
37e55ba637 3.0.5911 2016-03-27 18:47:58 -04:00
Luke
a60bb08a07 Merge pull request #1606 from MediaBrowser/beta
Beta
2016-03-27 18:47:32 -04:00
Sven Van den brande
168587b2a0 Remove unused code... 2016-03-27 23:11:27 +02:00
Luke
38d19d4c80 Merge pull request #1604 from SvenVandenbrande/dev
Fix typo
2016-03-27 16:51:20 -04:00
Sven Van den brande
e73b418f9d Fix typo 2016-03-27 22:35:25 +02:00
Luke
6d1f33f1a6 Merge pull request #1602 from MediaBrowser/dev
fix remote control menu
2016-03-26 23:49:35 -04:00
Luke Pulverenti
ff0e45a3f7 3.0.5921 2016-03-26 13:52:36 -04:00
Luke
c5ce8be211 Merge pull request #1601 from MediaBrowser/dev
Dev
2016-03-26 13:51:55 -04:00
Luke Pulverenti
ac07c2072a Update firewall authorization 2016-03-26 13:51:27 -04:00
Luke Pulverenti
661acc256a update version 2016-03-26 13:21:55 -04:00
Luke
b2a9ad6c6d Merge pull request #1600 from MediaBrowser/master
merge from master
2016-03-26 13:21:17 -04:00
Luke
992fd591a7 Merge pull request #1599 from MediaBrowser/beta
Beta
2016-03-26 13:18:48 -04:00
Luke
5b15171d61 Merge pull request #1598 from MediaBrowser/dev
update latest items display
2016-03-26 13:18:28 -04:00
Luke Pulverenti
a88327ab71 update latest items display 2016-03-26 12:58:03 -04:00
Luke
f53698d8fa Merge pull request #1597 from MediaBrowser/beta
Beta
2016-03-26 01:46:05 -04:00
Luke
f04627e1e8 Merge pull request #1596 from MediaBrowser/dev
Dev
2016-03-26 01:45:50 -04:00
Luke Pulverenti
05ea65ede0 fix series nfo parsing 2016-03-26 01:44:01 -04:00
Luke
b398805a81 update mac project 2016-03-25 14:10:58 -04:00
Luke
79271bdc27 Merge pull request #1595 from MediaBrowser/beta
Beta
2016-03-25 14:00:30 -04:00
Luke
94da42621e Merge pull request #1594 from MediaBrowser/dev
update project
2016-03-25 14:00:18 -04:00
Luke Pulverenti
a43f4a4666 update project 2016-03-25 13:59:43 -04:00
Luke
1785b6568f update mac project 2016-03-25 13:58:52 -04:00
Luke Pulverenti
d9108f69f3 Merge branch 'master' of https://github.com/MediaBrowser/Emby 2016-03-25 13:52:36 -04:00
Luke Pulverenti
d6832e7a41 3.0.5910 2016-03-25 13:52:28 -04:00
Luke
72fe76ab10 Merge pull request #1593 from MediaBrowser/beta
Beta
2016-03-25 13:52:15 -04:00
Luke Pulverenti
736e632410 fix merge conflict 2016-03-25 13:51:54 -04:00
Luke
f6c18200ba Merge pull request #1592 from MediaBrowser/dev
update take the tour
2016-03-25 13:48:49 -04:00
Luke Pulverenti
ca994965c2 update take the tour 2016-03-25 13:48:18 -04:00
Luke
611ddb772f Merge pull request #1591 from MediaBrowser/dev
update startup wizard
2016-03-25 13:39:18 -04:00
Luke Pulverenti
957db1a0c7 3.0.5920 2016-03-25 13:20:28 -04:00
Luke
89f86a0b2b Merge pull request #1589 from MediaBrowser/dev
Dev
2016-03-25 13:17:58 -04:00
Luke Pulverenti
20c72e0ce9 for now, require m3u url for sat/ip 2016-03-25 13:06:36 -04:00
Luke Pulverenti
e619a0dc90 update connection 2016-03-25 12:23:48 -04:00
Luke Pulverenti
ae684cf0a5 fix movie search 2016-03-25 12:16:51 -04:00
Luke Pulverenti
22730746eb ipv6 update 2016-03-25 01:39:49 -04:00
Luke Pulverenti
1a72e3b596 update deslug methods 2016-03-25 00:08:22 -04:00
Luke Pulverenti
074192bae9 3.0.5919 2016-03-24 23:54:47 -04:00
Luke
c39cedc806 Merge pull request #1588 from MediaBrowser/dev
update music queries
2016-03-24 23:54:22 -04:00
Luke Pulverenti
3c43e85d87 update music queries 2016-03-24 23:53:42 -04:00
Luke
988a87f024 Merge pull request #1587 from MediaBrowser/dev
add critic rating column
2016-03-24 23:23:07 -04:00
Luke Pulverenti
71b6d5d439 add critic rating column 2016-03-24 22:54:38 -04:00
Luke
6426433dc6 Merge pull request #1585 from MediaBrowser/dev
Dev
2016-03-24 21:10:38 -04:00
Luke Pulverenti
5661f09899 update sorting 2016-03-24 17:47:10 -04:00
Luke Pulverenti
2d833baa77 3.0.5918 2016-03-24 17:03:14 -04:00