Richard Cordovano
|
28ed311fa7
|
Merge branch 'collaborative' of https://github.com/sleuthkit/autopsy into collaborative
|
2015-04-03 09:45:20 -04:00 |
|
Richard Cordovano
|
80ca71ca16
|
Merge remote-tracking branch 'upstream/develop' into collaborative
|
2015-04-03 09:44:17 -04:00 |
|
Richard Cordovano
|
610ae94eb5
|
Merge pull request #1160 from karlmortensen/change_options_menu
Collaborative UI
|
2015-04-03 09:40:43 -04:00 |
|
Brian Carrier
|
aab7710c0a
|
Merge pull request #1169 from sleuthkit/move-tags-node
Move tags node
|
2015-04-02 23:57:41 -04:00 |
|
Brian Carrier
|
a7c188fdf2
|
Merge branch 'develop' of github.com:sleuthkit/autopsy into develop
|
2015-04-02 23:43:50 -04:00 |
|
Karl Mortensen
|
0d0f5c9bf7
|
figured out what merged poorly
|
2015-04-02 17:20:01 -04:00 |
|
Karl Mortensen
|
570497c1b2
|
reremerge
|
2015-04-02 17:15:25 -04:00 |
|
Karl Mortensen
|
2ef66884c8
|
remerge
|
2015-04-02 17:10:56 -04:00 |
|
Richard Cordovano
|
e196f724fd
|
Merge pull request #1168 from sidheshenator/doxygen_ref_python_examples
modDevPython.dox references appropriate files on github
|
2015-04-02 17:02:08 -04:00 |
|
sidheshenator
|
dd7a602553
|
modDevPython.dox references appropriate files on github
|
2015-04-02 16:35:48 -04:00 |
|
Karl Mortensen
|
4a5a5ffa46
|
automerge
|
2015-04-02 16:23:11 -04:00 |
|
Karl Mortensen
|
a365b39268
|
code review updates
|
2015-04-02 16:16:04 -04:00 |
|
Richard Cordovano
|
67522ccb11
|
Merge pull request #1165 from sidheshenator/build_xml_user_docs_dir_check
dir location checked before copying. No new dir created
|
2015-04-02 16:11:10 -04:00 |
|
Richard Cordovano
|
1a0ad0ef8c
|
Merge pull request #1167 from rcordovano/gui_refresh
Remove unneeded file refs from project.properties for Core nbm
|
2015-04-02 15:53:37 -04:00 |
|
Richard Cordovano
|
399d1e91a1
|
Remove unneeded file refs from project.properties for Core nbm
|
2015-04-02 15:51:44 -04:00 |
|
Richard Cordovano
|
25fa976211
|
Merge pull request #1166 from rcordovano/messaging_prototype
Messaging prototype
|
2015-04-02 13:29:46 -04:00 |
|
Richard Cordovano
|
d2e954b28d
|
Merge branch 'develop' of https://github.com/sleuthkit/autopsy into messaging_prototype
|
2015-04-02 13:25:31 -04:00 |
|
sidheshenator
|
170fdc7a5f
|
dir location checked before copying. No new dir created
|
2015-04-02 13:20:33 -04:00 |
|
Richard Cordovano
|
e5a694669a
|
Merge remote-tracking branch 'upstream/develop' into collaborative
|
2015-04-02 13:15:01 -04:00 |
|
Richard Cordovano
|
9a5744319b
|
Merge remote-tracking branch 'upstream/rc-211' into develop
|
2015-04-02 13:13:47 -04:00 |
|
Richard Cordovano
|
bef5f8d978
|
Merge pull request #1164 from sidheshenator/time_diff_independent_regression_test
timing test does not impact overall test
|
2015-04-02 12:18:46 -04:00 |
|
sidheshenator
|
7a51f102b3
|
timing test does not impact overall test
|
2015-04-02 12:16:18 -04:00 |
|
Brian Carrier
|
2069e9b9e8
|
Fix for image gallery to prevent infinite loop
|
2015-04-02 12:10:38 -04:00 |
|
Richard Cordovano
|
824d5ac4bf
|
Merge pull request #1162 from esaunders/upgrade_solr
Solr upgrade
|
2015-04-02 09:22:48 -04:00 |
|
Karl Mortensen
|
2ea37fce91
|
have enum follow same naming convention
|
2015-04-01 15:50:17 -04:00 |
|
sidheshenator
|
f721682d46
|
Cancel button disabled on report generation completion(with or without error)
|
2015-04-01 15:38:06 -04:00 |
|
Richard Cordovano
|
90d777fe78
|
Merge pull request #1161 from sidheshenator/interesting_items_fix_rc211
added rule.UUID instead rule.hashCode() to the rules HashMap
|
2015-04-01 14:51:05 -04:00 |
|
Karl Mortensen
|
c1a17f0725
|
wordsmith text
|
2015-04-01 14:47:08 -04:00 |
|
sidheshenator
|
8e5e6af9be
|
added rule.UUID instead rule.hashCode() to the rules HashMap
|
2015-04-01 14:41:44 -04:00 |
|
Karl Mortensen
|
b2548935f3
|
Merge branch 'collaborative' of https://github.com/sleuthkit/autopsy into change_options_menu
|
2015-04-01 14:34:32 -04:00 |
|
Karl Mortensen
|
1805dcf01b
|
Merge branch 'db_connection' of https://github.com/karlmortensen/autopsy into collab_ui
|
2015-04-01 14:03:24 -04:00 |
|
Karl Mortensen
|
2b376642de
|
Change options panel names and icons a bit
|
2015-04-01 14:02:05 -04:00 |
|
esaunders
|
6fb891b9d0
|
Added tika-core-1.5.jar file.
|
2015-04-01 13:32:43 -04:00 |
|
Eamonn Saunders
|
0dfbd55ec6
|
Upgrade to Tika 1.5.
|
2015-04-01 12:41:40 -04:00 |
|
Eamonn Saunders
|
0d000e89d3
|
Reordered to group related packages together. Hopefully this makes it easier to read although I wouldn't be surprised if Netbeans changes the ordering.
|
2015-04-01 12:40:42 -04:00 |
|
Eamonn Saunders
|
773b9380ec
|
Added a new dependency on metadata-extractor version 2.7.2. The reason for this is that the version that Tika pulls down (2.6.2) results in a java.lang.NoSuchMethodError exception being thrown.
|
2015-04-01 12:38:13 -04:00 |
|
Richard Cordovano
|
ead5e80edb
|
Merge pull request #1154 from APriestman/stix_march27
Bug fixes for STIX module.
|
2015-04-01 09:57:44 -04:00 |
|
Karl Mortensen
|
d6e2f26dc9
|
use database connectivity check
|
2015-03-31 16:54:59 -04:00 |
|
Richard Cordovano
|
88418edfd5
|
Restore ingest_pipeline.PNG
|
2015-03-31 16:11:47 -04:00 |
|
Richard Cordovano
|
9d0bb85e0e
|
Remove ingest_pipeline.PNG
|
2015-03-31 16:09:51 -04:00 |
|
Karl Mortensen
|
415c221f8a
|
add postgresql jdbc driver
|
2015-03-31 13:41:56 -04:00 |
|
Richard Cordovano
|
e628ecf3f4
|
Delete ingest_pipeline.png
Identical files with differnt capitalization of the extension are checked in. This does not play well with Windows.
|
2015-03-31 13:19:55 -04:00 |
|
Richard Cordovano
|
da1e0c387d
|
Merge pull request #1158 from sidheshenator/regression-test-fix
In file sorting. Additional file-sortedErrors.txt not created
|
2015-03-31 13:04:42 -04:00 |
|
esaunders
|
761edfe165
|
Merge branch 'collaborative' of github.com:sleuthkit/autopsy into upgrade_solr
|
2015-03-31 12:53:17 -04:00 |
|
Eamonn Saunders
|
4d39e38333
|
Updated Autopsy Core to use Tika 1.5.
|
2015-03-31 12:45:35 -04:00 |
|
sidheshenator
|
82207c31ad
|
In file sorting. Additional file-sortedErrors.txt not created
|
2015-03-31 12:42:02 -04:00 |
|
Richard Cordovano
|
bc29cdb336
|
Merge branch 'develop' of https://github.com/sleuthkit/autopsy into messaging_prototype
|
2015-03-31 12:25:02 -04:00 |
|
Richard Cordovano
|
34e933e299
|
Merge pull request #1157 from sidheshenator/regression-test-fix
Regression test fix
|
2015-03-31 12:22:36 -04:00 |
|
Richard Cordovano
|
68722444e6
|
Merge pull request #1153 from esaunders/collaborative
Replaced calls to SleuthkitCase.runQuery() with calls to SleuthkitCase.e...
|
2015-03-31 12:22:18 -04:00 |
|
sidheshenator
|
41b96b7d27
|
extra .txt extention removed
|
2015-03-31 10:14:31 -04:00 |
|