26342 Commits

Author SHA1 Message Date
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
Richard Cordovano
965a187f51
Merge pull request #5395 from kellykelly3/geolocation-datamodel-refactoring
Simplified the geolocation model
2019-11-07 16:01:53 -05:00
Richard Cordovano
2ab2fffff8
Merge pull request #5393 from wschaeferB/5665-ExtractAction
5665 bring over ExtractAction changes from file-search branch
2019-11-07 15:54:44 -05:00
U-BASIS\dsmyda
5c5514f0c1 Fixed up comments and changed scope of some methods to private 2019-11-07 14:42:16 -05:00
Ann Priestman
fb8b9e1d7e Created PoolNode 2019-11-07 14:35:29 -05:00
Richard Cordovano
95769f9bc6 Data source deletion support changes 2019-11-07 14:14:32 -05:00
Richard Cordovano
3b8e836204 Data source deletion support changes 2019-11-07 14:11:00 -05:00
Richard Cordovano
c93d7d5917 Data source deletion support changes 2019-11-07 14:00:55 -05:00
U-BASIS\dsmyda
eb34a74b04 Fixed comment 2019-11-07 13:49:18 -05:00
U-BASIS\dsmyda
79f048414c Implemented and tested XRY folder and XRY file checking 2019-11-07 13:46:06 -05:00
Mark McKinnon
ff3fcde452 Add summary panel components and country code
Added summary panel components and country code.
2019-11-07 13:37:40 -05:00
Richard Cordovano
982e40a8df Data source deletion support changes 2019-11-06 18:39:29 -05:00
William Schaefer
bd3bb1b5be Merge branch '5673-RemoveExcessFilters' of https://github.com/wschaeferB/autopsy into 5724-EmbeddedImagesPaths 2019-11-06 18:27:39 -05:00
William Schaefer
5af8d710f1 5673 fix codacy issues 2019-11-06 18:26:32 -05:00
William Schaefer
0438411b3d 5673 merge conflict resolution from 5674 2019-11-06 18:19:01 -05:00
Richard Cordovano
dca7491878 Data source deletion support changes 2019-11-06 18:08:29 -05:00
William Schaefer
7cce588bf3 5674 fix codacy complaints 2019-11-06 18:06:22 -05:00
Richard Cordovano
fce7fdd0c1 Data source deletion support changes 2019-11-06 18:04:07 -05:00
William Schaefer
b73ad79c0e 5724 do not show file embedded files are in as Parent Folder 2019-11-06 18:01:26 -05:00
Richard Cordovano
a52786d3fc Data source deletion support changes 2019-11-06 17:38:09 -05:00
Richard Cordovano
5a8e401723 Merge remote-tracking branch 'upstream/data-src-deletion' into rc-data-src-deletion-integration 2019-11-06 16:42:24 -05:00
Richard Cordovano
103e51df57 Merge remote-tracking branch 'upstream/develop' into rc-data-src-deletion-integration 2019-11-06 16:33:59 -05:00
Richard Cordovano
1e04609e9b
Merge pull request #5401 from sleuthkit/develop
Merge develop branch into file-search branch
2019-11-06 16:29:45 -05:00
Richard Cordovano
9dfce842ec
Merge pull request #5400 from sleuthkit/develop
Merge develop branch into data-src-deletion branch
2019-11-06 16:23:47 -05:00
Richard Cordovano
c47dd70ade Data source deletion 2019-11-06 16:22:41 -05:00
William Schaefer
a12a373d6a 5673 ignore file name case when sorting files 2019-11-06 15:13:23 -05:00
William Schaefer
9d0c3818f8 5673 ignore case when ordering by path 2019-11-06 14:22:41 -05:00
William Schaefer
a064a7888a 5673 include data source when comparing full path for sorting 2019-11-06 14:10:45 -05:00
William Schaefer
9fd32f92d2 5673 update path order by name 2019-11-06 13:48:02 -05:00
William Schaefer
c11f490d6e 5673 clean up filter removal code 2019-11-06 13:24:25 -05:00
William Schaefer
fdac4b9637 5673 fix initial setting of images button being selected 2019-11-06 12:51:49 -05:00
William Schaefer
aa38957c6d Merge branch '5674-ExcludeFoldersFilter' of https://github.com/wschaeferB/autopsy into 5673-RemoveExcessFilters 2019-11-06 12:14:14 -05:00