3760 Commits

Author SHA1 Message Date
Ann Priestman
414df9fd77 Cleanup 2015-09-10 13:48:24 -04:00
Ann Priestman
063ce3da89 Merge remote-tracking branch 'upstream/collaborative' into collaborative 2015-09-10 13:45:34 -04:00
Ann Priestman
e7f6fe01b3 Cleanup 2015-09-10 13:45:24 -04:00
Ann Priestman
cd549922a5 Merge remote-tracking branch 'upstream/develop' into collaborative 2015-09-10 13:27:43 -04:00
Ann Priestman
9151c241b9 Adding manual save and load to UserPreferences 2015-09-10 13:27:14 -04:00
momo
7e89403916 generalized warning message 2015-09-10 13:23:24 -04:00
momo
e67ee808d4 adding class name to displayed message 2015-09-10 12:53:47 -04:00
momo
4f45e5c0ff use friendly warning message instead of error popup 2015-09-10 12:36:17 -04:00
jmillman
314ac85c2f add versions of doDialog that take a owner window as a paramater and use them to show the tagging dialogs over IG without bringing the main autopsy window to the front. 2015-09-10 12:28:09 -04:00
momo
a89183f863 catching and ignoring report modules with null or empty names 2015-09-10 11:27:52 -04:00
momo
3b76ec80a9 removed commented code 2015-09-09 14:04:03 -04:00
jmillman
7c0f2e8664 make members private 2015-09-09 13:58:36 -04:00
momo
bc73e4db39 fix closing if statement 2015-09-09 13:50:07 -04:00
momo
e4e46067db keeping only three makernotes with face detect tags 2015-09-09 13:33:14 -04:00
Richard Cordovano
1e5d66332a Merge remote-tracking branch 'upstream/develop' into collaborative 2015-09-09 10:14:29 -04:00
momo
af72dbab34 adding underscore between file name and item index 2015-09-09 09:42:35 -04:00
momo
871d0d30cc refactor duplication and names 2015-09-08 16:49:25 -04:00
momo
6f19fc7726 adding different child classes for each size cases 2015-09-08 14:39:40 -04:00
jmillman
478522ba3a use null check that works in SQLite and PostgreSQL 2015-08-31 14:38:56 -04:00
jmillman
f2e00216e9 WIP Merge remote-tracking branch 'upstream/develop' into temp_merge
Conflicts:
	Core/src/org/sleuthkit/autopsy/timeline/datamodel/FilteredEventsModel.java
2015-08-31 13:48:50 -04:00
Richard Cordovano
f131f9c751 Merge pull request #1540 from millmanorama/tags_filter
Tags filter
2015-08-31 10:34:05 -04:00
Richard Cordovano
5deb4bc829 Merge pull request #1545 from APriestman/sharedConfig
Added public getSavedModuleSettingsFolder to IngestJobSettings
2015-08-28 15:04:58 -04:00
Ann Priestman
6460a9bffb Added public getSavedModuleSettingsFolder to IngestJobSettings 2015-08-28 14:20:36 -04:00
Richard Cordovano
9ec19fd0f1 Merge pull request #1525 from sidheshenator/extract_archive_unknown_size
extract unknown size file content from archives
2015-08-28 13:16:18 -04:00
jmillman
4428d077ba Merge remote-tracking branch 'upstream/develop' into tags_filter
Conflicts:
	Core/src/org/sleuthkit/autopsy/timeline/Bundle.properties
	Core/src/org/sleuthkit/autopsy/timeline/TimeLineController.java
	Core/src/org/sleuthkit/autopsy/timeline/db/EventsRepository.java
2015-08-28 13:14:47 -04:00
Richard Cordovano
b1d27128fb Merge in develop and resolve conflicts 2015-08-28 13:00:50 -04:00
Richard Cordovano
fda7ea3f3d Merge pull request #1509 from millmanorama/timeline_threading_review
Timeline threading review and cleanup
2015-08-28 11:23:41 -04:00
Sidhesh Mhatre
e47fbafc52 Time zone parameter added to getDate() 2015-08-28 09:58:04 -04:00
Sidhesh Mhatre
b41c1c4175 Passed timeZone param to getDate() 2015-08-28 01:29:09 -04:00
sidheshenator
2ba62e440e face detection feature added 2015-08-27 16:28:20 -04:00
sidheshenator
36f9c94f5b explicitly provide timezone information 2015-08-27 15:38:41 -04:00
sidheshenator
80aa874a1d Merge branch 'collaborative' of https://github.com/sleuthkit/autopsy into face_detect_makernotes_exif_collab 2015-08-26 16:57:15 -04:00
jmillman
27db9dfeaa cleanup and comments 2015-08-26 16:04:24 -04:00
Richard Cordovano
fc7bd2c70c Merge remote-tracking branch 'upstream/develop' into merge-develop-8-14-15 2015-08-26 15:35:12 -04:00
Richard Cordovano
29d7fea50e Merge in upstream/collaborative, resolve conflict 2015-08-26 15:34:53 -04:00
Sidhesh Mhatre
1ba94d905c Replace ArrayList.removeAll() by ArrayList.clear() 2015-08-26 15:26:57 -04:00
Richard Cordovano
0e7222dabb Merge develop->collaborative, resolve merge conflict, compile errors 2015-08-26 14:39:59 -04:00
Richard Cordovano
f14bb5a667 Revert "Netbeans on collab" 2015-08-26 14:36:41 -04:00
jmillman
ca1c116b1c cleanup 2015-08-26 11:36:27 -04:00
jmillman
cf396e399f optimise tag name retrieval with dedicated sqlite query 2015-08-26 11:23:13 -04:00
sidheshenator
a4e3e5c2c3 icon added for TSK_FACE_DETECTED artifact 2015-08-26 11:10:38 -04:00
sidheshenator
f78b508efd add TSK_FACE_DETECTED BB artifact when face makernote data is available 2015-08-26 11:10:22 -04:00
sidheshenator
034c5e0ca1 exif makernotes data used to flags images with faces 2015-08-26 11:09:55 -04:00
jmillman
7ff8149c1e WIP to optimise tag name retrieval 2015-08-25 17:33:15 -04:00
sidheshenator
d91502f589 extract unknown size file content from archives 2015-08-25 17:07:26 -04:00
momo
24fb63fa40 removing uneeded menu items from toolbar 2015-08-25 15:28:31 -04:00
jmillman
e708a43a93 fix bug in inserting Tags into new table, cleanup in EventDB
cleanup member order in FilteredEventsModel
2015-08-25 14:46:53 -04:00
jmillman
9296507ea5 migrate away from SQLite ATTACH
- breakout tag handlers into seperate methods in FilteredEventsModel
- keep tags in new table in db
2015-08-25 13:52:06 -04:00
jmillman
dec2e51e5e WIP migrate away from SQLite ATTACH 2015-08-25 10:55:10 -04:00
jmillman
1492ae7eb2 Merge remote-tracking branch 'upstream/develop' into tags_filter_refresh_button 2015-08-25 10:18:23 -04:00