568 Commits

Author SHA1 Message Date
Alex Ebadirad
c86e7901d7 Added quotes around pasco lib path
Signed-off-by: Alex Ebadirad <aebadirad@42six.com>
2012-02-02 14:03:33 -07:00
anthony lawrence
fe25b012f5 Merge https://github.com/sleuthkit/autopsy 2012-02-02 15:45:56 -05:00
Alex Ebadirad
7ed0f9dddd Small bug fix to IE, resulting in lingering pascoresult.txt file
Signed-off-by: Alex Ebadirad <aebadirad@42six.com>
2012-02-02 13:22:57 -07:00
Alex Ebadirad
1a987048af Merges for IE fix and removing hardcoded values from blackboard attributes types, using enum instead
Signed-off-by: Alex Ebadirad <aebadirad@42six.com>
2012-02-02 12:58:38 -07:00
adam-m
125819c918 Merge branch 'master' of https://github.com/sleuthkit/autopsy 2012-02-02 14:07:01 -05:00
adam-m
d09404c6de Quote paths for windows shell in case there is a space 2012-02-02 14:06:39 -05:00
Brian Carrier
f9a56b11ad Merge branch 'master' of github.com:sleuthkit/autopsy
Conflicts:
	RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractIE.java
2012-02-02 14:01:14 -05:00
Brian Carrier
aa4e4dacbe Use attribute enum values instead of hard coded numbers 2012-02-02 13:58:24 -05:00
Dick Fickling
9faeead2c2 save IE history as single artifact per history entry 2012-02-02 13:30:41 -05:00
anthony lawrence
387a3c0299 Merge https://github.com/sleuthkit/autopsy
Conflicts:
	CoreComponents/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerString.java
	DataModel/src/org/sleuthkit/autopsy/datamodel/KeyValueThing.java
2012-02-02 12:56:19 -05:00
adam-m
8f89a3969b quick pasco 2 fix to locate jars and setup results dirs without needing manual setup.
TODO: need to push building of release/ jars into ant and remove from repo
2012-02-02 10:49:31 -05:00
adam-m
3bc6445ecf cosmetic wording changes 2012-02-02 10:16:59 -05:00
adam-m
c101420efe Merge remote-tracking branch 'aebadirad42six/master'
- fixed recent activity service, added progress reporting
- disabled RA explorer
- didn't merge sqlite change for DataModel (keeping the stable version)
2012-02-01 17:58:07 -05:00
Alexander Ebadirad
b6e4928e3b Restored IE history functionality
Signed-off-by: Alexander Ebadirad <aebadirad@42six.com>
2012-02-01 14:04:06 -07:00
Alexander Ebadirad
e3e4600577 Changes to update to new API -- TO DO get registry and IE working again
Signed-off-by: Alexander Ebadirad <aebadirad@42six.com>
2012-02-01 10:47:53 -07:00
Alexander Ebadirad
f30e4e4975 Merge branch 'master' of https://github.com/sleuthkit/autopsy
Conflicts:
	Ingest/src/org/sleuthkit/autopsy/ingest/IngestManager.java
	Ingest/src/org/sleuthkit/autopsy/ingest/IngestTopComponent.form
	Ingest/src/org/sleuthkit/autopsy/ingest/IngestTopComponent.java
	KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestService.java
2012-01-31 15:31:04 -07:00
Alexander Ebadirad
590e1034c0 Addition to blackboard for ff/chrome, registered ingester service -- TO DO remove topcomponent
Signed-off-by: Alexander Ebadirad <aebadirad@42six.com>
2012-01-31 14:37:10 -07:00
Alexander Ebadirad
d82b00046b Recent Activity commit
Signed-off-by: Alexander Ebadirad <aebadirad@42six.com>
2012-01-30 09:52:27 -07:00