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

696 Commits

Author SHA1 Message Date
Bond_009
838e5d05d5 Document all public/internal members of Emby.Drawing 
Forces all new public/internal members to be documented.
Enables TreatWarningsAsErrors for Emby.Drawing
 2019-08-11 16:52:37 +02:00
Bond_009
7243689215 Minor improvements 2019-08-11 15:57:36 +02:00
Bond_009
5eaf5465a5 Check checksum for plugin downloads 
* Compare the MD5 checksum when downloading plugins
* Reduced log spam due to http requests
* Removed 'GetTempFileResponse' function from HttpClientManager
* Fixed caching for HttpClientManager
 2019-08-11 15:54:58 +02:00
dkanada
1ad67e223f
Merge pull request #1462 from Bond-009/installationmanager 
Improvements to InstallationManager
 2019-08-11 03:47:10 -07:00
Bond_009
2a58c643d2 Fix more warnings 2019-08-09 23:16:24 +02:00
Bond_009
ddd1a282ea Remove IpAddressInfo and IpEndPointInfo classes 2019-07-25 00:15:06 +02:00
Bond-009
e8028de4d7
Merge pull request #1560 from jellyfin/release-10.3.z 
Backmerge for 10.3.7
 2019-07-24 19:10:04 +02:00
Joshua M. Boniface
cf2f5b2026
Merge pull request #1538 from joshuaboniface/epg 
Try to fix XmlTvListingsProvider
 2019-07-14 17:09:00 -04:00
Bond_009
b294b802a8 Try to fix XmlTvListingsProvider 2019-07-13 17:18:27 -04:00
Bond_009
b1bd062709 Properly set content type 2019-07-13 17:12:06 -04:00
Bond-009
82f041d050
Merge branch 'master' into release-10.3.z 2019-07-06 23:08:52 +02:00
Bond_009
5fc4ad6c4e Address comments 2019-07-06 20:04:45 +02:00
Bond_009
3603c64fa6 Use HttpResponseHeaders instead of a dictionary 2019-07-06 20:04:45 +02:00
Bond_009
d405a400aa Fixes issues with HttpClientManager 2019-07-06 20:04:42 +02:00
Claus Vium
7eb94e9674 Update MediaBrowser.Common/Net/IHttpClient.cs 
Co-Authored-By: Bond-009 <bond.009@outlook.com>
 2019-06-18 22:21:07 -04:00
Bond-009
0a5550b13d Remove more unused stuff 2019-06-18 22:20:34 -04:00
Bond-009
067200be83 Remove usage of depricated 'WebRequest' 
Ref: https://docs.microsoft.com/en-us/dotnet/api/system.net.webrequest?view=netframework-4.7.2
 2019-06-17 19:35:05 -04:00
Bond_009
65a0ca2f32 Improvements to InstallationManager 2019-06-14 18:38:14 +02:00
Anthony Lavado
d4a42a1680
Merge pull request #1080 from Bond-009/httpclient 
Remove usage of deprecated 'WebRequest'
 2019-06-14 09:19:56 -04:00
Bond-009
d9c159122f
Merge pull request #1229 from voodoos/cleanup/SocketSharp 
Cleaning WebSocketSharp continued
 2019-05-09 17:16:51 +02:00
Bond-009
a8da122fb3
Merge pull request #1252 from jellyfin/release-10.3.z 
Backmerge release 10.3.0
 2019-04-20 12:25:29 +02:00
Bond-009
8f703f4744 Remove unused event 
Release builds were failing because of this unused event.
 2019-04-18 13:19:16 +02:00
Joshua Boniface
ca3bb308b3 Add the proper Class too 2019-04-17 22:46:26 -04:00
VooDooS
ba12d96d23 Removed wrapping of HeaderNames fields 2019-04-12 15:25:18 +02:00
VooDooS
5f6ab836de Extend Microsoft.Net.Http.Headers.HeaderNames 2019-04-11 15:35:06 +02:00
Claus Vium
be86ea2982
Update MediaBrowser.Common/Net/IHttpClient.cs 
Co-Authored-By: Bond-009 <bond.009@outlook.com>
 2019-03-27 16:34:56 +01:00
