Luke Pulverenti
|
71cc832d1c
|
update translations
|
2016-02-14 21:50:51 -05:00 |
|
Luke Pulverenti
|
eb03497e42
|
update menu
|
2016-02-14 21:25:24 -05:00 |
|
Luke Pulverenti
|
96916410b0
|
update recording creator
|
2016-02-14 17:49:45 -05:00 |
|
Luke Pulverenti
|
a1e8db221f
|
remove page outline
|
2016-02-14 17:40:47 -05:00 |
|
Luke Pulverenti
|
4155f3313a
|
Merge branch 'master' into beta
Conflicts:
MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
MediaBrowser.Server.Implementations/packages.config
MediaBrowser.WebDashboard/dashboard-ui/bower_components/emby-webcomponents/.bower.json
MediaBrowser.WebDashboard/dashboard-ui/bower_components/emby-webcomponents/browserdeviceprofile.js
MediaBrowser.WebDashboard/dashboard-ui/bower_components/iron-menu-behavior/.bower.json
MediaBrowser.WebDashboard/dashboard-ui/bower_components/iron-menu-behavior/bower.json
MediaBrowser.WebDashboard/dashboard-ui/bower_components/iron-menu-behavior/test/iron-menubar-behavior.html
MediaBrowser.WebDashboard/dashboard-ui/bower_components/iron-pages/.bower.json
MediaBrowser.WebDashboard/dashboard-ui/bower_components/iron-pages/bower.json
MediaBrowser.WebDashboard/dashboard-ui/bower_components/marked-element/.bower.json
MediaBrowser.WebDashboard/dashboard-ui/bower_components/marked-element/CONTRIBUTING.md
MediaBrowser.WebDashboard/dashboard-ui/bower_components/marked-element/bower.json
MediaBrowser.WebDashboard/dashboard-ui/bower_components/marked-element/marked-element.html
MediaBrowser.WebDashboard/dashboard-ui/bower_components/marked-element/test/index.html
MediaBrowser.WebDashboard/dashboard-ui/bower_components/marked-element/test/marked-element.html
MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/.bower.json
MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/CHANGELOG.md
MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/LICENSE
MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/components.js
MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/components/prism-core.js
MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/components/prism-core.min.js
MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/components/prism-jsx.js
MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/components/prism-jsx.min.js
MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/package.json
MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/plugins/file-highlight/prism-file-highlight.js
MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/plugins/file-highlight/prism-file-highlight.min.js
MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/plugins/show-invisibles/prism-show-invisibles.css
MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/plugins/show-invisibles/prism-show-invisibles.js
MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/plugins/show-invisibles/prism-show-invisibles.min.js
MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/plugins/show-language/prism-show-language.css
MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/plugins/show-language/prism-show-language.js
MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/plugins/show-language/prism-show-language.min.js
MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/plugins/wpd/prism-wpd.js
MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/plugins/wpd/prism-wpd.min.js
MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/prism.js
MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/themes/prism-coy.css
MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/themes/prism-dark.css
MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/themes/prism-funky.css
MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/themes/prism-okaidia.css
MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/themes/prism-tomorrow.css
MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/themes/prism-twilight.css
MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/themes/prism.css
SharedVersion.cs
packages/MediaBrowser.Naming.1.0.0.47/lib/portable-net45+sl4+wp71+win8+wpa81/MediaBrowser.Naming.dll
|
2016-02-14 16:34:47 -05:00 |
|
Luke
|
0266db07b3
|
Merge pull request #1455 from MediaBrowser/dev
Dev
|
2016-02-14 16:15:23 -05:00 |
|
Luke Pulverenti
|
7f190b61cf
|
hide smart match features for now
|
2016-02-14 16:12:48 -05:00 |
|
Luke Pulverenti
|
52e24eb53f
|
update preferences
|
2016-02-14 15:41:04 -05:00 |
|
Luke Pulverenti
|
63e7a14025
|
update preferences menu
|
2016-02-14 15:38:19 -05:00 |
|
Luke Pulverenti
|
d4504e80a2
|
update channel filters
|
2016-02-14 15:34:54 -05:00 |
|
Luke Pulverenti
|
413a255477
|
reduce jqm script
|
2016-02-14 13:32:29 -05:00 |
|
Luke
|
ab015330a9
|
Merge pull request #1452 from MediaBrowser/dev
Dev
|
2016-02-14 01:02:43 -05:00 |
|
Luke Pulverenti
|
d50ec10bde
|
restore people in search
|
2016-02-14 00:23:33 -05:00 |
|
Luke Pulverenti
|
cd2253bdea
|
auto-queue episodes
|
2016-02-13 23:47:35 -05:00 |
|
Luke Pulverenti
|
30015609f7
|
fix edge playback
|
2016-02-13 21:26:51 -05:00 |
|
Luke
|
c92b4cb741
|
Merge pull request #1451 from MediaBrowser/dev
Dev
|
2016-02-13 17:22:44 -05:00 |
|
Luke Pulverenti
|
a541bf1ce0
|
increase message count
|
2016-02-13 15:07:31 -05:00 |
|
Luke
|
33ee3d8ee3
|
Merge pull request #1450 from MediaBrowser/dev
Dev
|
2016-02-13 10:59:44 -05:00 |
|
Luke Pulverenti
|
404971a112
|
fix shared item page
|
2016-02-13 10:56:58 -05:00 |
|
Luke Pulverenti
|
14b19bb60f
|
update icons
|
2016-02-13 02:19:49 -05:00 |
|
Luke Pulverenti
|
c80bf053e1
|
update icons
|
2016-02-13 01:55:13 -05:00 |
|
Luke Pulverenti
|
2d078e4a2f
|
removed dead code
|
2016-02-13 01:51:28 -05:00 |
|
Luke Pulverenti
|
7dd45dea75
|
update icons
|
2016-02-13 01:46:46 -05:00 |
|
Luke Pulverenti
|
f45621207c
|
update smart match tab
|
2016-02-13 01:39:23 -05:00 |
|
Luke Pulverenti
|
e7448d6369
|
update delete smart match entry
|
2016-02-13 01:19:28 -05:00 |
|
Luke Pulverenti
|
0a7c782beb
|
remove identifier from global scope
|
2016-02-13 01:13:54 -05:00 |
|
Luke Pulverenti
|
79cf0837a0
|
update file organizer form
|
2016-02-12 23:34:47 -05:00 |
|
Luke Pulverenti
|
c0d966f1d8
|
update header
|
2016-02-12 22:40:49 -05:00 |
|
Luke Pulverenti
|
94bd1f190b
|
removed dead code
|
2016-02-12 22:39:36 -05:00 |
|
Luke
|
9753a7981b
|
Merge pull request #1448 from MediaBrowser/dev
Dev
|
2016-02-12 20:57:41 -05:00 |
|
softworkz
|
7835a9d3e6
|
Refactored organization dialog as a component
|
2016-02-13 02:55:00 +01:00 |
|
softworkz
|
4ed019b32d
|
Revert "hide smart match feature for now"
This reverts commit db821c3d311e674e74fef401548d49c9d2b8ac43.
|
2016-02-13 02:42:57 +01:00 |
|
Luke Pulverenti
|
bebfc016fe
|
add play button to suggestions
|
2016-02-12 15:31:48 -05:00 |
|
Luke Pulverenti
|
073fd66f81
|
add more play buttons
|
2016-02-12 15:26:03 -05:00 |
|
Luke
|
5ccedbeffc
|
Merge pull request #1447 from MediaBrowser/dev
Dev
|
2016-02-12 13:32:42 -05:00 |
|
Luke Pulverenti
|
9eb9226941
|
update recording creation
|
2016-02-12 13:29:28 -05:00 |
|
Luke Pulverenti
|
31bb32ee03
|
update recording creation process
|
2016-02-12 13:12:59 -05:00 |
|
Luke
|
46a18c42aa
|
Merge pull request #1446 from MediaBrowser/dev
update config page
|
2016-02-12 02:11:09 -05:00 |
|
Luke
|
5e96e97165
|
Merge pull request #1445 from MediaBrowser/dev
add recording encoding setting
|
2016-02-12 02:09:02 -05:00 |
|
Luke Pulverenti
|
6aca855749
|
update config page
|
2016-02-12 02:08:55 -05:00 |
|
Luke Pulverenti
|
fae5829a68
|
add recording encoding setting
|
2016-02-12 02:01:38 -05:00 |
|
Luke
|
948aea4275
|
Merge pull request #1444 from MediaBrowser/dev
Dev
|
2016-02-11 23:59:22 -05:00 |
|
Luke Pulverenti
|
c0bdf018d6
|
update config pages
|
2016-02-11 23:33:14 -05:00 |
|
Luke
|
b0c134ee04
|
Merge pull request #1442 from MediaBrowser/dev
Dev
|
2016-02-11 14:16:47 -05:00 |
|
Luke Pulverenti
|
5ec9b4aeea
|
support tagging 3d as mvc
|
2016-02-11 14:11:28 -05:00 |
|
Luke Pulverenti
|
f82bec8948
|
update translations
|
2016-02-11 13:50:01 -05:00 |
|
Luke
|
985622b110
|
Merge pull request #1441 from MediaBrowser/dev
merge from dev
|
2016-02-11 13:41:22 -05:00 |
|
Luke Pulverenti
|
db9d5af7d7
|
hide smart match feature for now
|
2016-02-11 13:35:58 -05:00 |
|
Luke Pulverenti
|
03c6dcc4f1
|
remove jqmcheckbox from global
|
2016-02-11 13:29:32 -05:00 |
|
Luke Pulverenti
|
cf11f24cc7
|
update guest inviter
|
2016-02-10 21:56:24 -05:00 |
|