Commit Graph
14003 Commits
Author SHA1 Message Date
Raman Arora 8bc752efdb Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 5707-attchmnt-msg-contentviewer
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/datamodel/Bundle.properties-MERGED
2019-11-13 14:53:07 -05:00
Raman Arora 18bffe4d18 5708: fix the attachment count in CVT messages table. 2019-11-13 14:24:26 -05:00
Richard Cordovano eb1560fdd3 Merge pull request #5392 from raman-bt/5726-display
Display JSON attribute as a indented bullet list.
2019-11-13 12:55:50 -05:00
Richard Cordovano be7107d3db Merge pull request #5413 from sleuthkit/data-src-deletion
Merge data-src-deletion-branch into develop branch
2019-11-13 12:30:51 -05:00
Richard Cordovano c33dbf13fe Integrate and update data src deletion 2019-11-13 11:25:44 -05:00
Richard Cordovano b433a4b5df Data source deletion support 2019-11-12 17:33:25 -05:00
Richard Cordovano e14d49aba6 Integrate and update data src deletion 2019-11-12 17:30:39 -05:00
Richard Cordovano 5953836533 Integrate and update data src deletion 2019-11-12 17:18:03 -05:00
Richard Cordovano 360c0a293d Integrate and update data src deletion 2019-11-12 17:12:39 -05:00
Richard Cordovano de6872b2fb Integrate and update data src deletion 2019-11-12 16:35:25 -05:00
Richard Cordovano fc7f4f1dbe Integrate and update data src deletion 2019-11-12 16:33:38 -05:00
Richard Cordovano f9bacacd17 Integrate and update data src deletion 2019-11-12 16:31:12 -05:00
Richard Cordovano 0716587b95 Data source deletion support 2019-11-12 16:23:44 -05:00
Richard Cordovano ad424a6f33 Integrate and update data src deletion 2019-11-12 16:21:25 -05:00
Richard Cordovano d298d1766c Data source deletion support changes 2019-11-12 15:39:48 -05:00
Raman Arora 2c23b5b52f Address Codacy comments on previous commit. 2019-11-12 13:04:31 -05:00
Richard Cordovano b324e18d5b Data source deletion support changes 2019-11-12 11:47:17 -05:00
Raman Arora 885a6a5ec2 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 5707-attchmnt-msg-contentviewer 2019-11-12 11:02:07 -05:00
Raman Arora 242ad6170a 5707: Show attachments in Message Content Viewer. 2019-11-12 11:01:37 -05:00
Kelly Kelly 4a2e1f8b8e Merge branch 'develop' into 5684-geolocation-details-popup 2019-11-12 07:16:10 -05:00
Richard Cordovano 812ed6a4f7 Data source deletion support changes 2019-11-11 17:25:47 -05:00
Richard Cordovano e806f666c2 Merge pull request #5406 from kellykelly3/5654-waypoint-context-menu
5654 Geolocation waypoint context menu
2019-11-11 17:21:46 -05:00
Kelly Kelly 12fc0f990d addressed codacy issues 2019-11-11 16:53:31 -05:00
Kelly Kelly 93c1b741fb merged in changes from popup menu branch 2019-11-11 16:17:52 -05:00
Kelly Kelly 0b0e3fa62c updated based on review comments 2019-11-11 16:03:28 -05:00
Richard Cordovano 16e94f6dec Data source deletion support changes 2019-11-11 15:54:19 -05:00
Kelly Kelly e4933b6ddf Added details popup 2019-11-11 15:46:45 -05:00
Richard Cordovano b0138680d0 Data source deletion support changes 2019-11-08 16:43:15 -05:00
Richard Cordovano 5898e027ec Data source deletion support changes 2019-11-08 16:30:29 -05:00
Richard Cordovano 4183e948ba Data source deletion support changes 2019-11-08 13:21:41 -05:00
Richard Cordovano fa8265876b Merge pull request #5405 from dannysmyda/5732-implement-XRY-report-validation
5732 implement xry report validation
2019-11-08 13:02:43 -05:00
U-BASIS\dsmyda 8f7e5c44b2 Merged in develop, resolved merge conflicts on XRYFileReader and verified a successful merge by running unit tests 2019-11-08 12:33:18 -05:00
Richard Cordovano 2be2b02798 Merge pull request #5098 from wschaeferB/5373-UserFriendlyException
5373 user friendly exception
2019-11-08 12:15:45 -05:00
Richard Cordovano c557b6264c Merge pull request #5005 from wschaeferB/5297-CodacyErrorCleanup
5297 codacy error cleanup
2019-11-08 12:12:42 -05:00
Richard Cordovano f66196457b Merge pull request #5404 from markmckinnon/5680-summary-panel-details-missing
5680-summary-panel-details-missing
2019-11-08 11:46:44 -05:00
Mark McKinnon b3ffc4cac0 Update PhoneNumUtil.java
One more time for codacy
2019-11-08 11:14:54 -05:00
Mark McKinnon ef1e1f2655 Update PhoneNumUtil.java
Make codacy happy
2019-11-08 10:59:10 -05:00
Richard Cordovano d11cca17d7 Merge pull request #5407 from dannysmyda/5731-implement-XRY-report-reading
5731 implement xry report reading
2019-11-08 09:02:47 -05:00
Mark McKinnon b751b8d23e Update SummaryViewer.java
Remove //NON-NLS
2019-11-07 17:43:23 -05:00
Mark McKinnon e6218ab6c9 Add bundle message
Add bundle message
2019-11-07 17:42:36 -05:00
U-BASIS\dsmyda bbe0c8dcd0 Updated comments and removed old test files 2019-11-07 17:36:36 -05:00
Kelly Kelly f7d3c3169c Fixed codacy issues 2019-11-07 17:31:38 -05:00
U-BASIS\dsmyda 56d57f63d1 Fully implemented and tested the file reading capability 2019-11-07 17:29:24 -05:00
U-BASIS\dsmyda 6a281f274f Made both classes final 2019-11-07 17:02:25 -05:00
U-BASIS\dsmyda 859f1faba9 Added comments and am in the process of testing 2019-11-07 17:01:18 -05:00
Kelly Kelly dcdd9d5f51 Merge branch 'develop' into 5654-waypoint-context-menu 2019-11-07 16:49:57 -05:00
Kelly Kelly 71930eb912 Finished popup menu work 2019-11-07 16:49:03 -05:00
U-BASIS\dsmyda a41b28cbf5 Revert scope of methods in XRYFileReader back to private 2019-11-07 16:38:08 -05:00
U-BASIS\dsmyda f254b9ddb0 Reduce complexity of XRYFileReader 2019-11-07 16:36:53 -05:00
U-BASIS\dsmyda ee3c0c01d2 Implemented report reading, now testing 2019-11-07 16:07:35 -05:00