Commit Graph
9539 Commits
Author SHA1 Message Date
Richard Cordovano 8b73207378 Merge remote-tracking branch 'upstream/develop' into collaborative 2015-10-07 16:38:45 -04:00
Richard Cordovano 8cfcba8875 Remove Apache Curator dependency from Autopsy 2015-10-07 16:32:10 -04:00
Richard Cordovano c0fb6e91bc Merge pull request #1603 from mhmdfy/regression-time
change _time.txt directory
2015-10-07 13:37:56 -04:00
Richard Cordovano 4f15aed515 Merge pull request #1600 from millmanorama/TL_quick_hide
added feature to hide individual clusters/descriptions
2015-10-07 10:51:32 -04:00
jmillman eee0cec728 restore keywordsearch suite.properties that should never have been removed 2015-10-07 10:21:09 -04:00
jmillman 3034745331 Merge remote-tracking branch 'upstream/develop' into TL_quick_hide 2015-10-07 10:16:27 -04:00
Richard Cordovano cc92f1ca49 Replace IngestManager.runInteractively() with RuntimeProperties.getCoreComponentsActive() 2015-10-05 18:01:07 -04:00
Richard Cordovano d46fc40ecc Replace IngestManager.runInteractively() 2015-10-05 17:56:27 -04:00
Richard Cordovano 547b86abad Merge pull request #1598 from mhmdfy/gold-folder-cleanup
Gold folder cleanup
2015-10-05 12:52:46 -04:00
momo 46861032b1 combine extract and move txt to one function because they depend on each other 2015-10-05 10:33:03 -04:00
Richard Cordovano a6fda59143 Merge pull request #1605 from karlmortensen/renamingRefactor
rename a variable
2015-10-05 10:31:17 -04:00
Richard Cordovano 3bcc4196fe Merge pull request #1604 from karlmortensen/removeOldOverride
Remove old override
2015-10-05 10:29:32 -04:00
Karl Mortensen bfd122d0a2 remove old code 2015-10-02 16:08:51 -04:00
Karl Mortensen d3ed9beecd remove old code 2015-10-02 16:05:24 -04:00
momo d331e461dd fix same file exception 2015-10-02 15:52:12 -04:00
Karl Mortensen 710ffee243 rename a variable 2015-10-02 15:48:33 -04:00
momo 11f1a0f862 make sure common function uses the new path 2015-10-02 15:19:18 -04:00
Richard Cordovano ee4d0b2b99 Merge pull request #1602 from karlmortensen/testButtonsForMultiUserSettings
Add connection testing buttons for Multi-user settings
2015-10-02 15:09:42 -04:00
Karl Mortensen 91b5559681 remove comment 2015-10-02 15:07:28 -04:00
Karl Mortensen 851edf5158 use SolrSearchService 2015-10-02 12:26:55 -04:00
Karl Mortensen 69b6ddee0a clear icons when multi-user is disabled 2015-10-02 11:22:14 -04:00
Karl Mortensen c17d6d17eb one more dependency 2015-10-02 11:11:46 -04:00
momo 4b97cd8b93 use output path 2015-10-02 10:14:18 -04:00
Karl Mortensen 58859cc739 Merge branch 'collaborative' of https://github.com/sleuthkit/autopsy into testButtonsForMultiUserSettings 2015-10-02 09:56:16 -04:00
Karl Mortensen 07950ff5cf add connection testing buttons for multi user settings 2015-10-02 09:55:12 -04:00
mhmdfy a4c829f92b change _time.txt directory 2015-10-01 17:02:56 -04:00
jmillman ddfe4381a3 minor cleanup
- improve comments
- rename DescriptionLOD to DescriptionLoD
- use new isActive proprty
- rename quick hide mask to quick hide filter
- remove un used class FiltersChangedEvent
2015-10-01 16:08:44 -04:00
jmillman 7890461114 remove obsolete Interface 2015-10-01 15:32:56 -04:00
jmillman b7cee4bd83 polish quick hide feature 2015-10-01 15:24:43 -04:00
jmillman db03049385 do all quickhiding in memory, refector some filter stuff 2015-09-30 16:43:08 -04:00
Richard Cordovano 3c46575f98 Merge remote-tracking branch 'upstream/develop' into collaborative 2015-09-30 16:37:25 -04:00
jmillman 8aa67c830e Merge remote-tracking branch 'rcordovano/develop' into TL_quick_hide 2015-09-30 15:20:47 -04:00
jmillman a2a460665c quickhide refactoring 2015-09-30 15:20:17 -04:00
Richard Cordovano 00a6c19157 Merge pull request #1596 from millmanorama/cleanup_new_clustering
Cleanup new clustering, after https://github.com/sleuthkit/autopsy/pull/1595
2015-09-30 15:15:56 -04:00
Richard Cordovano cbbd6c375c Merge pull request #1595 from millmanorama/develop
Initial Pull request for new style event clustering.
2015-09-30 15:15:35 -04:00
Richard Cordovano 3e49f53938 Merge pull request #1597 from sleuthkit/revert-1521-jython-editors
Revert "adding documentations to how to install jython editions"
2015-09-30 15:07:10 -04:00
Richard Cordovano 4588ed4a82 Revert "adding documentations to how to install jython editions" 2015-09-30 15:07:02 -04:00
Richard Cordovano de07b4273a Merge pull request #1521 from mhmdfy/jython-editors
adding documentations to how to install jython editions
2015-09-30 14:22:27 -04:00
jmillman 0230b5fff9 fix merge conflicts that lost hiding controls 2015-09-30 13:32:57 -04:00
momo ef0ed0a2df inaccurate comment 2015-09-30 13:07:27 -04:00
jmillman 4575902791 Merge branch 'cleanup_new_clustering' into TL_quick_hide
Conflicts:
	Core/src/org/sleuthkit/autopsy/timeline/datamodel/EventBundle.java
	Core/src/org/sleuthkit/autopsy/timeline/datamodel/EventCluster.java
	Core/src/org/sleuthkit/autopsy/timeline/datamodel/EventStripe.java
	Core/src/org/sleuthkit/autopsy/timeline/datamodel/FilteredEventsModel.java
	Core/src/org/sleuthkit/autopsy/timeline/db/SQLHelper.java
	Core/src/org/sleuthkit/autopsy/timeline/filters/DescriptionFilter.java
	Core/src/org/sleuthkit/autopsy/timeline/filters/Filter.java
	Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/DetailViewPane.java
	Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/EventDetailChart.java
	Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/EventStripeNode.java
	Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/tree/EventDescriptionTreeItem.java
	Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/tree/EventTypeTreeItem.java
	Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/tree/NavPanel.java
	Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/tree/NavTreeItem.java
	Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/tree/RootItem.java
	Core/src/org/sleuthkit/autopsy/timeline/zooming/DescriptionLOD.java
	CoreLibs/nbproject/project.xml
2015-09-30 12:57:59 -04:00
momo 429884b45d clean up code 2015-09-30 11:40:07 -04:00
momo 187032e69a add .txt files to tmp file to compare 2015-09-30 11:02:45 -04:00
momo dd514cf960 remove comment 2015-09-29 16:48:38 -04:00
jmillman 6d7bd8281c cleanup EventDetailChart 2015-09-29 16:45:10 -04:00
momo 53d8a0c35e remove trailing (0) on file name 2015-09-29 16:34:49 -04:00
momo 506516e1ca rebuild() cleanup and remove .txt files from zip 2015-09-29 16:24:37 -04:00
jmillman ef1bce95f2 clean up and rearange initialization code and tooltip loading 2015-09-29 16:11:39 -04:00
jmillman d8c78b56fa load tooltip info on background thread 2015-09-29 15:14:43 -04:00
jmillman eb0c72b43a more cleanup and simplification of code for only new style clustering 2015-09-29 14:18:45 -04:00