Richard Cordovano
|
56f5d0cf9f
|
Merge remote-tracking branch 'upstream/develop' into serialize_ingest_module_settings
|
2014-04-24 09:26:13 -04:00 |
|
Richard Cordovano
|
71212a4813
|
Replace Java lib object stream with NetBeans object streams for ingest module settings serialization
|
2014-04-24 09:25:39 -04:00 |
|
Richard Cordovano
|
34e8f960e5
|
Merge pull request #686 from SynapticNulship/unfreeze
Improve ingestJobs concurrency
|
2014-04-24 09:24:08 -04:00 |
|
Brian Carrier
|
460d92e67f
|
Fixed file type panel, which was too wide
|
2014-04-24 00:19:03 -04:00 |
|
Brian Carrier
|
2e826b8cff
|
Added image extensions to each other
|
2014-04-24 00:18:15 -04:00 |
|
Samuel H. Kenyon
|
008e4ddbe9
|
remove unnecessary declare/assignment break
|
2014-04-23 17:26:45 -04:00 |
|
Samuel H. Kenyon
|
f8ce131626
|
Merge remote-tracking branch 'upstream/develop' into unfreeze
|
2014-04-23 17:22:15 -04:00 |
|
Samuel H. Kenyon
|
fbe7eaf364
|
converted ingestJobs into a ConcurrentHashMap
|
2014-04-23 17:21:17 -04:00 |
|
Samuel H. Kenyon
|
dcfd2f276d
|
ingestJobs now has its own lock (itself); ingestTasks still uses this for locking
|
2014-04-23 16:10:49 -04:00 |
|
Richard Cordovano
|
0da3ca9071
|
Merge pull request #685 from SynapticNulship/reportbug
Fix SQLITE_ERROR exceptions seen in the log when generating reports.
|
2014-04-23 15:34:57 -04:00 |
|
Samuel H. Kenyon
|
d4afaefe92
|
added method comment
|
2014-04-23 15:17:49 -04:00 |
|
Samuel H. Kenyon
|
420eee58c6
|
Changed query for tags associated with this artifact to match the actual DB schema, and extracted that to a method
|
2014-04-23 15:13:40 -04:00 |
|
Richard Cordovano
|
8b9742ea91
|
Merge pull request #683 from SynapticNulship/mt-update
thread-safety updates for ingest module summary posting
|
2014-04-23 13:07:57 -04:00 |
|
Richard Cordovano
|
d8e590be04
|
Merge pull request #684 from mrtizmo/keywordsearch-ja
Keywordsearch - additional Japanese translations
|
2014-04-23 13:01:47 -04:00 |
|
Richard Cordovano
|
cfa4ad20d0
|
Merge pull request #682 from alexjacks92/dbClosing
Database connections will be closed before exiting methods.
|
2014-04-23 13:01:21 -04:00 |
|
Nick Davis
|
cfcdccd6f8
|
Resolve merge conflict.
|
2014-04-23 12:51:37 -04:00 |
|
Samuel H. Kenyon
|
9bbfaecece
|
prevent netbeans assigned value is never used warning (although it's innocuous in this case)
|
2014-04-23 11:59:59 -04:00 |
|
Samuel H. Kenyon
|
b30c63ec36
|
Merge remote-tracking branch 'upstream/develop' into mt-update
Conflicts:
KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestModule.java
|
2014-04-23 11:55:34 -04:00 |
|
Samuel H. Kenyon
|
d1861b77ba
|
HashDbIngestModule: slight optimization for totals access (reduce number of lock acquisitions)
|
2014-04-23 11:50:40 -04:00 |
|
Samuel H. Kenyon
|
f300ca7ef0
|
synchronize access to the totals map
|
2014-04-23 11:48:50 -04:00 |
|
Samuel H. Kenyon
|
ef7a77f78c
|
Reinserted refCounter increment since it used to be a side effect of a method that was removed.
|
2014-04-23 11:27:02 -04:00 |
|
alexjacks92
|
a830e8b349
|
Merge remote-tracking branch 'upstream/develop' into dbClosing
|
2014-04-23 11:19:09 -04:00 |
|
alexjacks92
|
f4bc376d21
|
Close database connections before exiting methods.
|
2014-04-23 11:18:30 -04:00 |
|
Richard Cordovano
|
6af898fdaf
|
Merge remote-tracking branch 'upstream/develop' into serialize_ingest_module_settings
|
2014-04-23 10:52:42 -04:00 |
|
Richard Cordovano
|
33439ecb43
|
Merge pull request #681 from mrtizmo/recentactivity-ja
RecentActivity additional Japanese translations
|
2014-04-23 10:34:44 -04:00 |
|
Richard Cordovano
|
16f081ea8e
|
Merge pull request #680 from mrtizmo/thunderbird
ThunderbirdParser - added NON-NLS tags
|
2014-04-23 10:34:38 -04:00 |
|
Richard Cordovano
|
504e8d2839
|
Merge pull request #678 from mrtizmo/scalpel
ScalpelCarver - Added NON-NLS tags to hardcoded strings not needing Nati...
|
2014-04-23 10:33:55 -04:00 |
|
Richard Cordovano
|
57032732b5
|
Merge pull request #677 from mrtizmo/hashdatabase-ja
HashDatabase additional translations
|
2014-04-23 10:33:48 -04:00 |
|
Richard Cordovano
|
2b7b32830d
|
Merge pull request #676 from mrtizmo/ingest-ja
Ingest module additional Japanese translations
|
2014-04-23 10:33:39 -04:00 |
|
Richard Cordovano
|
7feafd1ac5
|
Merge pull request #675 from mrtizmo/recentactivity
RecentActivity - Added NON-NLS tags to hardcoded strings not needing Nat...
|
2014-04-23 10:32:47 -04:00 |
|
Richard Cordovano
|
463d34c160
|
Merge pull request #673 from mrtizmo/keywordsearch
KeywordSearch - Added NON-NLS tags to hardcoded strings not needing Nati...
|
2014-04-23 09:43:41 -04:00 |
|
Richard Cordovano
|
c3fc2b2c02
|
Merge pull request #672 from mrtizmo/filetypeid-ja
Filetypeid module - additional JA translations
|
2014-04-23 09:39:12 -04:00 |
|
Richard Cordovano
|
b5c7d3a9b1
|
Merge pull request #671 from mrtizmo/fileextmismatch-ja
Fileextmismatch module - additional JA translations
|
2014-04-23 09:38:48 -04:00 |
|
Nick Davis
|
fb43fcc13c
|
Merge branch 'develop' of https://github.com/sleuthkit/autopsy into recentactivity-ja
|
2014-04-22 17:39:19 -04:00 |
|
Kay Bassi
|
c508b6af5f
|
Translation complete. Checked for inconsistencies.
|
2014-04-22 17:18:22 -04:00 |
|
Nick Davis
|
cb8057e66a
|
Pulled new static string.
|
2014-04-22 17:06:49 -04:00 |
|
Nick Davis
|
47b95ebd52
|
Merge branch 'develop' of https://github.com/sleuthkit/autopsy into thunderbird
|
2014-04-22 17:02:28 -04:00 |
|
Nick Davis
|
33d0a9e3b3
|
ThunderbirdParser - Added NON-NLS tags to hardcoded strings not needing National Language Support.
|
2014-04-22 17:01:39 -04:00 |
|
Nick Davis
|
837a18abd3
|
Merge branch 'develop' of https://github.com/sleuthkit/autopsy into keywordsearch-ja
|
2014-04-22 16:52:24 -04:00 |
|
Richard Cordovano
|
6cc432947b
|
Improve error handling in IngestJobLauncher
|
2014-04-22 16:51:27 -04:00 |
|
Kay Bassi
|
ea85cdcc16
|
Translation complete. Checked for inconsistencies.
|
2014-04-22 16:22:51 -04:00 |
|
Nick Davis
|
7b20874ecb
|
ScalpelCarver - Added NON-NLS tags to hardcoded strings not needing National Language Support.
|
2014-04-22 16:04:43 -04:00 |
|
Nick Davis
|
9ccd6724df
|
Merge branch 'develop' of https://github.com/sleuthkit/autopsy into hashdatabase-ja
|
2014-04-22 15:58:35 -04:00 |
|
Kay Bassi
|
45464aa17d
|
Translation complete.
|
2014-04-22 15:54:45 -04:00 |
|
Nick Davis
|
a06d8c051f
|
Merge branch 'develop' of https://github.com/sleuthkit/autopsy into ingest-ja
|
2014-04-22 15:54:37 -04:00 |
|
Nick Davis
|
85083eeaac
|
RecentActivity - Added NON-NLS tags to hardcoded strings not needing National Language Support.
|
2014-04-22 15:52:40 -04:00 |
|
Samuel H. Kenyon
|
30bb4ee6ae
|
Merge remote-tracking branch 'upstream/develop' into mt-update
Conflicts:
Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchIngestModule.java
HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbIngestModule.java
|
2014-04-22 15:48:51 -04:00 |
|
Samuel H. Kenyon
|
2de09e1914
|
A few more thread-safety adjustments for summary posting
|
2014-04-22 15:45:09 -04:00 |
|
Richard Cordovano
|
1bd4d58e14
|
Merge pull request #670 from alexjacks92/smarterDiffing
Smarter diffing - replace object id's with file paths instead.
|
2014-04-22 15:43:40 -04:00 |
|
Kay Bassi
|
6074e1d656
|
Translation complete.
|
2014-04-22 15:42:17 -04:00 |
|