lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,471 Commits 2 Branches 0 Tags 64 MiB
a72a297c88
Commit Graph

883 Commits

Author SHA1 Message Date
Luke Pulverenti
73255b6073 display recording groups 2013-12-28 16:37:01 -05:00
Luke Pulverenti
28b0ff1e75 allow custom language per item 2013-12-28 11:58:13 -05:00
Luke Pulverenti
72412038a8 updated sqlite 2013-12-27 10:02:57 -05:00
Luke Pulverenti
2a5d4c9069 minor mobile fixes 2013-12-27 00:13:19 -05:00
Luke Pulverenti
809ed093e8 save thumbs as landscape in compatible mode 2013-12-26 19:24:23 -05:00
Luke Pulverenti
44c0eba39d abstract preferred metadata language per item 2013-12-26 19:23:58 -05:00
Luke Pulverenti
14720063bc fix web socket attachment to session object 2013-12-26 13:46:38 -05:00
Luke Pulverenti
4b4c5635af fixed special episode sorting 2013-12-26 12:14:57 -05:00
Luke Pulverenti
e6359469b6 removed lazy loading of users 2013-12-26 09:20:30 -05:00
Luke Pulverenti
ce51973a80 fixed overflow exception in alphanum comparer 2013-12-26 09:20:04 -05:00
Luke Pulverenti
25db52003c added more metadata control 2013-12-26 01:17:19 -05:00
Luke
7c8424bf61 Merge pull request #652 from abeloin/master 
Linux fixes
 2013-12-25 20:07:29 -08:00
