4037 Commits

Author SHA1 Message Date
Richard Cordovano
e7bb22c346 Complete merge: ExifParserFileIngestModule.java 2015-09-15 09:44:34 -04:00
Richard Cordovano
6823537a6f Merge pull request #1573 from APriestman/collaborative
Adding check that solr host name is filled in
2015-09-15 09:39:25 -04:00
Ann Priestman
d680c65cdd Adding check that solr host name is filled in 2015-09-15 08:29:46 -04:00
mhmdfy
4665a8e0c8 if getName() is empty -> error popup and don't display the module 2015-09-14 14:38:08 -04:00
Richard Cordovano
494a5331be Resolve develop branch conflict 2015-09-14 13:53:14 -04:00
Richard Cordovano
780f0fa2ce Merge pull request #1570 from mhmdfy/hashdb-null-pointer
Hashdb null pointer
2015-09-14 13:36:05 -04:00
Richard Cordovano
018a8acbc8 Merge pull request #1564 from millmanorama/IG_in_front
add versions of doDialog that take a owner window as a paramater and …
2015-09-14 13:29:09 -04:00
Richard Cordovano
092c249133 Merge pull request #1562 from millmanorama/jfxtras_r4
upgrade to jfxtras r4
2015-09-14 13:26:11 -04:00
mhmdfy
318fa6e488 add getTotalJobs back to startUp() for more insurance 2015-09-14 12:20:01 -04:00
momo
e3da44aacf remove redundant code 2015-09-11 16:07:17 -04:00
momo
9d5470d93a create a new jobs total for each job 2015-09-11 16:06:16 -04:00
momo
97a244fc86 adding null check for jobTotals in case jobId was not found 2015-09-11 15:16:31 -04:00
momo
4e0e47a33a add class name to logger 2015-09-11 13:59:54 -04:00
momo
554f071cfb uncomment test code 2015-09-11 13:57:37 -04:00
momo
f780c3f946 removing face detection code 2015-09-11 13:49:10 -04:00
momo
c63081edd7 Don't display file path if it's empty 2015-09-11 13:29:03 -04:00
momo
2ac9225b1a change back to error popup for null values 2015-09-11 13:27:37 -04:00
Ann Priestman
3a4456b945 Changed exception type 2015-09-10 16:23:12 -04:00
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