Commit Graph
24378 Commits
Author SHA1 Message Date
Raman d137e7c184 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into develop 2018-10-01 18:41:12 -04:00
millmanorama bead0b8f48 Merge remote-tracking branch 'upstream/develop' into 1036-check_file_limit_after_datsource_selection
# Conflicts:
#	ImageGallery/src/org/sleuthkit/autopsy/imagegallery/ImageGalleryTopComponent.java
2018-10-01 21:14:01 +02:00
millmanorama 55e39f9f8a reset file limit, cleanup 2018-10-01 18:02:02 +02:00
millmanorama 5d21558863 Merge remote-tracking branch 'upstream/develop' into 1036-check_file_limit_after_datsource_selection
# Conflicts:
#	ImageGallery/src/org/sleuthkit/autopsy/imagegallery/ImageGalleryTopComponent.java
2018-10-01 17:29:46 +02:00
Richard Cordovano 7cb77779a3 Merge pull request #4168 from wschaeferB/4266-NoScoreToolTip
4266 add No score tooltip to cells in score column when no score is set
2018-10-01 11:07:04 -04:00
U-BASIS\dsmyda 9276bef19d Fixed a comment 2018-10-01 09:52:13 -04:00
U-BASIS\dsmyda 94f20dd91a Changed my mind, added back the red 0 2018-10-01 09:50:31 -04:00
Richard Cordovano 7720331a0f Merge pull request #4160 from millmanorama/1033-backwards-compatibility
1033 backwards compatibility
2018-10-01 09:41:53 -04:00
U-BASIS\dsmyda 6bfba0e5e7 Fixed another unintentional change 2018-10-01 09:41:34 -04:00
U-BASIS\dsmyda 4ca09d4d2e Reverted unintentional line change 2018-10-01 09:39:17 -04:00
U-BASIS\dsmyda 100c7d1ddc Changed some variable names and got rid of the red font color 2018-10-01 09:36:58 -04:00
Raman ee35e79afb Merge branch 'develop' of https://github.com/sleuthkit/autopsy into develop 2018-10-01 09:32:09 -04:00
millmanorama f6e5b2d420 Merge remote-tracking branch 'upstream/develop' into 1033-backwards-compatibility
# Conflicts:
#	ImageGallery/src/org/sleuthkit/autopsy/imagegallery/ImageGalleryModule.java
#	ImageGallery/src/org/sleuthkit/autopsy/imagegallery/ImageGalleryTopComponent.java
2018-10-01 14:00:18 +02:00
U-BASIS\dsmyda a3f1ed49b2 Fixed .form file 2018-09-28 16:46:51 -04:00
U-BASIS\dsmyda 00f4b8bcd2 Changed some names around 2018-09-28 16:41:52 -04:00
U-BASIS\dsmyda 7603402b95 Added a character limit to the CR comment dialog box 2018-09-28 16:33:40 -04:00
William Schaefer 5b2d889694 4271 remove unused import 2018-09-28 15:29:24 -04:00
William Schaefer b4300d6a88 4271 made reasons for common property search being unavailble more detailed 2018-09-28 15:28:00 -04:00
William Schaefer b1cc67d47d 4266 add No score tooltip to cells in score column when no score is set 2018-09-28 13:53:46 -04:00
Richard Cordovano 3087edffa5 Merge pull request #4164 from dannysmyda/4264-disable-hashset-for-reasons
4264 disable hashset for reasons
2018-09-28 13:31:36 -04:00
Richard Cordovano 7aea2b5bea Merge pull request #4161 from millmanorama/1050-disable-button-while-changing-groups
1050 IG Groups UI fixes
2018-09-28 13:31:05 -04:00
Richard Cordovano 529510fc8e Merge pull request #4158 from wschaeferB/4248-HashSetHitsScoreUpdate
4248 hash set hits score update
2018-09-28 11:16:04 -04:00
Richard Cordovano 1e1533bf67 Merge pull request #4151 from wschaeferB/4238-AddDisabledReasonToActionName
4238 add disabled reason to action name
2018-09-28 11:13:26 -04:00
Richard Cordovano f53a95b932 Merge pull request #4155 from dannysmyda/4257-hashset-functionality-during-ingest
4257 hashset functionality during ingest
2018-09-28 10:54:50 -04:00
Richard Cordovano 6817edaebd Merge pull request #4163 from APriestman/4192_docUpdate3
4192 Common properties documentation
2018-09-28 10:53:02 -04:00
Richard Cordovano 7861646415 Merge pull request #4150 from dgrove727/4245_AndroidAnalyzerSqlExceptions
Fixed exception handling; no longer logging certain messages.
2018-09-28 10:51:02 -04:00
Richard Cordovano 70daddc76f Merge pull request #4148 from esaunders/4253_solr_schema_compatibility
Added Index.isCompatible() method to determine whether a particular S…
2018-09-28 10:50:43 -04:00
U-BASIS\dsmyda 59ccaa50eb Added reason for files not candidates to be added to hashsets 2018-09-27 14:48:40 -04:00
U-BASIS\dgrove 97d8ea26b7 Changed exception block. 2018-09-27 12:56:27 -04:00
Richard Cordovano a75e3244a9 Merge pull request #4159 from sleuthkit/ig_tag_query
Cache IG data, change order of loading
2018-09-27 12:42:27 -04:00
Brian Carrier ae2464a19a Added syncronization to the caches 2018-09-27 12:28:38 -04:00
Richard Cordovano 4b7d379122 Merge pull request #4152 from wschaeferB/4240-ReturnButtonsToOriginalSize
4240 return buttons to original size
2018-09-27 12:27:33 -04:00
Ann Priestman 0608c6a0d1 Renamed commmon files to common properties 2018-09-27 12:05:14 -04:00
Ann Priestman 6e18a52f2d Almost completed common properties search.
Removed old common files images.
2018-09-27 11:52:35 -04:00
Richard Cordovano 71281bcde5 Merge pull request #4153 from dgrove727/4249_OptionsRefresh
Added cases to 'preferenceChange()' method.
2018-09-27 11:44:36 -04:00
Richard Cordovano 03d7110a61 Merge pull request #4154 from APriestman/4192_docUpdate2
4192 Doc update parts 1 and 2
2018-09-27 11:44:03 -04:00
Richard Cordovano a30067254f Merge pull request #4149 from wschaeferB/4187-UpdateLegacyCodeForExaminerID
4187 update legacy single user case converter code for examiner_id fo…
2018-09-27 11:33:33 -04:00
Richard Cordovano bfc168d3f9 Reorder JOIN in SQL to reflect usual practice 2018-09-27 11:33:22 -04:00
William Schaefer f44031d344 4242 return now fixed test to commented out state awaiting 4241 changes 2018-09-27 11:31:43 -04:00
William Schaefer c9e804cd79 4242 fix comparisons in CentralRepoDatamodelTest.testArtifacts 2018-09-27 11:29:22 -04:00
Richard Cordovano 694ed88f38 Merge pull request #4136 from sleuthkit/ig_performance
group cache and don't go to DB to get data source hashcode()
2018-09-27 11:28:09 -04:00
millmanorama 4342365304 disable the next unseen group button while changing groups. 2018-09-27 16:37:37 +02:00
U-BASIS\dsmyda 0f9b42b9c2 Fixed a comment 2018-09-27 09:53:20 -04:00
Richard Cordovano 6289d036fb Merge pull request #4157 from sleuthkit/ig_docs
initial changes for IG docs
2018-09-27 09:49:54 -04:00
U-BASIS\dsmyda dc01e2301c Fixed capitalization 2018-09-27 09:46:33 -04:00
U-BASIS\dsmyda 65c25d8438 Fixed Image galley hashset not being greyed out bug 2018-09-27 09:39:09 -04:00
Ann Priestman d9dd5d55da Removed mistakenly added image 2018-09-27 09:24:42 -04:00
Ann Priestman 74e35a20c9 Partway through common properties search docs 2018-09-27 09:24:12 -04:00
millmanorama b80344587d cleanup 2018-09-27 15:23:23 +02:00
millmanorama a341eee92a check for table before checking for column to avoid "query doesn't return ResultSet"error 2018-09-27 14:32:34 +02:00