Commit Graph
20607 Commits
Author SHA1 Message Date
William Schaefer 3fda67bb22 3199 fix merge error in TagsManager where both old and new arguments were in method call 2017-11-15 12:25:18 -05:00
William Schaefer 77b874e075 3199 resolve merge conflicts from 3198 changes 2017-11-15 12:19:30 -05:00
Richard Cordovano 64c9cf8f1d Merge pull request #3194 from wschaeferB/3198-TagPropertiesUpdate
3198 tag properties update
2017-11-15 12:02:25 -05:00
Richard Cordovano 83a69b3a46 Merge pull request #3209 from millmanorama/869-daterange-filter-UI
869 daterange filter GUI
2017-11-15 12:00:34 -05:00
William Schaefer 273434f50f Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 3198-TagPropertiesUpdate 2017-11-15 11:59:44 -05:00
William Schaefer c2d0bbb932 3198 comment getTagNameDefinitions 2017-11-15 11:59:10 -05:00
Richard Cordovano 25f6f2657f Rename DataSource => AutoIngestDataSource for clarity 2017-11-15 11:55:52 -05:00
Richard Cordovano 183536c832 Merge pull request #3181 from eugene7646/archive_dsp_v2_3136
Archive DSP (3136)
2017-11-15 10:53:36 -05:00
Richard Cordovano 98b0290959 Merge remote-tracking branch 'upstream/release-4.5.1' into develop 2017-11-15 10:14:19 -05:00
Richard Cordovano 16abf6bf4c Update develpers folder contents 2017-11-15 09:41:08 -05:00
millmanorama cb4a88d5a8 Merge remote-tracking branch 'upstream/accounts_relationships' into 869-daterange-filter-UI
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/communications/MessageBrowser.java
2017-11-15 15:36:34 +01:00
Ann Priestman 143e530c32 Missed a "hash" reference 2017-11-15 09:18:03 -05:00
Ann Priestman 156970c9e5 Made reference set methods less hash-specific 2017-11-15 09:08:29 -05:00
Richard Cordovano 6dfa61718e Merge pull request #3208 from raman-bt/accounts_relationships
Address review comments.
2017-11-14 19:05:30 -05:00
William Schaefer 9b511c3c05 3202 make TagsPanelDescription large enough for text 2017-11-14 18:18:16 -05:00
William Schaefer 55efc419ab 3202 rename gui elements in TagOptionsPanel, change @messages 2017-11-14 18:16:44 -05:00
William Schaefer 9b7ada8f64 3202 remove confirmation for changing tag status in current case 2017-11-14 17:32:11 -05:00
Richard Cordovano 6d23931448 Merge pull request #3202 from dgrove727/3177_Aid10Metrics
3177 aid10 metrics
2017-11-14 16:16:52 -05:00
Raman 5b18937ec3 Address review comments. 2017-11-14 15:09:10 -05:00
Ann Priestman 8a63c5aa15 Change HashDb interface to an abstract class.
Rename SleuthkitHashSet and CentralRepoHashSet
2017-11-14 15:04:30 -05:00
Richard Cordovano 44bcd4cb04 Merge pull request #3205 from millmanorama/868-attachments
868 attachments
2017-11-14 12:49:09 -05:00
Ann Priestman 2bb24e3d4d Remove/change some public methods. 2017-11-14 11:32:19 -05:00
millmanorama 5fdf18d748 rename AccountUtils to Utils, add Utils.getUserPreferredZoneId() method 2017-11-14 17:12:55 +01:00
millmanorama f1c4792fa2 show the relationship date/time in the table according to user preferences 2017-11-14 16:57:00 +01:00
millmanorama 29237dd882 fix project.xml for LGoodDatePicker 2017-11-14 16:35:44 +01:00
millmanorama 781d2f9210 Merge remote-tracking branch 'upstream/accounts_relationships' into 869-daterange-filter-UI 2017-11-14 16:21:09 +01:00
Ann Priestman 1b272cf18c Only display valid hash sets in the ingest module settings 2017-11-14 09:26:10 -05:00
millmanorama e77be5d704 removed unused logger 2017-11-14 13:07:10 +01:00
millmanorama 30abacc9fb update Javadoc 2017-11-14 12:46:22 +01:00
millmanorama 85ea748c36 fix comment 2017-11-14 12:36:49 +01:00
millmanorama 0a8bdd9918 update javadoc to include deprecation 2017-11-14 12:30:28 +01:00
millmanorama d4ca8b1a73 fix disabling of HTML tab when there is no content 2017-11-14 11:57:30 +01:00
millmanorama c0c5383b11 only add one "messages tab"; some refactoring 2017-11-14 11:56:23 +01:00
millmanorama da7490148c Merge remote-tracking branch 'upstream/accounts_relationships' into 868-attachments 2017-11-14 10:04:30 +01:00
U-BASIS\dgrove e78980cb6e Merge 2017-11-14 02:45:19 -05:00
U-BASIS\dgrove e64e30181e Typo 2017-11-14 02:26:38 -05:00
U-BASIS\dgrove 22f023002c Fixed merge issue. 2017-11-14 02:24:24 -05:00
U-BASIS\dgrove 8934275246 Merge remote-tracking branch 'upstream/develop' into 3177_Aid10Metrics 2017-11-13 17:31:00 -05:00
U-BASIS\dgrove 556810da0e Fixed merge conflict. 2017-11-13 16:52:19 -05:00
U-BASIS\dgrove e63c7d8723 Cleanup. 2017-11-13 16:28:55 -05:00
U-BASIS\dgrove 5edea4c595 API added for getting data source content size. 2017-11-13 16:26:14 -05:00
Richard Cordovano 48123343cc Merge pull request #3192 from zhhl/3155-waitCursorInIngestInbox
3155: Busy cursor in ingest inbox
2017-11-13 14:31:17 -05:00
Ann Priestman a46d369f7e Merge remote-tracking branch 'upstream/develop' into 3139_cr_hashes 2017-11-13 14:29:48 -05:00
Ann Priestman fed52680a9 Cleanup 2017-11-13 14:28:04 -05:00
Ann Priestman 0ea88c0f68 Cleanup 2017-11-13 14:24:50 -05:00
Richard Cordovano a241a9a3c0 Merge pull request #3188 from dgrove727/3192_WaitCursor
Wait cursor set for 'Ingest Module Settings' button.
2017-11-13 14:20:18 -05:00
Ann Priestman f00ceeea27 Cleanup 2017-11-13 14:03:29 -05:00
Ann Priestman 5c2b89995e Switched around names of HashDb and HashDatabase 2017-11-13 13:56:40 -05:00
Richard Cordovano bb0f25ae02 Merge pull request #3187 from esaunders/release-4.5.1
Reduce memory consumed by keyword search hits
2017-11-13 13:26:28 -05:00
Richard Cordovano 146dacd541 Merge pull request #3180 from dgrove727/3148_AlertFiles
3148 alert files
2017-11-13 13:22:28 -05:00