0xb00bface cdf582ad8f Merge branch 'dev' into v4 ... # Conflicts: # client/src/main/java/ctbrec/ui/action/CheckModelAccountAction.java # client/src/main/java/ctbrec/ui/controls/SearchPopoverTreeList.java # client/src/main/java/ctbrec/ui/sites/camsoda/CamsodaShowsTab.java # client/src/main/resources/logback.xml # common/src/main/java/ctbrec/recorder/NextGenLocalRecorder.java # server/src/main/resources/logback.xml		2021-01-09 15:59:31 +01:00
..
action	Merge branch 'dev' into v4	2021-01-09 15:59:31 +01:00
controls	Merge branch 'dev' into v4	2021-01-09 15:59:31 +01:00
event	Start event system immediately after start	2020-08-21 15:57:22 +02:00
news	Revert "Use CompletableFuture.runAsync instead of creating new Threads"	2020-12-31 14:37:01 +01:00
settings	Merge branch 'dev' into v4	2021-01-09 15:59:31 +01:00
sites	Merge branch 'dev' into v4	2021-01-09 15:59:31 +01:00
tabs	Merge branch 'dev' into v4	2021-01-09 15:59:31 +01:00
AutosizeAlert.java	Apply stylesheet to all dialogs	2019-05-01 10:49:15 +02:00
CamrecApplication.java	Merge branch 'dev' into v4	2021-01-09 15:59:31 +01:00
ClipboardListener.java	Change context menu behavior to make sense with bookmarked models	2021-01-09 12:45:38 +01:00
DesktopIntegration.java	Fix potential NPE in DesktopIntegration.notifyLinux	2020-12-21 12:30:29 +01:00
ExternalBrowser.java	Store minimal browser config in ctbrec's config dir	2020-12-06 17:59:56 +01:00
FileDownload.java	Fix recording downloads from server to client	2019-12-21 14:30:57 +01:00
InstantProperty.java	Add columns "last recorded" and "last seen" to models table	2020-01-05 16:02:22 +01:00
JavaFxModel.java	Add "record later" tab to "bookmark" models	2021-01-03 18:37:21 +01:00
JavaFxRecording.java	Fix update of associated files in GUI	2020-10-03 19:00:20 +02:00
Launcher.java	Update Java class with newer Java versions	2020-06-30 20:45:24 +02:00
PauseIcon.java	Improve recording PausedIndicator	2020-11-21 18:43:57 +01:00
Player.java	Rename StreamRedirectThread to StreamRedirector	2020-10-31 15:10:44 +01:00
PreviewPopupHandler.java	Revert "Use CompletableFuture.runAsync instead of creating new Threads"	2020-12-31 14:37:01 +01:00
SiteUI.java	Move ConfigUI interface from common module to client	2020-06-12 18:25:28 +02:00
SiteUiFactory.java	Adjust MVLive code to API changes	2020-06-14 15:12:51 +02:00
StreamSourceSelectionDialog.java	Revert "Use CompletableFuture.runAsync instead of creating new Threads"	2020-12-31 14:37:01 +01:00
TipDialog.java	Revert "Use CompletableFuture.runAsync instead of creating new Threads"	2020-12-31 14:37:01 +01:00
TokenLabel.java	Revert "Use CompletableFuture.runAsync instead of creating new Threads"	2020-12-31 14:37:01 +01:00
UiUtils.java	Ignore menu item action if mouse exited the menu item	2021-01-03 13:00:05 +01:00
UnicodeEmoji.java	Improve UI features for time limited recordings	2020-12-21 18:53:34 +01:00