6856 Commits

Author SHA1 Message Date
Ann Priestman
eaaeb3dc4d Improve speed of importing hash database in sqlite 2017-08-29 09:21:31 -04:00
Ann Priestman
2a7ff9cb4a Testing old method 2017-08-25 12:10:43 -04:00
Ann Priestman
27b0575d7d Use commit block instead of addBatch 2017-08-25 10:01:26 -04:00
Richard Cordovano
71c145fd3d Merge pull request #2999 from APriestman/2819_preventEmptyCaseOrDatasource
Prevent empty case or datasource when tagging artifacts as bad
2017-08-14 13:39:58 -04:00
Richard Cordovano
47e69bd365 Merge pull request #2983 from millmanorama/AbstractAbstractFieNode-cleanup
cleanup AbstractAbstractFileNode
2017-08-14 13:37:32 -04:00
millmanorama
360a70e5cb fix compiler warnings, make one Anonymous inner class into a lambda 2017-08-11 22:59:54 -04:00
millmanorama
153f64394b revert changing fillPropertyMap to non-static. 2017-08-11 22:48:35 -04:00
millmanorama
380ffe39d8 Merge remote-tracking branch 'upstream/develop' into AbstractAbstractFieNode-cleanup
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/datamodel/AbstractAbstractFileNode.java
#	Core/src/org/sleuthkit/autopsy/datamodel/Bundle.properties
2017-08-11 22:31:07 -04:00
Richard Cordovano
e8c2c24b9d Merge pull request #2991 from millmanorama/1936-extension-column-in-results-table
1936 extension column in results table
2017-08-11 13:42:36 -04:00
Ann Priestman
af55a3ef06 Merge remote-tracking branch 'upstream/develop' into 2819_preventEmptyCaseOrDatasource 2017-08-11 12:59:33 -04:00
Richard Cordovano
2ec2c4a929 Fix merge conflicts in DeletedContent.java 2017-08-11 12:59:04 -04:00
Ann Priestman
ba5c3b05ab Merge remote-tracking branch 'upstream/develop' into 2819_preventEmptyCaseOrDatasource 2017-08-11 12:52:52 -04:00
Richard Cordovano
e4a39f498e Merge in rc-2.8.3 branch and resolve conflicts 2017-08-11 12:43:23 -04:00
Richard Cordovano
ab313bf35a Merge pull request #2997 from APriestman/2916_moveCentralRepoPackage
Move the Central Repository in Core
2017-08-11 12:19:09 -04:00
Richard Cordovano
e7f596446d Merge pull request #2980 from wschaeferB/2663-RemoveRedundantNodeListener
2663 removed PleasewaitNodeListener as it appears to be redundant
2017-08-10 12:44:17 -04:00
Ann Priestman
0ef191fca4 Fixed installer 2017-08-10 08:38:53 -04:00
Ann Priestman
2b41238179 Move CentralRepository into Core 2017-08-09 13:39:39 -04:00
millmanorama
f4ddc6eb70 use NbBundle.Messages annotation instead of Bundle.properties file 2017-08-08 14:39:24 -04:00
millmanorama
c986e1cbe0 address codacy review, merge fixes 2017-08-08 10:15:39 -04:00
millmanorama
15ed798d96 Merge remote-tracking branch 'upstream/develop' into AbstractAbstractFieNode-cleanup
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/directorytree/DataResultFilterNode.java
2017-08-08 09:43:09 -04:00
millmanorama
6babb35258 move extension to end of prop list 2017-08-06 12:43:53 -04:00
Richard Cordovano
623d4afd7c Merge remote-tracking branch 'upstream/artifacts_are_content' into develop 2017-08-05 10:47:19 -04:00
Richard Cordovano
2cd9c10393 Merge remote-tracking branch 'upstream/release-4.4.1' into develop 2017-08-05 10:33:57 -04:00
millmanorama
1e5bcc6734 cleanup AbstractAbstractFileNode and related 2017-08-05 10:15:11 -04:00
Richard Cordovano
3310d02a60 Merge pull request #2972 from millmanorama/2803-extension-db-column
use extension column in query
2017-08-04 17:49:05 -04:00
Richard Cordovano
b5ea6c5e48 Merge pull request #2942 from APriestman/addLocalDirType
Adding local directory type
2017-08-04 16:45:46 -04:00
Richard Cordovano
c8765d54d3 Merge pull request #2981 from APriestman/2738_changeVirtualFolderIcon
Use small V on virtual directory icons
2017-08-04 14:19:55 -04:00
U-BASIS\dgrove
2c4d847a25 Updated queries. 2017-08-03 17:53:44 -04:00
U-BASIS\dgrove
13e1035e38 Syncing branch 2017-08-03 17:50:58 -04:00
U-BASIS\dgrove
191777d237 Modified queries to handle known/slack settings. 2017-08-03 17:13:53 -04:00
William Schaefer
152ff7d2d1 2850-FileTypesByMime Type tree now listens to same events as FileTypesByExt 2017-08-03 16:16:00 -04:00
Richard Cordovano
0d4a0085d5 Merge pull request #2985 from eugene7646/disk_space_2903
Disabled disk space usage check (2903)
2017-08-03 14:33:15 -04:00
Eugene Livis
782c166d53 Disabled disk space usage check. Logging disk space for debug purposes only 2017-08-03 13:45:18 -04:00
millmanorama
b6993a2546 Merge branch 'AbstractAbstractFieNode-cleanup' into 1936-extension-column-in-results-table
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/datamodel/AbstractAbstractFileNode.java
2017-08-03 12:34:42 -04:00
millmanorama
3cbef33509 fixes and cleanup in AbstractAbstractFileNode 2017-08-03 12:34:05 -04:00
millmanorama
886e63973d some cleanup in AbstractAbstractFileNode, especially using the getNameExtension method of AbstractFile 2017-08-03 12:23:48 -04:00
William Schaefer
370cb3f8c5 2884 fix copy write date and some yellow hints on modified files 2017-08-03 10:18:28 -04:00
millmanorama
239004f8d4 WIP adding extension column to results table 2017-08-03 09:05:17 -04:00
Ann Priestman
2301a4f11f Use small V on virtual directory icons 2017-08-03 08:45:40 -04:00
William Schaefer
a738937d8e 2883 Size checkbox no longer checked when field clicked 2017-08-02 18:59:44 -04:00
William Schaefer
b4a3bebac6 2883 Name search check box no longer checked when field clicked 2017-08-02 18:59:11 -04:00
William Schaefer
c4b47d8a1a 2663 removed PleasewaitNodeListener as it appears to be redundant 2017-08-02 16:30:31 -04:00
Richard Cordovano
76869627c2 Fix Views, File Types node counting threshold bug 2017-08-01 16:57:49 -04:00
Raman
a4dc97af6e 2841: Attachments are children of messages.
2692: Messages & Attachments show in DataSource tree
2017-07-31 17:25:25 -04:00
Ann Priestman
8c506f2ce3 Change parentDirectory type to SpecialDirectory. 2017-07-31 14:38:38 -04:00
Ann Priestman
a86128157e Merge remote-tracking branch 'upstream/develop' into addLocalDirType 2017-07-31 13:43:28 -04:00
Raman
4fdea244af Merge branch 'artifacts_are_content' of https://github.com/sleuthkit/autopsy into 2689_artifacts_are_content
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java
2017-07-31 12:35:26 -04:00
Raman
a29c2dc33e 2689: Artifacts are Content
- address review comments
2017-07-31 10:30:27 -04:00
millmanorama
44777dc60b use extension column in query 2017-07-28 12:51:13 +02:00
Richard Cordovano
de5d9e3629 Merge remote-tracking branch 'upstream/release-4.4.1' into develop 2017-07-27 14:21:40 -04:00