14241 Commits

Author SHA1 Message Date
millmanorama
817051c770 Merge remote-tracking branch 'upstream/develop' into 2371-RecentActivity
# Conflicts:
#	.gitignore
2017-04-07 21:32:49 +02:00
Richard Cordovano
7e35ee543f Merge pull request #2670 from millmanorama/2371-KWS-uses-BootstrapIvy.xml
KWS uses BootstrapIvy.xml
2017-04-07 14:04:34 -04:00
Richard Cordovano
f79d26e449 Merge pull request #2667 from millmanorama/2371-Experimental
2371 experimental
2017-04-07 13:38:59 -04:00
William Schaefer
0020d9f5a2 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 2461-DisableMenuForAutoIngest 2017-04-07 11:56:04 -04:00
William Schaefer
f198e10ee6 2461 Disabled main window when using AutoIngestDashboard 2017-04-07 11:51:32 -04:00
millmanorama
cb302733e6 KWS uses BootstrapIvy.xml 2017-04-07 15:41:54 +02:00
millmanorama
6b23974032 reorganize field declarations to reflect schema versions, save absolute and relative and absolute paths of case database 2017-04-07 13:53:42 +02:00
millmanorama
e0d071cad8 ignore RecentActivity/release 2017-04-07 11:39:13 +02:00
millmanorama
f68a85022c move Bootstrapping Ivy into its own script. move pasco and rr to thirdparty and copy to release on build 2017-04-07 11:37:28 +02:00
millmanorama
1834eab187 WIP 2017-04-07 11:35:34 +02:00
millmanorama
2578bb9a28 move Ivy Bootstrapping into ModuleTemplate 2017-04-07 11:32:23 +02:00
millmanorama
3051749fd3 remove jars from repo and download them with Ivy 2017-04-07 11:29:27 +02:00
Richard Cordovano
344429b39c Merge pull request #2657 from wschaeferB/2492-EditKeywordsTitle
2492 - dialog opened by Edit Keyword button now titled Edit Keyword
2017-04-06 17:51:55 -04:00
Richard Cordovano
9313c9a58a Merge pull request #2656 from wschaeferB/2454-LocalDiskThread
2454 Removed redundant else block corrected level of access for disk …
2017-04-06 17:51:06 -04:00
Richard Cordovano
09ee44550f Merge pull request #2664 from sleuthkit/doxygen
Make doxygen optional for building ZIP - 2526
2017-04-06 13:06:55 -04:00
Richard Cordovano
4e20919b9f Merge pull request #2659 from sleuthkit/results_content_viewer_fix
display last column for all rows, remove duplicate code, use attribut…
2017-04-06 13:00:27 -04:00
Richard Cordovano
3b5cbe6e53 Merge pull request #2658 from APriestman/keywordDocs
Updating keyword search documentation
2017-04-06 12:58:12 -04:00
Richard Cordovano
24a503efeb Merge pull request #2650 from millmanorama/2371-minimize-installer-Core
2371 minimize installer core
2017-04-06 12:57:12 -04:00
Richard Cordovano
826cebcc54 Merge pull request #2663 from zhhl/2297-replaceObjIdwithValue
2297: replace the obj_id number with it's parent_path or value of the…
2017-04-06 11:10:39 -04:00
Eugene Livis
86cff57335 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into develop 2017-04-06 09:57:46 -04:00
William Schaefer
dfae84d978 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 2518-AnalyzeDataAsap 2017-04-05 12:16:17 -04:00
William Schaefer
3aad466133 2518 moved startDataSourceProcessing call to AddImageWizardIterator 2017-04-05 11:52:12 -04:00
millmanorama
2f9a7906f4 move ivy bootstrapping to BootstrapIvy.xml 2017-04-05 17:42:51 +02:00
millmanorama
c0db3bdcc7 Merge remote-tracking branch 'upstream/develop' into 2371-minimize-installer-Core
# Conflicts:
#	.gitignore
2017-04-05 17:37:42 +02:00
Brian Carrier
b9199b3104 Make doxygen optional for building ZIP 2017-04-05 10:11:48 -04:00
Brian Carrier
26ac6cb31a Merge pull request #2661 from raman-bt/develop
VIK-2502: Change radio buttons to toggle buttons for picking profile
2017-04-05 09:39:51 -04:00
Richard Cordovano
3a7697e5f5 Merge pull request #2649 from millmanorama/2371-CoreLibs-IG-KWS-EMAIL
2371 corelibs, ig, kws
2017-04-05 09:22:34 -04:00
Richard Cordovano
eaf8272861 Update JIRA reference in SolrSearchService.java 2017-04-04 18:23:49 -04:00
U-BASIS\zhaohui
e5ca026eac 2297: replace the obj_id number with it's parent_path or value of the first 2 columns 2017-04-04 16:08:55 -04:00
Eugene Livis
53f1fa7054 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into develop 2017-04-04 14:36:36 -04:00
William Schaefer
28a706efde 2518 corrected a couple comments to reflect when ingest is actually started now 2017-04-04 14:30:42 -04:00
William Schaefer
b56bb8094a 2518 minor auto-format change 2017-04-04 14:26:33 -04:00
William Schaefer
e2225136a7 2518 made ingest started when progress panel opened should also fix 2280 2017-04-04 14:08:47 -04:00
William Schaefer
30128516ed 2518 moved managing of ingest data source and ingest kick off to progress panel 2017-04-04 14:04:06 -04:00
Raman
66919e2271 VIK-2502: Change radio buttons to toggle buttons for picking profile
Center align label text w.r.t to button.
2017-04-04 13:25:32 -04:00
William Schaefer
2d9ef57211 2512 removed unused imports from ProfileSettingsPanel 2017-04-03 16:41:35 -04:00
William Schaefer
1442237d2f 2512 Fixed accidently disabled description text area 2017-04-03 16:37:43 -04:00
William Schaefer
0174a2fa6a 2512 resizable scrollable profile creation panel 2017-04-03 16:23:03 -04:00
William Schaefer
d43e586e97 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 2512-ProfilePanelTooTall 2017-04-03 16:20:02 -04:00
Brian Carrier
0c40b16e71 display last column for all rows, remove duplicate code, use attribute display method, always escape 2017-04-03 15:40:23 -04:00
William Schaefer
06d9d25ab5 2512 - ProfilePanel now shorter but still not scrolling 2017-04-03 14:58:01 -04:00
Ann Priestman
d9614564e0 More updates to the keyword search documentation 2017-04-03 14:25:33 -04:00
William Schaefer
fd781e207d 2492 - dialog opened by Edit Keyword button now titled Edit Keyword 2017-04-03 14:25:08 -04:00
William Schaefer
74845fa4ed 2454 Removed redundant else block corrected level of access for disk lists 2017-04-03 10:11:06 -04:00
Richard Cordovano
91ea524c1a Revert "2297: make ngihtly test on single ingest thread to avoid fe_image_test_4 test results in different order"
This reverts commit 4728a572a5bb06320d76f0b69543d03c5d369d0f.
2017-04-01 12:32:43 -04:00
Ann Priestman
b7d8fc527d Merge remote-tracking branch 'upstream/develop' into keywordDocs 2017-03-31 16:26:45 -04:00
eugene7646
c5b31b92d9 Merge pull request #2655 from raman-bt/develop
VIK-2502: Change radio buttons to toggle buttons for picking profile
2017-03-31 16:23:22 -04:00
eugene7646
d0d989675f Merge pull request #2654 from dgrove727/2496_UpdateCopyrightDate
Updated copyright date.
2017-03-31 16:20:54 -04:00
Raman
4b723283df VIK-2502: Change radio buttons to toggle buttons for picking profile 2017-03-31 16:10:48 -04:00
U-BASIS\dgrove
657b9c3fa6 Updated copyright date. 2017-03-31 15:56:48 -04:00