Luke Pulverenti
74f0d8bdbe minor dashboard cleanup 2013-12-25 22:44:26 -05:00
abeloin
320495a565 Add Mono conditon in Server.Implementations for Mono System.Data.SQLite version 2013-12-25 20:46:34 -05:00
abeloin
316500dca4 -Replaced Mono.Data.SQLite by System.Data.SQLite(ManagedOnly) 
-Added System.Data.SQLite and Sqlite3 into ThirdParty
-Depending of the OS, System.Data.SQLite will look for:
  sqlite3.dll in Windows(Provided with the project)
  libsqlite3.so.0 in Linux(Need to be installed. ie yum install sqlite.i686)
  libsqlite3.dylib in MacOS X(!?)
  (See http://www.mono-project.com/Interop_with_Native_Libraries for more info)
 2013-12-25 19:40:53 -05:00
abeloin
68cf16416b Linux fixes: 
-Copy PropertyChanged.Fody.dll to Tools/Fody in MediaBrowser.Model.csproj
-Check if root for WebSocketServer.FlashAccessPolicyEnabled (port < 1024)
-Check resolution value !=0 before SetResolution
-Catch _userManager.RefreshUsersMetadata exception when running MB3 for the first time
-Fix _appHost.Init() missing argument
-FFmpeg: set default and execute permission(766) to ffmpeg and ffprobe
-FFmpeg: Detect the OS type and download the correct version 
-Rename MediaBrowser.WebDashboard/dashboard-ui/scripts/Itemdetailpage.js to itemdetailpage.js
 2013-12-25 14:26:49 -05:00
Luke Pulverenti
bb5e6fdcad hook up roku session controller + web client layout fixes 2013-12-25 09:39:46 -05:00
Luke Pulverenti
ce8f37de79 added stub for roku remote controller 2013-12-23 19:00:27 -05:00
Brendon-MB3
fb088e4dcc Update au.txt 
Updated to include all classifications.
 2013-12-23 21:14:02 +11:00
Luke Pulverenti
c0bbf8945f live tv updates 2013-12-22 22:46:03 -05:00
Luke Pulverenti
4c2623d540 support streaming of tv recordings 2013-12-22 13:58:51 -05:00
Luke Pulverenti
f20f3b4b68 live tv updates 2013-12-22 12:16:24 -05:00
Luke Pulverenti
4b2b36d1a3 live tv updates 2013-12-21 13:37:34 -05:00
Luke Pulverenti
594ed864c6 live tv updates 2013-12-20 15:09:49 -05:00
Luke Pulverenti
7881a4be0a fixed movie folders resolving incorrectly when using multi-disc naming 2013-12-19 22:21:37 -05:00
Luke Pulverenti
cd859ac2e6 added IHasImages and IHasUserData 2013-12-19 16:51:32 -05:00
Luke Pulverenti
e1e5d35434 live tv updates 2013-12-18 00:44:46 -05:00
Luke Pulverenti
14a8b41503 add additional metadata config tab 2013-12-17 23:39:44 -05:00
Luke Pulverenti
533a7b218d add ability to create timer 2013-12-17 15:02:12 -05:00
Luke Pulverenti
df1576c039 live tv updates 2013-12-17 01:08:06 -05:00
Luke Pulverenti
cb9b570a2a live tv updates 2013-12-16 13:44:03 -05:00
Luke Pulverenti
a3d855919e removed old kernel 2013-12-15 13:29:34 -05:00
Luke Pulverenti
d8ce4141ff change chapter image location and cleanup dead files 2013-12-15 11:53:32 -05:00
Luke
17c4a8461f Merge pull request #647 from tikuf/master 
Change subtitle seek behavior
 2013-12-15 06:21:52 -08:00
Luke Pulverenti
98d53c7838 live tv + nuget updates 2013-12-15 09:19:24 -05:00
tikuf
7550d97f67 Fix seek in external sub files, change seek behavior in both internal and external sub extraction 2013-12-15 18:06:11 +11:00
Luke Pulverenti
01e65c93ee updated live tv + nuget 2013-12-14 20:17:57 -05:00
Luke Pulverenti
2884920f0f added HasImage to live tv objects 2013-12-13 10:48:48 -05:00
Luke Pulverenti
2c22de3773 update tv recording page 2013-12-12 23:06:38 -05:00
Ceten
c911f22e3d Added rating for Belgium 2013-12-12 19:00:59 +01:00
Luke Pulverenti
f2aec8c382 update xbmc music video image saving 2013-12-11 18:30:41 -05:00
Luke Pulverenti
9ecb85d066 added mono release configuration 2013-12-11 14:54:33 -05:00
Luke Pulverenti
5f9b99c960 deprecated IndexFolder.cs 2013-12-10 21:51:26 -05:00
Luke Pulverenti
50ea8cd941 added series level settings to control display of specials 2013-12-10 16:26:30 -05:00
Luke Pulverenti
90184470fa expose episode absolute numbers for editing 2013-12-10 15:42:42 -05:00
Luke Pulverenti
7c6581dd0f restored swagger 2013-12-10 11:44:07 -05:00
Luke Pulverenti
96c65a147c updated nuget 2013-12-10 11:17:08 -05:00
Luke Pulverenti
6e0f4cf3a3 update SS assemblies 2013-12-09 23:08:18 -05:00
Luke Pulverenti
d2217a661a fixed provider refresh issue 2013-12-09 22:34:01 -05:00
Luke Pulverenti
41ed3c15ff fixed service stack logging 2013-12-08 21:24:48 -05:00
Luke Pulverenti
d7c25fa53f fixed issue with natural sort 2013-12-08 21:24:23 -05:00
Luke Pulverenti
91b5a8101f improve episode sorting 2013-12-08 16:31:14 -05:00
Luke Pulverenti
803d60d9cf support natural sorting 2013-12-08 15:47:11 -05:00
Luke Pulverenti
207280197d added more episode values to metadata editor 2013-12-08 15:33:24 -05:00
Luke Pulverenti
f856e166ff Add WanAddress to SystemInfo 2013-12-08 14:39:39 -05:00
Luke Pulverenti
fe42a6d1d9 fix local trailers being resolved as movies 2013-12-08 13:07:58 -05:00
Luke Pulverenti
b595814254 added mono sqlite implementation 2013-12-08 12:57:49 -05:00
Luke Pulverenti
0ad21b74ab add de-16 rating 2013-12-08 12:57:33 -05:00
Luke Pulverenti
1f162e39b1 expose Tmdb collection id in editor. 2013-12-07 20:42:15 -05:00
Luke Pulverenti
07e5b74f13 updated nuget 2013-12-07 11:31:00 -05:00
Luke Pulverenti
f32212d160 update to service stack v4 2013-12-07 10:52:38 -05:00
Luke Pulverenti
fac14cfd1e removed test code. 2013-12-06 16:05:13 -05:00
Luke Pulverenti
63c9104e62 Pull ProviderData out of memory 2013-12-06 15:07:34 -05:00
Luke Pulverenti
9f4f2281cd prevent xml savers from triggering xml providers 2013-12-06 10:59:40 -05:00
Luke Pulverenti
5f0d8000a5 moved media streams to the database 2013-12-05 22:39:44 -05:00
Luke Pulverenti
55a776427b Removed unused properties from BaseItem. 2013-12-05 11:50:21 -05:00
Luke Pulverenti
81e59040d0 updated live tv models 2013-12-04 15:55:42 -05:00
Luke Pulverenti
4e79eaf65e add ApplicationPath to app paths interface to hide implementation 2013-12-04 09:52:38 -05:00
Luke Pulverenti
40959a816f more support for episodes directly in a series folder 2013-12-03 23:18:50 -05:00
Luke Pulverenti
6247929a62 #643 - Support episodes directly in series folder 2013-12-03 16:12:20 -05:00
Luke Pulverenti
c38fef110e improved startup delay 2013-12-03 16:11:09 -05:00
Luke Pulverenti
245e92c9cc updated nuget 2013-12-02 16:46:22 -05:00
Luke Pulverenti
cd279d98e0 added IHasTrailers 2013-12-02 11:46:25 -05:00
Luke Pulverenti
317f411070 Added IHasBudget 2013-12-02 11:16:03 -05:00
Luke Pulverenti
ad52d8b5d9 fixes #640 - Add management filters 2013-12-01 21:24:14 -05:00
Luke Pulverenti
e191836ea0 fix tmdbid override for movies 2013-12-01 13:58:06 -05:00
Luke Pulverenti
ccd51222e6 updated live tv endpoints 2013-12-01 01:25:19 -05:00
Luke Pulverenti
58f1a314b5 update to service stack 3.0.70.0 2013-11-30 13:32:39 -05:00
Luke Pulverenti
45a4d25e26 updated live tv methods + nuget 2013-11-30 01:49:38 -05:00
Luke Pulverenti
9b9e5fc4e4 added timer properties for pre/post padding seconds 2013-11-29 16:28:12 -05:00
Luke Pulverenti
7ef1816b34 add links to channel pages 2013-11-29 15:10:31 -05:00
Luke Pulverenti
0c398a5670 added create live tv timer page 2013-11-29 13:44:51 -05:00
Luke Pulverenti
235b838fbe support deleting and canceling live tv recordings and timers 2013-11-29 11:58:24 -05:00
tikuf
5bf12c3bad Better Thumb extraction. 
Remove Black bars if we make them.
Fix fsbs and ftab image extraction.
 2013-11-28 16:51:38 +11:00
Luke Pulverenti
1e9ffb83cf added live tv timers page 2013-11-27 14:04:19 -05:00
Luke Pulverenti
6e3b8420ba removed test code 2013-11-26 21:41:29 -05:00
Luke Pulverenti
64818ebd22 fix directory watchers not picking up changes 2013-11-26 21:38:11 -05:00
Luke Pulverenti
e05a84c789 updated nuget for live tv 2013-11-26 16:36:11 -05:00
Luke Pulverenti
77e01e2461 updated nuget for live tv 2013-11-26 11:22:11 -05:00
Luke Pulverenti
6a9ed5f87f added recording status enum 2013-11-25 21:53:48 -05:00
Luke Pulverenti
3b4c355838 updated nuget 2013-11-25 16:53:06 -05:00
Luke Pulverenti
a641059c57 display programs on channel page 2013-11-25 15:39:23 -05:00
Luke Pulverenti
4054846a6e updated nuget for live tv 2013-11-25 11:15:31 -05:00
Luke Pulverenti
fe7b8a0d96 renamed channel scheduled task 2013-11-24 19:46:25 -05:00
Luke Pulverenti
dee2fd5f88 allow editing of channel images in the web client 2013-11-24 18:37:38 -05:00
Luke Pulverenti
01a9c07dd8 support display of channel images 2013-11-24 16:30:38 -05:00
Luke Pulverenti
7b6819846d updated live tv + nuget 2013-11-24 15:51:45 -05:00
Luke Pulverenti
f6cdca1f07 ease up on directory watcher delay 2013-11-23 15:01:22 -05:00
Luke Pulverenti
e3cf3d73f1 improve embedding of specials 2013-11-23 15:01:09 -05:00
Luke Pulverenti
17bacee089 consolidate Artist & MusicArtist 2013-11-21 15:48:26 -05:00
Luke Pulverenti
ee1a746031 use string.equals 2013-11-21 11:02:49 -05:00
Luke Pulverenti
bf5b4decb7 check for zero bitrate coming from bdinfo 2013-11-21 11:02:31 -05:00
Luke Pulverenti
71514af96b render channels page 2013-11-20 16:08:12 -05:00
Luke Pulverenti
c3530e5e32 fixes #633 - Support Canadian ratings 2013-11-20 12:49:11 -05:00
Luke Pulverenti
977d9c7f3b improve episode sorting with embedded specials 2013-11-20 12:10:02 -05:00
Luke Pulverenti
bce86c5022 pull person sort order from tvdb/tmdb data 2013-11-19 22:15:48 -05:00
Luke Pulverenti
de339b8265 fixes #632 - Show yesterday's episodes in upcoming view 2013-11-19 12:17:14 -05:00
Luke Pulverenti
2b68dcd3c6 fix disc image saving for xbmc 2013-11-19 11:44:53 -05:00
Luke Pulverenti
9f9ab1ac9f support metabrowser special episode attributes 2013-11-17 10:27:48 -05:00
Luke Pulverenti
83d70c54ec Updated live tv api 2013-11-15 16:31:44 -05:00
Luke Pulverenti
a09e330d4e Display specials within seasons 2013-11-15 16:31:33 -05:00
Luke Pulverenti
016477d88d fix image caching being too aggressive 2013-11-15 11:00:39 -05:00
Luke Pulverenti
e0f46bb91e updated nuget 2013-11-13 11:45:41 -05:00
Luke Pulverenti
b07193e1bc added image processor error handling 2013-11-12 10:36:25 -05:00
Luke Pulverenti
9758adb8a5 add soundtracks to theme media result 2013-11-12 10:36:08 -05:00
Sven Van den brande
09d7bc00c2 Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser 2013-11-10 22:47:45 +01:00
Sven Van den brande
e4564ac860 Update LiveTvService (Channels and Recording) 2013-11-10 22:47:26 +01:00
Luke Pulverenti
90e75c05b7 rename da.txt to dk.txt 2013-11-09 14:04:51 -05:00
Luke Pulverenti
b043336977 Add SeriesPrimaryImageTag 2013-11-09 13:44:09 -05:00
Luke Pulverenti
9d7d8c3c94 Ignore xbmc actors folder 2013-11-09 13:43:53 -05:00
Luke Pulverenti
04f165283b try to avoid album year of zero 2013-11-08 16:22:02 -05:00
Luke Pulverenti
c9d9c6ff1f add image saver logging 2013-11-08 10:35:11 -05:00
Luke Pulverenti
1f0fc33a86 extend directory watcher remove temp ignore delay 2013-11-07 13:05:14 -05:00
Luke Pulverenti
01f1ed05b9 remove need to pass in image index when adding backdrops 2013-11-07 11:48:23 -05:00
Luke Pulverenti
2fc662c9e9 optimize image processor when gdi can be skipped 2013-11-07 10:57:12 -05:00
Luke Pulverenti
a2cd03610f Serve original image file when possible 2013-11-06 16:32:26 -05:00
Luke Pulverenti
a4cea5a5d3 added critic rating interface 2013-11-06 11:06:16 -05:00
Luke Pulverenti
f775f7c1fa try to forcefully prevent compatibility view 2013-11-06 10:45:40 -05:00
Luke Pulverenti
0f311f48c4 #608 - Add manual image selection for People 2013-11-05 11:08:44 -05:00
Luke Pulverenti
9ba615e649 fixes #606 - Add manual image selection for Seasons 2013-11-04 14:04:23 -05:00
Luke Pulverenti
f1a7d90640 fix scan stopping and restarting itself multiple times when adding/removing collections 2013-11-04 11:20:44 -05:00
Luke Pulverenti
138bad316b updated mbt api 2013-11-03 15:48:16 -05:00
Luke Pulverenti
d6055ec6fd updated nuget 2013-11-02 21:58:56 -04:00
Luis Miguel Almánzar
7c45cb3aa5 strip all bracket tags. fixes #598 2013-11-02 21:47:14 -04:00
Luis Miguel Almánzar
ce8821c942 Merge branch 'master' of github.com:MediaBrowser/MediaBrowser 2013-11-02 21:19:43 -04:00
Luis Miguel Almánzar
8a0606e970 strip only certain bracket blocks fixes #598 2013-11-02 21:19:33 -04:00
Sven Van den brande
96d4b9c43b Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser 2013-11-02 22:39:49 +01:00
Luke Pulverenti
ed34b67f51 fix library scan stopping and restarting itself 2013-11-02 15:30:29 -04:00
Luke Pulverenti
c543fdea3a Merge branch 'master' of https://github.com/tikuf/MediaBrowser 
Conflicts:
	MediaBrowser.Api/Playback/Hls/VideoHlsService.cs
	MediaBrowser.Api/Playback/Progressive/VideoService.cs
 2013-11-01 11:59:42 -04:00
Luke Pulverenti
926a610075 fixes #551 - Add manual image selection for movies 2013-10-31 21:48:14 -04:00
Luke Pulverenti
9adcdd007a #551 - Add manual image selection for movies 2013-10-31 17:03:24 -04:00
Sven Van den brande
e8f8d6651c Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser 2013-10-31 21:46:03 +01:00
Sven Van den brande
28ab28768a Adding RecordingInfo 2013-10-31 21:45:58 +01:00
Luke Pulverenti
6c8d919298 replace file system calls with IFileSystem when needed 2013-10-31 10:03:23 -04:00
Luke Pulverenti
579b507f7f use IFileSystem interface to get creation time 2013-10-30 19:15:58 -04:00
Luke Pulverenti
524150331c beginning manual image providers 2013-10-30 17:33:27 -04:00
Luke Pulverenti
be7918e5f6 fixes #567 - Deprecate native shortcut code 2013-10-30 10:40:14 -04:00
Luke Pulverenti
cbd6c47af4 updated sqlite 2013-10-30 10:13:09 -04:00
tikuf
407b64d0f9 Support Korean Subtitles 2013-10-30 18:00:54 +11:00
Luke Pulverenti
85568474ce add GameSystem to GameSystem dto 2013-10-27 17:40:42 -04:00
Luke Pulverenti
976523afa9 added new params for missing/unaired 2013-10-26 18:01:21 -04:00
Luke Pulverenti
b487794860 fixed virtual episode image saving 2013-10-25 16:58:31 -04:00
Luke Pulverenti
55b284cdff add user profile settings about virtual episodes 2013-10-25 11:52:10 -04:00
Luke Pulverenti
e8bb5c4b9a external subtitle fixes 2013-10-25 10:41:23 -04:00
Luke Pulverenti
b41bd6d544 fixes #596 - Remote play appears to be broken 2013-10-25 10:19:03 -04:00
Luke Pulverenti
6c1c163995 update configuration for virtual episodes 2013-10-25 10:18:53 -04:00
Luke Pulverenti
146c7ac4bf fix double path concatenation 2013-10-24 13:49:24 -04:00
Luke Pulverenti
b02bb92275 add subtitle extraction logging 2013-10-23 17:55:42 -04:00
Luke Pulverenti
d82eecc3fa fixes #577 - Subtitle Failures 2013-10-23 14:58:05 -04:00
Luke Pulverenti
731bb1389a #595 - Linux/Unix file quantity limitation for ImagesByName/People folder 2013-10-23 12:56:20 -04:00
Luke Pulverenti
73b294b4ce fixes #595 - Linux/Unix file quantity limitation for ImagesByName/People folder 2013-10-23 12:51:51 -04:00
Luke Pulverenti
6415776cd1 add item to user data save event 2013-10-23 12:03:12 -04:00
Luke Pulverenti
77cff18dce fix images saving with incorrect paths. 2013-10-22 21:11:56 -04:00
Luke Pulverenti
c997effcb1 use tmdb updates for images 2013-10-22 15:52:33 -04:00
Luke Pulverenti
32cb872b06 support backdrops from multiple sources 2013-10-22 15:03:21 -04:00
Luke Pulverenti
96fd6459b2 fix possible null reference with search hints 2013-10-22 12:08:54 -04:00
Luke Pulverenti
9c56495867 fixed saving images with double file extension 2013-10-22 08:37:11 -04:00
Luke Pulverenti
42deac1dce prioritize tmdb images ahead of fanart, but with min resolution settings 2013-10-21 10:38:48 -04:00
Luke Pulverenti
d18f000e88 process all images using Format32bppPArgb 2013-10-21 10:32:58 -04:00
Luke Pulverenti
3c06fc4d1a set CompositingMode to sourcecopy when possible 2013-10-21 00:12:51 -04:00
Luke Pulverenti
a36873f890 look at close status before assuming socket is closed. 2013-10-18 16:21:48 -04:00
Luke Pulverenti
088c77674b add locking around subtitle extraction 2013-10-18 16:02:56 -04:00
Luke Pulverenti
e6829fcdf0 improve compatibility view error message 2013-10-18 15:47:57 -04:00
Luke Pulverenti
d87a8ce8fa fixes #579 - Year images not getting scanned 2013-10-18 15:08:48 -04:00
Luke Pulverenti
39186cc2da updated mbt endpoints 2013-10-18 12:09:47 -04:00
Luke Pulverenti
0eec819ca7 added detail page indicator for missing 2013-10-17 16:59:46 -04:00
Luke Pulverenti
005b6c92aa xbmc image fixes 2013-10-17 11:35:39 -04:00
Luke Pulverenti
ca3a0c5dc9 fixes #592 - Add options to import missing and future episodes 2013-10-16 19:35:11 -04:00
Luke Pulverenti
28041bf435 tweaked xbmc image saving 2013-10-16 10:22:26 -04:00
Luke Pulverenti
28bb5c7903 support more xbmc image conventions 2013-10-15 21:44:23 -04:00
Luke Pulverenti
d176da1ba9 support saving images to multiple locations 2013-10-15 18:17:08 -04:00
Luke Pulverenti
bb265f129d support extrathumbs folder 2013-10-15 18:16:50 -04:00
Luke Pulverenti
ca2e0f3451 fixes #588 - Add option to use xbmc convention when saving images 2013-10-15 11:29:19 -04:00
Luke Pulverenti
f3c2609c8c updated bdinfo 2013-10-15 11:28:22 -04:00
Luke Pulverenti
bef67412b1 run fast people providers during library scan to pick up images quicker 2013-10-13 21:09:42 -04:00
Luke Pulverenti
3d3876c9a9 better crash logging 2013-10-13 17:22:25 -04:00
Luke Pulverenti
2a44efaa42 fixes #585 - Use tmdb updates api for people 2013-10-13 13:52:57 -04:00
Luke Pulverenti
f4ce062e0a fixes #583 - Add vote count to edit page 2013-10-13 10:37:17 -04:00
Luke Pulverenti
e98665a091 added ffmpeg downloading for mono 2013-10-12 23:39:22 -04:00
Luke Pulverenti
3cb57db7fe fixes #564 - Enforce CanSeek and QueueableMediaTypes 2013-10-11 09:47:38 -04:00
Luke Pulverenti
15046e5703 tv metadata fixes 2013-10-10 12:55:07 -04:00
Luke Pulverenti
9663252d10 remove mutex from mono startup 2013-10-07 23:06:12 -04:00
Luke Pulverenti
a90908f0f7 update service text in wizard 2013-10-07 14:22:31 -04:00
Luke Pulverenti
3f1cafdc81 updated nuget 2013-10-06 20:49:33 -04:00
Luke Pulverenti
bd5bf32aba fix web socket message name for library change 2013-10-06 14:48:04 -04:00
Luke Pulverenti
478be44dd6 create platform-specific network manager implementation 2013-10-05 13:13:32 -04:00
Sumit Maitra
53d0e52860 First successful Mono build on OSX 2013-10-05 03:10:54 +01:00
Luke Pulverenti
54a5d63a61 mono fixes 2013-10-04 16:08:45 -04:00
Luke Pulverenti
c9345179db fix ambiguous method call 2013-10-04 15:48:31 -04:00
Luke Pulverenti
fe2eb6cb01 fixes #573 - Support media info for intros 2013-10-04 13:04:18 -04:00