Commit Graph
23938 Commits
Author SHA1 Message Date
Kelly Kelly d8884b82c2 Added image to contact viewer tab 2019-07-05 15:37:11 -04:00
Richard Cordovano 516d987bb8 Merge pull request #4988 from dannysmyda/5208-Change-Overlapping-Tag-Selection-Behavior
5208 Change Overlapping Image Tag Selection
2019-06-28 18:52:36 -04:00
U-BASIS\dsmyda d2a77fc469 Made the smallest tag the one that 'wins' selection in the event of overlap 2019-06-28 14:24:26 -04:00
Richard Cordovano f2320ffcc9 Merge pull request #4976 from sleuthkit/release-4.12.0
Merge release 4.12.0 branch into develop branch
2019-06-27 15:36:33 -04:00
Richard Cordovano f2330a91d1 Merge branch 'develop' into release-4.12.0 2019-06-27 15:36:14 -04:00
Richard Cordovano 62ca268336 Merge pull request #4965 from APriestman/fixOccurrencesTypos
Fix "occurrence" typos
2019-06-27 14:52:26 -04:00
Richard Cordovano 3771d41127 Merge pull request #4968 from wschaeferB/5283-ChangeOtherOcurrencesContextMenu
5283 change context menu options for other occurrences viewer
2019-06-27 12:46:32 -04:00
Richard Cordovano d9c80ba14e Merge pull request #4963 from dannysmyda/5225-Graceful-Object-Detection-Failure
5225 graceful object detection failure
2019-06-27 12:28:50 -04:00
Richard Cordovano 9000dcf973 Merge pull request #4962 from eugene7646/partable_case_5211
Unpackage portable case dialog goes away after completion (5211)
2019-06-27 11:39:02 -04:00
William Schaefer f38210f218 5283 change context menu options for other occurrences viewer 2019-06-27 11:08:24 -04:00
Ann Priestman e65bd4a93b Fix "occurrence" typos 2019-06-27 09:30:36 -04:00
Eugene Livis d2977f9509 Changed the wording 2019-06-26 18:02:43 -04:00
U-BASIS\dsmyda d5a472b810 Merge branch 'release-4.12.0' of github.com:sleuthkit/autopsy into 5225-Graceful-Object-Detection-Failure 2019-06-26 17:49:38 -04:00
U-BASIS\dsmyda 94458fb012 Made error messages in UI and log straight forward in the event of an OpenCV loading error or non windows user 2019-06-26 17:47:59 -04:00
Richard Cordovano a8658115f5 Merge pull request #4940 from eugene7646/inage_gallery_5144
Image gallery fix 5144
2019-06-26 17:06:00 -04:00
Richard Cordovano e4f90a4b05 Update DrawableAttribute.java 2019-06-26 17:05:45 -04:00
Richard Cordovano 71cf19cccb Merge pull request #4955 from APriestman/5253_callLogs
5253 Put call logs under a call log node instead of unthreaded
2019-06-26 16:53:31 -04:00
Eugene Livis 65a587776e Unpackage portable case dialog goes away after completion 2019-06-26 16:48:11 -04:00
Richard Cordovano fc00e11b00 Cherry pick logical imager pacakgin fix 2019-06-26 16:44:23 -04:00
Richard Cordovano be5e42e8bc Merge pull request #4958 from rcordovano/find-logical-imager-exe-fix
Fix packaging of logical imager executable
2019-06-26 16:38:54 -04:00
Richard Cordovano 5f2165aa19 Merge pull request #4960 from dannysmyda/5226-Disable-Image-Tagging
5226 disable image tagging
2019-06-26 16:38:11 -04:00
Richard Cordovano fb986b75b7 Merge pull request #4961 from wschaeferB/5268-CVTSummaryTweaks
5268 cvt summary tweaks
2019-06-26 16:14:57 -04:00
U-BASIS\dsmyda 9e4e3fccfc Merge branch '5240-Log-And-Swallow-OpenCV-Exception' into 5226-Disable-Image-Tagging 2019-06-26 16:02:52 -04:00
U-BASIS\dsmyda 013d8d2444 Review comments 2019-06-26 16:02:04 -04:00
Eugene Livis 85e0dbadfc Adressed code review comments 2019-06-26 15:56:14 -04:00
Richard Cordovano e0eff5af4c Merge pull request #4947 from APriestman/5248_cvtGraph
5248 Fix message display for graph edges
2019-06-26 15:54:43 -04:00
Richard Cordovano 887bfa7c47 Merge pull request #4957 from jkho/5262-Blank-error-message-when-saving-config-file-fails
Fix message format and status label
2019-06-26 15:53:40 -04:00
Eugene Livis 40ce783b53 Merge branch 'release-4.12.0' of github.com:sleuthkit/autopsy into inage_gallery_5144 2019-06-26 15:52:39 -04:00
Richard Cordovano 649f90a0ce Merge pull request #4953 from wschaeferB/UpdateExperimentalMergedFile
Update merged file for experimental configuration package
2019-06-26 15:22:25 -04:00
Ann Priestman 839261c1b3 Fixed typo 2019-06-26 15:21:36 -04:00
William Schaefer 7be01cb085 5268 fix concatenation instead of addition issue 2019-06-26 15:14:27 -04:00
U-BASIS\dsmyda 812aed56e1 Disabled image tagging for non-windows OS and if OpenCV failed to load. 2019-06-26 15:08:16 -04:00
William Schaefer 0e44b68c8a 5268 tweak CVT summary viewer top panel 2019-06-26 15:05:45 -04:00
Joe Ho bcaf0ce57f Fix message format and status label 2019-06-26 14:36:20 -04:00
Richard Cordovano df3dc54dc9 Merge pull request #4951 from wschaeferB/5134-SCODisabling
5134 sco disabling
2019-06-26 14:29:11 -04:00
Richard Cordovano 0abcb7374c Fix packaging of logical imager executable 2019-06-26 14:23:55 -04:00
Richard Cordovano e92a827ac9 Merge pull request #4956 from sleuthkit/release-4.12.0
Merge release 4.12.0 branch into develop branch
2019-06-26 14:20:59 -04:00
U-BASIS\dsmyda 357c70fcee Changed one more location to reflect new API 2019-06-26 13:57:37 -04:00
U-BASIS\dsmyda 352179b39b Made changes that are public API friendly and fixed a deprecated use case 2019-06-26 13:53:38 -04:00
Ann Priestman abfab92f27 Fix typo 2019-06-26 13:50:22 -04:00
Ann Priestman 85c764eaac Put call logs under a call log node instead of unthreaded 2019-06-26 13:48:52 -04:00
William Schaefer b01c240e18 5134 fix bad autoformat 2019-06-26 13:39:48 -04:00
Richard Cordovano 494fd204a3 Merge pull request #4945 from wschaeferB/5199-CountsDiverge
5199 fix deduping of items for other occurrences content viewer
2019-06-26 13:26:59 -04:00
William Schaefer f7e1cead12 5199 update param documentation as per review comment 2019-06-26 13:11:36 -04:00
Richard Cordovano 2616479603 Merge pull request #4954 from APriestman/5247_messagesColumnName
5247 Changed CVT messages column name
2019-06-26 13:10:25 -04:00
Richard Cordovano 32f200a1f1 Merge pull request #4942 from dannysmyda/5245-slack-space-translation-tab
5245 Removed Slack Space from Translation Tab
2019-06-26 12:04:45 -04:00
William Schaefer 82b66fd6a8 Merge branch 'release-4.12.0' of https://github.com/sleuthkit/autopsy into 5199-CountsDiverge 2019-06-26 11:56:22 -04:00
Ann Priestman 29c8602294 Changed CVT messages column name 2019-06-26 11:52:11 -04:00
William Schaefer ea6b432716 update merged file for eperimental configuration package to include modified messages 2019-06-26 11:43:46 -04:00
Richard Cordovano b3a0161292 Merge pull request #4952 from esaunders/develop
Toggle build.type property to DEVELOPMENT
2019-06-26 11:42:11 -04:00