Bond-009
d0fbd260d5
Merge branch 'master' into httpclient 2019-03-27 16:34:26 +01:00
Bond-009
b44a70ff36 Simplify/remove/clean code 
* Remove useless runtime check (we only support one)
* Remove unused args
* Remove a global constant

And ofc fix some warnings ;)
 2019-03-25 22:25:32 +01:00
Bond_009
764c901cd7 Fix exception caused by #1096 
```cs
MediaBrowser.Common.Extensions.ResourceNotFoundException: Configuration
with key subtitles not found.
   at
   Emby.Server.Implementations.AppBase.BaseConfigurationManager.<>c__DisplayClass42_0.<GetConfiguration>b__0(String
   k) in
   /home/pi/dev/jellyfin/Emby.Server.Implementations/AppBase/BaseConfigurationManager.cs:line
   247
      at
      System.Collections.Concurrent.ConcurrentDictionary`2.GetOrAdd(TKey
      key, Func`2 valueFactory)
         at
	 Emby.Server.Implementations.AppBase.BaseConfigurationManager.GetConfiguration(String
	 key) in
	 /home/pi/dev/jellyfin/Emby.Server.Implementations/AppBase/BaseConfigurationManager.cs:line
	 238
	    at
	    MediaBrowser.Providers.MediaInfo.FFProbeVideoInfo.AddExternalSubtitles(Video
	    video, List`1 currentStreams, MetadataRefreshOptions
	    options, CancellationToken cancellationToken) in
	    /home/pi/dev/jellyfin/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs:line
	    486
	       at
	       MediaBrowser.Providers.MediaInfo.FFProbeVideoInfo.Fetch(Video
	       video, CancellationToken cancellationToken, MediaInfo
	       mediaInfo, BlurayDiscInfo blurayInfo,
	       MetadataRefreshOptions options) in
	       /home/pi/dev/jellyfin/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs:line
	       204
	          at
		  MediaBrowser.Providers.MediaInfo.FFProbeVideoInfo.ProbeVideo[T](T
		  item, MetadataRefreshOptions options,
		  CancellationToken cancellationToken) in
		  /home/pi/dev/jellyfin/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs:line
		  119
		     at
		     MediaBrowser.Providers.Manager.MetadataService`2.RunCustomProvider(ICustomMetadataProvider`1
		     provider, TItemType item, String logName,
		     MetadataRefreshOptions options, RefreshResult
		     refreshResult, CancellationToken cancellationToken)
		     in
		     /home/pi/dev/jellyfin/MediaBrowser.Providers/Manager/MetadataService.cs:line
		     806

