105 Commits

Author SHA1 Message Date
Richard Cordovano
8e4d7e2c4f Merge in develop branch 2017-09-07 11:17:51 -04:00
Eugene Livis
160a241780 Pulling commons-io version 2.5 instead of 2.4 2017-08-24 14:19:37 -04:00
U-BASIS\dgrove
70339153e1 Sync 2017-08-16 11:44:14 -04:00
U-BASIS\dgrove
72e0c9d7fd Updated JAR versions, and fixed compatibility issues. 2017-05-04 14:58:17 -04:00
millmanorama
b502f0d2fc Merge remote-tracking branch 'upstream/rc-280' into 2371-RecentActivity
# Conflicts:
#	.gitignore
#	CoreLibs/build.xml
2017-04-12 12:12:50 +02:00
millmanorama
07405e3d57 cleanup CoreLibs/build.xml 2017-04-11 18:02:02 +02:00
millmanorama
a3195e8fe5 fix build, don't have anything checked into release 2017-04-11 17:36:23 +02:00
millmanorama
f68a85022c move Bootstrapping Ivy into its own script. move pasco and rr to thirdparty and copy to release on build 2017-04-07 11:37:28 +02:00
millmanorama
c0db3bdcc7 Merge remote-tracking branch 'upstream/develop' into 2371-minimize-installer-Core
# Conflicts:
#	.gitignore
2017-04-05 17:37:42 +02:00
millmanorama
7765a8d806 copy InternalPythonModules and photorec_exec to release, remove mactime from repo 2017-03-31 16:37:02 +02:00
millmanorama
38619c1ce2 comments and formatting in build.xml files 2017-03-31 15:22:55 +02:00
millmanorama
d91784aced delete modules/ext for suite, corelibs, and KWS on clean 2017-03-31 15:22:52 +02:00
millmanorama
9f09858f53 refresh accounts when manual search adds results. upgrade to guava 19 so we can make handlers default access 2016-10-19 14:55:04 +02:00
millmanorama
4514ed2ed4 move commons-csv to CoreLibs 2016-09-07 16:21:59 +02:00
millmanorama
06efd34f8c updating version check in build.xml and updating to ControlsFX 8.40.11 to allow building against java 8u101/2 2016-08-22 14:02:52 +02:00
Richard Cordovano
086e823f7f Resolve NBM dependency warnings for NetBeans 8.1 2016-05-27 16:22:42 -04:00
jmillman
c55c42c99d minor comments FilteredEventsModel.java and ivy.xml 2016-04-28 15:53:54 -04:00
jmillman
7f68b8bf50 finish the filters part of snapshot_template.html; remove getHTMLReportString 2016-04-27 11:55:57 -04:00
jmillman
cbb01b9ace begin using mustache.java to improve snapshot report 2016-04-27 11:55:51 -04:00
Richard Cordovano
3c7c30c032 Update NBM versioning for release 4.1.0 2016-03-27 16:23:33 -04:00
Richard Cordovano
6d4c8a9c45 Add missing versioning values for CoreLibs and ScalpelCarver NBMs 2016-03-27 16:07:40 -04:00
Nick Davis
221fe47b3b Merge branch 'develop' of github.com:sleuthkit/autopsy into 1501-ja-corelibs 2016-02-02 14:42:53 -05:00
Kay Bassi
d0fe76a562 Finished translation/editing 2016-02-01 15:38:32 -08:00
Richard Cordovano
5695b05871 Update source level to 1.8 for lagging NBMs 2016-01-30 15:02:16 -05:00
jmillman
cea9c281f8 upgrade twelvemonkeys to 3.2 to fix at least one bug (reading png/favicons) 2015-12-08 12:41:11 -05:00
jmillman
1996b44d6b remove unneeded shim class 2015-11-30 12:31:06 -05:00
jmillman
d5e40a7e87 update to ControlsFx 8.40.10; use masker pane as progress indicator 2015-11-30 12:21:12 -05:00
Richard Cordovano
ee8fa5b3a2 Deprecate the JavaFX shim 2015-10-22 10:06:42 -04:00
jmillman
849919ae72 add com.sun.javafx.Utils shim class. requires Java 8u60 2015-10-21 16:19:05 -04:00
Richard Cordovano
8b73207378 Merge remote-tracking branch 'upstream/develop' into collaborative 2015-10-07 16:38:45 -04:00
Richard Cordovano
8cfcba8875 Remove Apache Curator dependency from Autopsy 2015-10-07 16:32:10 -04:00
jmillman
ddfe4381a3 minor cleanup
- improve comments
- rename DescriptionLOD to DescriptionLoD
- use new isActive proprty
- rename quick hide mask to quick hide filter
- remove un used class FiltersChangedEvent
2015-10-01 16:08:44 -04:00
Richard Cordovano
3c46575f98 Merge remote-tracking branch 'upstream/develop' into collaborative 2015-09-30 16:37:25 -04:00
jmillman
4575902791 Merge branch 'cleanup_new_clustering' into TL_quick_hide
Conflicts:
	Core/src/org/sleuthkit/autopsy/timeline/datamodel/EventBundle.java
	Core/src/org/sleuthkit/autopsy/timeline/datamodel/EventCluster.java
	Core/src/org/sleuthkit/autopsy/timeline/datamodel/EventStripe.java
	Core/src/org/sleuthkit/autopsy/timeline/datamodel/FilteredEventsModel.java
	Core/src/org/sleuthkit/autopsy/timeline/db/SQLHelper.java
	Core/src/org/sleuthkit/autopsy/timeline/filters/DescriptionFilter.java
	Core/src/org/sleuthkit/autopsy/timeline/filters/Filter.java
	Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/DetailViewPane.java
	Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/EventDetailChart.java
	Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/EventStripeNode.java
	Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/tree/EventDescriptionTreeItem.java
	Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/tree/EventTypeTreeItem.java
	Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/tree/NavPanel.java
	Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/tree/NavTreeItem.java
	Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/tree/RootItem.java
	Core/src/org/sleuthkit/autopsy/timeline/zooming/DescriptionLOD.java
	CoreLibs/nbproject/project.xml
