Commit Graph
13998 Commits
Author SHA1 Message Date
William Schaefer be2ca148ab Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 2462-UnableToDeleteCases 2017-04-11 13:48:52 -04:00
William Schaefer 828fc487f9 2462 fixed comment regarding cores with the same name 2017-04-11 13:45:05 -04:00
Richard Cordovano 807f31d6cc Merge pull request #2676 from millmanorama/fix-jars-in-build
Fix jars in build
2017-04-11 13:34:29 -04:00
millmanorama 6373f3a3eb reignore release folders 2017-04-11 17:50:44 +02:00
millmanorama a3195e8fe5 fix build, don't have anything checked into release 2017-04-11 17:36:23 +02:00
millmanorama cd3bbfcdf4 Merge branch '2371-minimize-installer-Core' into fix-jars-in-build
# Conflicts:
#	Core/build.xml
2017-04-11 15:01:05 +02:00
millmanorama 0737a1ed31 Merge remote-tracking branch 'upstream/rc-280' into fix-jars-in-build 2017-04-11 14:49:32 +02:00
millmanorama a22f83d132 don't use release.dir property in build file 2017-04-11 14:48:41 +02:00
William Schaefer f0ab0721e0 2462 deleteTextIndex now uses CaseMetadata to get case dir 2017-04-10 15:06:25 -04:00
William Schaefer e832d9a17a Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 2462-UnableToDeleteCases 2017-04-10 11:44:51 -04:00
millmanorama de71714c75 revert core build changes 2017-04-10 16:18:20 +02:00
Richard Cordovano bb9023d0f9 Merge pull request #2669 from millmanorama/2470-casemetadata-backwards-compatibility
2470 reorganize field declarations to reflect schema versions, save absolu…
2017-04-10 09:35:21 -04:00
millmanorama 7be31fe8cf don't use sync="true" when retrieving dependencies with Ivy. 2017-04-10 12:50:56 +02:00
William Schaefer 8b868d028e Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 2462-UnableToDeleteCases 2017-04-07 18:36:22 -04: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
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 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
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
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
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
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 4728a572a5.
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
eugene7646 f5ee898874 Merge pull request #2651 from wschaeferB/2452-UpdateLocalDiskDSP
2452 update local disk dsp
2017-03-31 13:02:02 -04:00
eugene7646 25d037ec2e Merge pull request #2648 from sleuthkit/misc_demo_fixes
Added more support in tree for INTERESTING_ARTIFACTS and send ingest …
2017-03-31 12:47:18 -04:00
Ann Priestman c0c04819bb Merge remote-tracking branch 'upstream/develop' into keywordDocs 2017-03-31 11:34:19 -04:00
William Schaefer bd02d05261 2452 correct logger message regarding cancellation 2017-03-31 11:15:36 -04:00
William Schaefer 60d49e4237 2452 Right side of local disk panel now lines up correctly 2017-03-31 10:46:08 -04:00