8207 Commits

Author SHA1 Message Date
rishwanth1995
c4bf1f0502 merged gui_changes to develop 2018-03-01 14:01:17 -05:00
rishwanth1995
4782fd9fa1 made gui_changes in autopsy modules 2018-03-01 13:39:22 -05:00
rishwanth1995
68dc87ab51 modified localdiskpanel gui 2018-03-01 11:34:52 -05:00
rishwanth1995
16bcfff2c9 merged developorig7 to develop 2018-03-01 11:15:12 -05:00
rishwanth1995
a2ac6ca348 Merge branch 'gui_changes' into developorig7 2018-03-01 10:03:05 -05:00
rishwanth1995
38690b47f5 modified panel name to button-enclosing-panel 2018-03-01 10:00:00 -05:00
rishwanth1995
36b3cc334d modified gui in injest profile settings 2018-03-01 09:57:35 -05:00
Richard Cordovano
9b5e083cab Merge remote-tracking branch 'upstream/custom-release-2.11.1' into develop 2018-03-01 09:36:54 -05:00
Richard Cordovano
9be542dbde
Merge pull request #3460 from dgrove727/3545_LocalDiskImageBlockSize
3545 local disk image block size
2018-03-01 09:05:28 -05:00
rishwanth1995
6ab6b12886 modified gui in ingest,filesearch 2018-02-28 17:23:53 -05:00
rishwanth1995
587571d4da merged gui_changes to develop 2018-02-28 16:09:59 -05:00
rishwanth1995
7f8f2f356d merged release-linux to develop 2018-02-28 15:43:22 -05:00
rishwanth1995
a84984c562 Merge branch 'release-4.6.0-linux-beta-1' of https://github.com/sleuthkit/autopsy into gui_changes 2018-02-28 13:30:09 -05:00
Richard Cordovano
0705374e8e
Merge pull request #3457 from raman-bt/3544_mediacontentviewer
3544: Integrate Media content viewer into Application content viewer
2018-02-28 13:12:41 -05:00
rishwanth1995
fe31caf3d9 modified gui in datasource,diagnostics,directorytree 2018-02-28 13:10:29 -05:00
rishwanth1995
0c35fb1c85 modified gui in corecomponents,central repository,communications 2018-02-28 11:39:08 -05:00
Brian Carrier
80868442fd Made method public so that modules would know what sets were configured 2018-02-28 10:45:05 -05:00
Brian Carrier
cb3a0c7a5d Merge branch 'develop' of github.com:sleuthkit/autopsy into develop 2018-02-28 10:41:09 -05:00
Brian Carrier
eb1bb6b93c rearranged methods to group ingest filters from interesting files methods 2018-02-28 10:40:33 -05:00
Raman
2895060b3b Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 3544_mediacontentviewer 2018-02-28 10:10:29 -05:00
rishwanth1995
6ac8f0ca30 modified gui to adjust for bigger fonts 2018-02-27 17:23:37 -05:00
Richard Cordovano
bc28f09939
Merge pull request #3475 from sleuthkit/custom-release-2.11.1
Merge in custom release 2.11.1 branch
2018-02-27 17:13:16 -05:00
Richard Cordovano
3e613dd282
Merge branch 'release-4.6.0-linux-beta-1' into font_changes1 2018-02-27 17:12:15 -05:00
Richard Cordovano
e85a1128db
Merge pull request #3459 from rishwanth1995/removedefaultfont
added setlookandfeel method to EDT
2018-02-27 17:09:34 -05:00
Richard Cordovano
3ba9385102
Merge pull request #3462 from raman-bt/develop
Fixes an NPE in the previous commit.
2018-02-27 17:08:06 -05:00
U-BASIS\zhaohui
e1251d7975 Delete Autopsy Core Unit test: IngestFileFiltersTest.java 2018-02-27 12:48:58 -05:00
rishwanth1995
29f0a88a43 modified optional_case properties 2018-02-27 12:39:54 -05:00
rishwanth1995
864472d2dd set defaultsize for memfieldvalidationlabel in autopsyoptionspanel 2018-02-27 12:11:11 -05:00
rishwanth1995
c019aa85f3 added default fonts to the corecomponents installer 2018-02-27 10:43:00 -05:00
Ann Priestman
112b57776d Implement DIY solr cloud 2018-02-23 16:37:34 -05:00
U-BASIS\dgrove
c1ac9cf29f Merge remote-tracking branch 'upstream/develop' into 3545_LocalDiskImageBlockSize 2018-02-23 16:30:45 -05:00
rishwanth1995
0b15b0506d removed default font option for corecomponents installer 2018-02-23 15:31:19 -05:00
U-BASIS\dgrove
e2abab1cda Merge remote-tracking branch 'upstream/develop' into 3545_LocalDiskImageBlockSize 2018-02-23 15:00:28 -05:00
U-BASIS\dgrove
521d15ca63 Merge remote-tracking branch 'upstream/develop' into 3353_CenterChildWindows 2018-02-23 14:56:18 -05:00
U-BASIS\dgrove
8952c5686c Merge. 2018-02-23 14:55:31 -05:00
Richard Cordovano
7e493c7888
Merge pull request #3441 from dgrove727/3385_ContentViewerReset
3385 content viewer reset
2018-02-23 14:38:37 -05:00
Richard Cordovano
038542151b
Merge pull request #3454 from esaunders/report_index_and_search
Merged develop into report indexing work and fixed issue with Content not in lookup
2018-02-23 14:32:23 -05:00
Raman
9949b77dd1 Fixes an NPE in the previous commit. 2018-02-23 14:20:34 -05:00
U-BASIS\dgrove
89bf08c1d1 Cleanup. 2018-02-23 13:31:20 -05:00
U-BASIS\dgrove
2012bfb773 Merge branch '3284_DiskImageBlockSize' into 3545_LocalDiskImageBlockSize 2018-02-23 13:03:49 -05:00
U-BASIS\dgrove
d0e127d8c0 Compile issue resolved. 2018-02-23 12:59:26 -05:00
Raman
2c9b6fe6a4 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 3544_mediacontentviewer
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/contentviewers/FileViewer.java
#	Core/src/org/sleuthkit/autopsy/contentviewers/SQLiteViewer.java
2018-02-23 12:35:14 -05:00
U-BASIS\dgrove
f180ff75b1 Merge. 2018-02-23 12:20:57 -05:00
U-BASIS\dgrove
c02263a7f9 Merge. 2018-02-23 12:15:21 -05:00
U-BASIS\dgrove
739d7cbb57 Minor tweaks. 2018-02-23 12:06:07 -05:00
Raman
c1fd998807 3544: Integrate Media content viewer into Application content viewer
Modified DataContentViewerMedia to implement the FileTypeViewer interface, and renamed it to MediaFileViewer
2018-02-23 11:38:44 -05:00
Richard Cordovano
817d8e5945
Merge pull request #3440 from wschaeferB/1916-L01Processor
1916 l01 processor
2018-02-23 10:57:09 -05:00
Richard Cordovano
92e5ac4eab
Merge pull request #3434 from dgrove727/3335_EncryptionDetectionStartupValidation
3335 encryption detection startup validation
2018-02-23 10:56:23 -05:00
U-BASIS\dgrove
55b3ab2953 Merge branch '3284_DiskImageBlockSize' into 3545_LocalDiskImageBlockSize 2018-02-23 10:34:38 -05:00
U-BASIS\dgrove
eeec005160 Merge remote-tracking branch 'upstream/develop' into 3284_DiskImageBlockSize 2018-02-23 10:21:46 -05:00