millmanorama
|
db3b970018
|
Merge remote-tracking branch 'upstream/release-4.4.1' into 2791-open-tree-off-EDT
|
2017-07-06 10:58:52 +02:00 |
|
Richard Cordovano
|
687c9da052
|
Resolve merge conflicts for KeywordHits tree class
|
2017-07-05 17:47:15 -04:00 |
|
Richard Cordovano
|
c2d2ed5457
|
Merge pull request #2918 from narfindustries/schema_changes2
Schema changes2
|
2017-07-05 16:12:54 -04:00 |
|
Richard Cordovano
|
bf250acc06
|
Merge branch 'develop' into schema_changes2
|
2017-07-05 16:12:47 -04:00 |
|
Richard Cordovano
|
e64514aaaa
|
Merge pull request #2917 from narfindustries/issue127
Issue127
|
2017-07-05 15:29:21 -04:00 |
|
Richard Cordovano
|
2a0c6a1c1c
|
Merge branch 'develop' into issue127
|
2017-07-05 15:26:37 -04:00 |
|
Richard Cordovano
|
989292b600
|
Merge branch 'narfindustries-issue192_fixes' into release-4.4.1
|
2017-07-05 15:20:47 -04:00 |
|
Richard Cordovano
|
59790a9937
|
Merge pull request #2913 from narfindustries/issue188
Issue188
|
2017-07-05 15:18:46 -04:00 |
|
Richard Cordovano
|
066ef2a9ac
|
Merge pull request #2912 from narfindustries/issue192
Issue192
|
2017-07-05 15:17:38 -04:00 |
|
Richard Cordovano
|
f0c5709311
|
Merge branch 'issue192_fixes' of https://github.com/narfindustries/autopsy into narfindustries-issue192_fixes
|
2017-07-05 15:12:21 -04:00 |
|
Richard Cordovano
|
43f103b5ad
|
Merge remote-tracking branch 'upstream/release-4.4.1' into develop
|
2017-07-05 11:57:10 -04:00 |
|
Nick Davis
|
0e7409ee4d
|
updated code to handle null values in object init and read from db. updated code to validate correlation type db table name.
|
2017-06-30 13:56:05 -04:00 |
|
Maxwell Koo
|
7bf0799fec
|
Change query API to use type/value instead of partially constructed artifacts
|
2017-06-30 13:48:12 -04:00 |
|
Maxwell Koo
|
c882aed613
|
Lower-case all correlation values and paths at the data model layer as discussed in meeting, preserve leading + character in phone number normalization
|
2017-06-30 11:14:11 -04:00 |
|
Maxwell Koo
|
1add69d786
|
Merge branch 'issue192' into issue192_fixes
|
2017-06-30 11:08:37 -04:00 |
|
millmanorama
|
88bed0b60a
|
some more minor cleanup
|
2017-06-30 15:40:54 +02:00 |
|
millmanorama
|
548481c166
|
expand tree in a swingworker
|
2017-06-30 15:03:36 +02:00 |
|
millmanorama
|
78282bb2ec
|
cleanup and formatting
|
2017-06-30 15:03:36 +02:00 |
|
Maxwell Koo
|
c26bcf340c
|
Merge branch 'release-4.4.1' into develop
|
2017-06-30 08:55:05 -04:00 |
|
Nick Davis
|
b6926ebfcd
|
Fix NPE when trying to get case details from a global row, which has no case.
|
2017-06-29 17:22:56 -04:00 |
|
Nick Davis
|
dc4c541d46
|
changed some schema table entries to allow NULL or set as NOT NULL
|
2017-06-29 17:13:51 -04:00 |
|
Richard Cordovano
|
f4a7fd9035
|
Fix doxygen warnings for DisplayableItemNode, IngestModuleFactory
|
2017-06-29 14:07:18 -04:00 |
|
Richard Cordovano
|
2fae538b08
|
Remove older docs for Central Repo
|
2017-06-29 13:11:48 -04:00 |
|
Richard Cordovano
|
48f80210d2
|
Update Autopsy-Core NBM versioning
|
2017-06-29 13:06:59 -04:00 |
|
Maxwell Koo
|
d152d7a008
|
Return a list of correlation artifacts when converting a blackboard artifact to capture more attributes
|
2017-06-29 12:22:26 -04:00 |
|
Richard Cordovano
|
cce534995f
|
Merge branch 'release-4.4.1' of github.com:sleuthkit/autopsy into release-4.4.1
|
2017-06-29 12:14:55 -04:00 |
|
Richard Cordovano
|
a57b524ca1
|
Revert change of ViewContextAction to final (reverse public API change)
|
2017-06-29 12:14:41 -04:00 |
|
Richard Cordovano
|
f9c295501f
|
Merge pull request #2911 from APriestman/crDocUpdate
Updated documentation screenshots
|
2017-06-29 11:53:08 -04:00 |
|
Richard Cordovano
|
0c9b12d7cb
|
Switch project.properties to RELEASE
|
2017-06-29 11:45:50 -04:00 |
|
Ann Priestman
|
e1709df0f3
|
Updated documentation screenshots
|
2017-06-29 11:45:12 -04:00 |
|
Richard Cordovano
|
8377b6c058
|
Update NEWS.txt for release 4.4.1
|
2017-06-29 11:37:39 -04:00 |
|
Richard Cordovano
|
f77c1ab496
|
Merge branch 'release-4.4.1' of github.com:sleuthkit/autopsy into release-4.4.1
|
2017-06-29 11:20:51 -04:00 |
|
Richard Cordovano
|
34de89e510
|
Update/correct some display strings in EamDbSettingsDialog
|
2017-06-29 11:20:38 -04:00 |
|
Maxwell Koo
|
1e4a790d00
|
Remove non-digits from phone numbers
|
2017-06-29 11:16:17 -04:00 |
|
Richard Cordovano
|
c131302606
|
Merge pull request #2910 from APriestman/addCRdoc
Added documentation for central repository
|
2017-06-29 09:48:36 -04:00 |
|
Ann Priestman
|
f088f162ae
|
Renamed doc
|
2017-06-29 09:46:19 -04:00 |
|
Richard Cordovano
|
21b0ec6d41
|
Merge pull request #2909 from narfindustries/fix_merged_schema
fixed schema errors
|
2017-06-29 09:40:28 -04:00 |
|
Ann Priestman
|
4cc122ec00
|
Added documentation for central repository
|
2017-06-29 09:25:44 -04:00 |
|
Nick Davis
|
ebf62ab919
|
fixed schema errors
|
2017-06-28 23:14:12 -04:00 |
|
Richard Cordovano
|
5bbb55c8ed
|
Merge pull request #2908 from narfindustries/schema_changes
Schema changes
|
2017-06-28 18:26:14 -04:00 |
|
Nick Davis
|
e278f2a103
|
resolved bugs from schema changes.
|
2017-06-28 18:00:29 -04:00 |
|
Nick Davis
|
95c7f9bdc7
|
resolved merge conflicts.
|
2017-06-28 16:43:47 -04:00 |
|
Nick Davis
|
7a5f270474
|
schema changes related to correlation type renaming.
|
2017-06-28 16:38:33 -04:00 |
|
Richard Cordovano
|
5c456e51a3
|
Merge pull request #2906 from narfindustries/hashdb_imports
Hashdb import error handling and code cleanup - resolved merge conflicts
|
2017-06-28 15:10:12 -04:00 |
|
Richard Cordovano
|
6092d23282
|
Update installSolr.dox to still mention Zookeeper
|
2017-06-28 15:05:51 -04:00 |
|
Richard Cordovano
|
ab4668a66b
|
Merge pull request #2907 from APriestman/solrDocUpdate
Remove zookeeper instructions from solr installation docs
|
2017-06-28 15:01:14 -04:00 |
|
Ann Priestman
|
7550ad0b2c
|
Remove zookeeper instructions from solr installation docs
|
2017-06-28 14:32:00 -04:00 |
|
Nick Davis
|
f6d916f3ea
|
merged with upstream and resolved conflicts.
|
2017-06-28 13:29:41 -04:00 |
|
Richard Cordovano
|
5fa302e757
|
Merge branch 'release-4.4.1' of github.com:sleuthkit/autopsy into release-4.4.1
|
2017-06-28 13:27:21 -04:00 |
|
Nick Davis
|
151459bf5e
|
removed unused code that was missed by merge.
|
2017-06-28 13:24:02 -04:00 |
|