2015-09-30 12:57:59 -04:00
jmillman
d3a589ec30 export the rest of guava 2015-09-28 16:25:24 -04:00
millmanorama
b21d0412b0 fix path to guava jar 2015-09-28 16:19:46 -04:00
jmillman
1065d13536 single cluster WIP 2015-09-28 16:16:39 -04:00
millmanorama
dd31799cb8 fix path to guava jar 2015-09-24 15:55:57 -04:00
jmillman
874703030d single cluster WIP 2015-09-15 10:14:39 -04:00
Richard Cordovano
494a5331be Resolve develop branch conflict 2015-09-14 13:53:14 -04:00
jmillman
fc9073d23c upgrade to jfxtras r4 2015-09-09 12:53:12 -04:00
esaunders
764e5c08e0 Replaced ZooKeeper with Curator 2015-09-03 16:56:32 -04:00
Richard Cordovano
6577d163aa Merge pull request #1552 from karlmortensen/newlockmethod
new lock method using zookeeper
2015-09-01 12:45:26 -04:00
Karl Mortensen
612a5595cb new lock method using zookeeper 2015-08-28 16:15:24 -04:00
jmillman
ca1c116b1c cleanup 2015-08-26 11:36:27 -04:00
jmillman
ba82a1ca89 WIP to have visualizations update dynamically (without full db query) as tags are added/removed 2015-08-12 15:29:13 -04:00
Karl Mortensen
332a08f07d Bulk format code with new settings 2015-08-07 13:23:40 -04:00
jmillman
e5f08dd7da Merge branch 'develop' into update_jfxtras
Conflicts:
	CoreLibs/ivy.xml
	CoreLibs/nbproject/project.xml
2015-07-27 17:17:56 -04:00
jmillman
fd0718ca7f update JFXtras to 8.0-r3 resolved some bugs with the date/time pickers 2015-07-22 16:43:11 -04:00
jmillman
7654604526 use twelevemonkeys library to decode lots more image formats and update the media viewers to display them.
refactor ImageUtils and prepare to base the image Gallery ThumbnailCache on it
use the FileTypeDetector in media viewer
2015-07-09 16:54:42 -04:00