```
 2019-03-15 17:34:15 +01:00
Vasily
11fde02035
Merge pull request #1105 from ploughpuff/ratelimit 
Only delay making MusicBrainz request if necessary
 2019-03-15 16:01:55 +03:00
PloughPuff
d125fbc43d Added contact email to user agent 
MusicBrainz request a contact email address is supplied in comment section of user agent field.
 2019-03-14 21:34:09 +00:00
Erwin de Haan
21cc38fcf4 Adjusted AssemblyCopyright attribute values. 2019-03-14 22:17:56 +01:00
Erwin de Haan
ee7bf86e0f Adjusted the Product Name so the User Agent is correct/better. 2019-03-14 22:11:47 +01:00
Vasily
297f25cfc2
Merge pull request #1059 from Bond-009/os 
Remove EnvironmentInfo
 2019-03-13 00:01:00 +03:00
Joshua Boniface
3c4043199a Implement review feedback 2019-03-12 09:18:45 -04:00
Joshua Boniface
132ce3ece1 Add further resources to complete WebPath 2019-03-10 17:04:18 -04:00
Bond-009
7f42dcc60f Remove more unused stuff 2019-03-08 20:32:14 +01:00
Bond-009
369785c184 Remove usage of depricated 'WebRequest' 
Ref: https://docs.microsoft.com/en-us/dotnet/api/system.net.webrequest?view=netframework-4.7.2
 2019-03-08 20:17:17 +01:00
Bond-009
decaffed86 Remove EnvironmentInfo 
This moved the last bit of usefulness of EnvironmentInfo into a static
class.
 2019-03-07 22:41:41 +01:00
Claus Vium
0abe57e930 Merge remote-tracking branch 'remotes/upstream/master' into kestrel_poc 2019-03-07 20:16:51 +01:00
Claus Vium
8c609bc9ce Reduce aspnet imports 2019-03-07 19:04:09 +01:00
Claus Vium
78742b8e4c Switch to HeaderNames instead of hardcoded strings (and other header related fixes) 2019-03-05 19:20:28 +01:00
Claus Vium
318e0d4a24 Add GetValueOrDefault dictionary extension 2019-03-05 10:27:25 +01:00
Xu Fasheng
cbd0e71c07 Send DLNA devices message to only the matched interface 
This will be the right way for multiple interfaces, or the client will
receive all devices message with different IP addresses and could not
detect which one could access.

And provide one option DlnaOptions.SendOnlyMatchedHost to fallback to old
behaviour if this commit missed something.
 2019-02-22 20:18:34 +08:00
Xu Fasheng
cf4e64f430 Add option to toggle if ignore virtual interfaces 
Some VPN like ZerotierOne owns IP address but no gateway, and there is no
good idea in NetworkManager.GetIPsDefault() to filter such virtual interfaces,
so just provide one option to let user decide it.
 2019-02-22 20:13:17 +08:00
Bond_009
77a5617774 Removed remaining self-update code 2019-02-18 16:57:08 +01:00
Bond_009
81a8ebde22 Move to Microsoft.Extensions.DependencyInjection 
This PR replaces SimpleInjector with
Microsoft.Extensions.DependencyInjection.
 2019-02-12 20:52:23 +01:00
Bond_009
51edd5d067 Reworked LocalizationManager to load data async 2019-01-27 10:36:05 +01:00
Erwin de Haan
d1a0497f55 Revert "Merge pull request #452 from Bond-009/activitydb" 
This reverts commit 48ad18d12b, reversing
changes made to fe197415ca.
 2019-01-25 23:32:06 +01:00
Bond_009
905a253ff5 Suffix async methods with Async 2019-01-23 19:09:34 +01:00
Bond_009
8d9428ebdc Ensure DB exists 2019-01-23 18:34:34 +01:00
Andrew Rabert
8de4eb7d19 Rename ApplicationSemanticVersion to ApplicationVersion 2019-01-19 21:35:33 -05:00
Andrew Rabert
8a5198e6a3 Remove ApplicationVersion 2019-01-19 21:34:47 -05:00
Erwin de Haan
924ec0c191 Revert Jellyfin.Versioning, Update all versions and user agents. 2019-01-20 01:12:44 +01:00
Erwin de Haan
bb8df8dfa0 Updates reported version in System/Info* set of endpoints. 
Added ProductName and ServerVersion to API.

Added build version and build step. Addressed issues wtih indentation.

Made the BuildVersion an actual object. This lets up link to the github page of that commit.

Fixed class method type and styled link.

Fixed languages and split out the information in the UI.

Moved update-version script and gave it executable permissions. Windows correctly finds the .bat file. And linux takes the one without extension.

Removed tempfiles from replace sessions from csproj.

Updated version generation scripts. Will also work with pre existing version files. (Source tarballs etc.)

Added simple replace for ssh github links.

Add execute rights to update-version.

Wrapped long line in ApplicationHost.cs

Fixed some small issues.

Fixed some small issues, and flipped some if's around.

Converted parameter names to camelBack casing.

Sealed the attribute class.

Removed MPLv2 license.

Fixed file headers.

Added newline.

Moved links in *.csproj files as well.

Fix issues caused by rebase auto merging.

Removed default constructor and added init values to properties, also hid the Remote value form API.
 2019-01-20 00:28:48 +01:00
Erwin de Haan
c5430f86b0 Fixed csproj and xml identation. 2019-01-19 15:01:16 +01:00
Erwin de Haan
38f96af079 Reformat JustAMan review pt2 changes 
Refs #575
 2019-01-17 20:24:39 +01:00
Erwin de Haan
49b61f238e Merge branch 'dev' into reformat 
# Conflicts:
#	Emby.Server.Implementations/ApplicationHost.cs
#	Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
#	Emby.Server.Implementations/LiveTv/LiveTvManager.cs
#	Emby.Server.Implementations/Security/MBLicenseFile.cs
#	Emby.Server.Implementations/Security/PluginSecurityManager.cs
#	Emby.Server.Implementations/Security/RegRecord.cs
#	MediaBrowser.Api/PluginService.cs
#	MediaBrowser.Api/System/SystemService.cs
#	MediaBrowser.Common/Security/IRequiresRegistration.cs
#	MediaBrowser.Common/Security/ISecurityManager.cs
#	MediaBrowser.Common/Security/PaymentRequiredException.cs
#	MediaBrowser.Model/Entities/MBRegistrationRecord.cs
#	MediaBrowser.Model/Entities/PluginSecurityInfo.cs
#	deployment/win-generic/build-jellyfin.ps1
 2019-01-15 17:34:39 +01:00
Claus Vium
eca3c099d9 removed a bunch of validation, security, registration, premiere, whatever bs 2019-01-15 16:48:21 +01:00
Erwin de Haan
e867446437 ReSharper format: conform inline 'out' parameters. 2019-01-13 21:46:33 +01:00
Erwin de Haan
65bd052f3e ReSharper conform to 'var' settings 2019-01-13 21:37:13 +01:00
Erwin de Haan
a36658f6f0 ReSharper Reformat: Properties to expression bodied form. 2019-01-13 21:31:14 +01:00
Erwin de Haan
089ad8e7c2 Find+Sed BOM removal *.xml,*.csproj,*,json,*.sln,*.txt 2019-01-13 21:10:15 +01:00
Erwin de Haan
ba610b5094 Find+Sed BOM removal *.cs: Jellyfin.Server-MediaBrowser.Controller 2019-01-13 21:01:16 +01:00
Erwin de Haan
742bef5b5f EditorConfig reformat: Non-CS files. 2019-01-13 20:45:51 +01:00
Erwin de Haan
51ed47f4c4 EditorConfig reformat: Emby.XmlTv, Jellyfin.Server. MediaBrowser.Api, MediaBrowser.Common 2019-01-13 20:30:41 +01:00
Erwin de Haan
106d1d18ed Visual Studio Reformat: MediaBrowser.Common 2019-01-13 20:25:11 +01:00
Joshua M. Boniface
9dcaafe700 Merge pull request #458 from EraYaN/code-cleanup 
Clean up several minor issues and add TODOs
 2019-01-13 12:14:53 -05:00
Bond_009
3a2a0fbfe8 Add more NuGet metadata properties 
Remove old nuspec files
 2019-01-13 11:57:33 +01:00
Erwin de Haan
e2751d42e8 Merge branch 'dev' into code-cleanup 2019-01-11 12:50:36 +01:00
Joshua M. Boniface
15c89d281e Merge pull request #506 from hawken93/linting 
Removing tabs and trailing whitespace
 2019-01-10 19:54:18 -05:00
Erwin de Haan
ec1f5dc317 Mayor code cleanup 
Add Argument*Exceptions now use proper nameof operators.

Added exception messages to quite a few Argument*Exceptions.

Fixed rethorwing to be proper syntax.

Added a ton of null checkes. (This is only a start, there are about 500 places that need proper null handling)

Added some TODOs to log certain exceptions.

Fix sln again.

Fixed all AssemblyInfo's and added proper copyright (where I could find them)

We live in *current year*.

Fixed the use of braces.

Fixed a ton of properties, and made a fair amount of functions static that should be and can be static.

Made more Methods that should be static static.

You can now use static to find bad functions!

Removed unused variable. And added one more proper XML comment.
 2019-01-10 20:38:53 +01:00
hawken
bd169e4fd4 remove trailing whitespace 2019-01-07 23:27:46 +00:00
Bond_009
e1379610e5 Ground work to get plugins functional again 2019-01-07 16:58:33 +01:00
Anthony Lavado
f2fedb9f34 Merge pull request #383 from Bond-009/unused 
Remove firebase and empty resource config file
 2019-01-05 23:06:08 +00:00
Bond_009
391b48614d Remove FireEventIfNotNull 
It's a pretty useless "helper" class
 2019-01-05 01:49:52 +03:00
Joshua M. Boniface
89a3db9346 Merge pull request #286 from Bond-009/cleanup 
Clean up HttpClientManager, LiveTvManager and InstallationManager
 2019-01-03 14:00:16 -05:00
Bond_009
db62648510 Remove firebase and empty resource config file 2019-01-03 19:51:18 +01:00
Bond_009
a1b96a3135 Clean up HttpClientManager, LiveTvManager and InstallationManager 2019-01-03 18:24:26 +01:00
Anthony Lavado
a06a5c8d18 Merge branch 'dev' into project-updates 2019-01-02 14:02:48 -05:00
Bond_009
3fa751e9bb Remove CheckForApplicationUpdate function 2019-01-02 18:13:18 +01:00
Bond_009
40563dc6cc Remove GitHub updater and don't trow exception in release 2019-01-02 17:09:40 +01:00
Bond_009
3a65fb1da2 Remove obsolete GetMBId 2019-01-02 17:58:44 +03:00
Anthony Lavado
87812d1e7f Fix spacing to C#/Visual Studio standards 
- This is a fix automatically applied by Visual Studio
 2019-01-02 01:22:21 -05:00
Bond_009
c99b45dbe0 Remove some warnings 2019-01-02 02:35:40 +03:00
Bond_009
ea4c914123 Fix exception logging 2018-12-30 22:44:39 +01:00
Bond_009
0f8b3c6347 Use Microsoft.Extensions.Logging abstraction 2018-12-30 22:44:38 +01:00
Andrew Rabert
a86b71899e Add GPL modules 2018-12-27 18:27:57 -05:00
stefan
48facb797e Update to 3.5.2 and .net core 2.1 2018-09-12 19:26:21 +02:00
Luke Pulverenti
5207067811 fix live tv over dlna 2017-11-29 15:50:18 -05:00
Luke Pulverenti
39f20fdb4e update dlna profiles 2017-11-27 14:10:05 -05:00
Luke Pulverenti
2f758676d0 support sharing m3u tuner streams 2017-11-14 02:41:21 -05:00
Luke Pulverenti
ca2e7a4195 deprecate localized guids config switch 2017-10-26 23:49:56 -04:00
Luke Pulverenti
b54046a6de adjust header values 2017-10-22 19:36:22 -04:00
Luke Pulverenti
c2361db772 separate encoding from content type values 2017-10-22 19:27:09 -04:00
Luke Pulverenti
060215143f improve httpclient resource disposal 2017-10-20 12:16:56 -04:00
Luke Pulverenti
1122835688 3.2.32.14 2017-09-30 15:51:55 -04:00
Luke Pulverenti
4ceb9eb6c5 update restart function 2017-09-09 14:51:24 -04:00
Luke Pulverenti
49b799adbe 3.2.30.8 2017-09-05 15:49:02 -04:00
Luke Pulverenti
780b761456 3.2.29.2 2017-08-28 12:41:32 -04:00
Luke Pulverenti
e441e2f53d update active recordings 2017-08-24 15:52:19 -04:00
Luke Pulverenti
1ad990ad72 update live tv data transfer 2017-08-19 15:43:35 -04:00
Luke Pulverenti
f0507b644d update connect exceptions 2017-07-22 18:57:22 -04:00
Luke Pulverenti
1e5c3db9eb support individual library refreshing 2017-06-23 12:04:45 -04:00
Luke Pulverenti
6ff89eab78 fixes #2588 - OpenSubtitlesDownloader doesn't respect X-Ratelimit-Requests-Remaining 2017-06-22 15:14:58 -04:00
Luke Pulverenti
7fcd14f4fb update the updater 2017-06-10 12:38:18 -04:00
Luke Pulverenti
42d0b070b4 update project files 2017-06-04 17:08:56 -04:00
Luke Pulverenti
33014f77aa update GetItems method 2017-05-26 02:48:54 -04:00
Luke Pulverenti
404171023f clean up build configs 2017-05-16 01:44:06 -04:00
Luke Pulverenti
34c5aab607 3.2.12.2 2017-04-09 21:51:36 -04:00
Luke Pulverenti
b9c12ca4a7 update legacy stream 2017-03-02 23:36:20 -05:00
Luke Pulverenti
8deb423883 restore config settings for now 2017-02-08 13:50:33 -05:00
Luke Pulverenti
2ef30a3ba8 update program titles 2017-01-21 15:27:07 -05:00
Luke Pulverenti
8c8f2aaba5 first pass at binding to multiple network addresses 2016-12-04 16:55:02 -05:00
Luke Pulverenti
65a1ef020b move sync repository to portable project 2016-11-19 00:52:49 -05:00
Luke Pulverenti
0e9cd51f9c update .net core startup 2016-11-13 16:04:21 -05:00
Luke Pulverenti
00cbadea2c update core project 2016-11-11 02:24:36 -05:00
Luke Pulverenti
a8b340cbb2 update portable projects 2016-11-08 13:44:23 -05:00
Luke Pulverenti
72aaecb279 move classes to new server project 2016-11-04 14:56:47 -04:00
Luke Pulverenti
13dcb5abb1 fix projects 2016-11-03 17:04:55 -04:00
Luke Pulverenti
8fd3bf4217 change pcl's to .netstandard 2016-11-03 15:07:48 -04:00
Luke Pulverenti
b0ff307d0c remove json lock files 2016-10-31 22:21:38 -04:00
Luke Pulverenti
345ad10665 don't buffer responses by default 2016-10-31 14:39:41 -04:00
Luke Pulverenti
3bf72b71b3 consolidate internal interfaces 2016-10-31 00:28:23 -04:00
Luke Pulverenti
dca78b1341 rework dlna project 2016-10-29 18:22:20 -04:00
Luke Pulverenti
049dca644d add more to .net core solution 2016-10-25 23:59:51 -04:00
Luke Pulverenti
ef6b90b8e6 make controller project portable 2016-10-25 15:02:04 -04:00
Luke Pulverenti
dbb43771f3 update model project targeting 2016-10-23 22:42:19 -04:00
Luke Pulverenti
2af3ec43d5 make common project portable 2016-10-23 19:49:13 -04:00
Luke Pulverenti
0f8ccfaf49 prep for portable common 2016-10-23 15:47:34 -04:00
Luke Pulverenti
07791d46a5 rework scheduled tasks in preparation of common project going portable 2016-10-23 15:14:57 -04:00
Luke Pulverenti
2d91058b0d remove targeting overrides 2016-10-22 15:28:40 -04:00
Luke Pulverenti
c7f559f8ce make model project portable 2016-10-21 22:08:34 -04:00
Luke Pulverenti
5cd3276775 pass requested fields to data layer 2016-10-08 01:57:38 -04:00
Luke Pulverenti
a69ca6c55b avoid buffering http responses 2016-10-06 14:55:01 -04:00
softworkz
23da61281e Reduced compiler warnings. No functional changes (except MediaEncoder.cs and AutomaticRestartEntryPoint.cs) 2016-08-05 23:15:48 +02:00
Luke Pulverenti
4f32b57e58 update buffer sizes 2016-07-27 13:11:25 -04:00
Luke Pulverenti
c90a30a0fe add safeguard on interval trigger duration 2016-07-12 13:16:34 -04:00
Luke Pulverenti
37d7db4bc4 support xmltv gzip 2016-06-15 22:37:06 -04:00
Luke Pulverenti
ae2b6ddf39 update text 2016-05-12 15:21:43 -04:00
Sven Van den brande
168587b2a0 Remove unused code... 2016-03-27 23:11:27 +02:00
Luke Pulverenti
22730746eb ipv6 update 2016-03-25 01:39:49 -04:00
Luke Pulverenti
52a42229cd update sync task 2016-03-20 23:04:44 -04:00
Luke Pulverenti
6cb1f77789 update upgrade process 2016-02-03 15:52:45 -05:00
Luke Pulverenti
3268de0edf add null check to PeriodicTimer 2016-01-28 22:42:03 -05:00
Luke Pulverenti
3510ef3d2b reduce use of timers throughout the system 2016-01-28 22:40:21 -05:00
Luke Pulverenti
82b8d60720 get stable and beta server packages from github 2016-01-02 20:23:09 -05:00
Luke Pulverenti
821e824687 better caching of remote data 2016-01-02 16:54:37 -05:00
Luke
0ffc5ebace update ulna interface binding 2015-12-25 22:23:02 -05:00
Luke Pulverenti
d27cd521b5 rework dialog 2015-12-14 09:45:42 -05:00