6672 Commits

Author SHA1 Message Date
alexjacks92
da6cac634c Rogue parenthesis deleted. 2014-01-23 12:51:18 -05:00
alexjacks92
c54048ac2d Merge branch 'develop' into jenkinsTests 2014-01-23 12:47:27 -05:00
alexjacks92
2f6ee5d29e Changing pull back to main repos instead of mine. 2014-01-23 12:43:46 -05:00
shahit2
e2dca5f4da committing files that could be changed to non-pub 2014-01-23 12:25:47 -05:00
alexjacks92
c1c9075241 Merge remote-tracking branch 'upstream/develop' into develop 2014-01-23 11:29:28 -05:00
Richard Cordovano
d1a1a798dc Merge pull request #449 from rcordovano/mismatch_simple_config_fix
Fixed bundle.properties for file ext mismatch module
2014-01-23 08:28:31 -08:00
alexjacks92
4243010bca Merge remote-tracking branch 'upstream/develop' into develop 2014-01-23 11:28:13 -05:00
Richard Cordovano
7c53b0e56f Fixed bundle.properties for file ext mismatch module 2014-01-23 11:26:22 -05:00
raman-bt
a42be73f75 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into develop 2014-01-23 10:05:20 -05:00
shahit2
1685a38a92 reverting back 2014-01-22 16:45:46 -05:00
shahit2
cd42336785 committing 2014-01-22 16:36:42 -05:00
Richard Cordovano
ad47937145 Merge pull request #446 from shahit2/mismatch
Mismatch
2014-01-22 10:24:17 -08:00
shahit2
8c25744d11 Mismatch Changes 2014-01-22 13:07:17 -05:00
shahit2
a3b9bc105a added Mimetypes/filters 2014-01-22 12:10:27 -05:00
shahit2
874c7b24ec Files that could be changed to non-public have been 2014-01-22 11:05:05 -05:00
shahit2
1c85f040d4 Some files changed to non-public 2014-01-22 09:30:41 -05:00
alexjacks92
e074b83d12 Merge branch 'develop' of https://www.github.com/sleuthkit/autopsy into develop 2014-01-21 16:56:28 -05:00
alexjacks92
92d9c97cff Merge remote-tracking branch 'upstream/develop' into jenkinsTests 2014-01-21 16:09:07 -05:00
Richard Cordovano
9fe9c572e1 Merge pull request #441 from rcordovano/missing_hash_db_fix
Removed outdated code from missing hash db search
2014-01-21 12:52:02 -08:00
Richard Cordovano
671ff7a31f Removed outdated code from missing hash db search 2014-01-21 15:49:33 -05:00
shahit2
c2e596c260 Some files changed to non-public 2014-01-21 15:12:57 -05:00
alexjacks92
88d36cba4f Merge branch 'develop' of https://www.github.com/sleuthkit/autopsy into develop 2014-01-21 14:33:54 -05:00
shahit2
a352cac357 change some files to non-public
Had some files open that didnt get committed
2014-01-21 14:21:28 -05:00
shahit2
f1d2e7e8bf change some files to non-public
changes some files to non-public
2014-01-21 14:20:21 -05:00
shahit2
e5d4ea92a4 changes to non-public
some files changed to to non-public
2014-01-21 14:19:19 -05:00
Brian Carrier
aba1af8308 Merge pull request #433 from SynapticNulship/mmext
Changes to use AbstractFile.getNameExtension()
2014-01-21 11:01:21 -08:00
Brian Carrier
653b74e912 Merge pull request #437 from rcordovano/db_upgrade_backup
Added notification of case db schema upgrade backup
2014-01-21 10:58:30 -08:00
alexjacks92
e300311bd1 Fixing bug where an email would try to be sent, even if it shouldn't. 2014-01-21 13:53:13 -05:00
alexjacks92
a30a1ec510 added git checkout before git pull. 2014-01-21 13:32:15 -05:00
alexjacks92
26f46eef19 Merge remote-tracking branch 'upstream/develop' into develop 2014-01-21 09:44:14 -05:00
raman-bt
c3330e3968 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into develop 2014-01-21 08:13:06 -05:00
Richard Cordovano
5eab10bbe7 Added notification of case db schema upgrade backup 2014-01-21 00:18:15 -05:00
Richard Cordovano
36e1590b40 Merge pull request #436 from rcordovano/hashdb_fixes
Fixed bug in comment attrs for hash set hit artifacts
2014-01-20 09:12:18 -08:00
Richard Cordovano
5dc43405f4 Fixed bug in comment attrs for hash set hit artifacts 2014-01-20 12:07:33 -05:00
Brian Carrier
2050dfd9d2 Merge branch 'master' of github.com:sleuthkit/autopsy 2014-01-19 21:43:11 -05:00
Brian Carrier
e75ffc4541 Merge branch 'develop' of github.com:sleuthkit/autopsy into develop 2014-01-19 21:41:17 -05:00
Brian Carrier
bcac4a5f8b line endings 2014-01-19 21:40:56 -05:00
Richard Cordovano
29df77e3ed Merge pull request #434 from rcordovano/hashdb_fixes
Restored inadvertantly deleted hash db code
2014-01-17 14:48:28 -08:00
Richard Cordovano
ba5e411f59 Restored inadvertantly deleted hash db code 2014-01-17 17:44:10 -05:00
Samuel H. Kenyon
84bdc09115 safety dance 2014-01-17 16:56:33 -05:00
Samuel H. Kenyon
dfe149d54b Get the same extension that Mismatch module uses. 2014-01-17 16:18:03 -05:00
Brian Carrier
4f3683b438 Merge branch 'develop' of github.com:sleuthkit/autopsy into develop 2014-01-17 15:21:35 -05:00
Brian Carrier
1e2f82483e line endings 2014-01-17 15:21:28 -05:00
alexjacks92
d2056cb7f4 Fixed email issues. 2014-01-17 15:10:19 -05:00
Brian Carrier
0d8c29ebb2 set progress to 100 after commit 2014-01-17 14:51:48 -05:00
Samuel H. Kenyon
5e457da489 Also add "adp" extension to plaintext. 2014-01-17 14:40:49 -05:00
Samuel H. Kenyon
47ea29634a Use AbstractFile.getNameExtension() 2014-01-17 14:40:16 -05:00
Samuel H. Kenyon
be6856b8aa Merge remote-tracking branch 'upstream/develop' into mmext 2014-01-17 14:38:30 -05:00
Brian Carrier
dfb33d44fa Merge branch 'develop' of github.com:sleuthkit/autopsy into develop 2014-01-17 13:59:53 -05:00
Brian Carrier
d85fd4e646 Merge pull request #431 from rcordovano/rework_hashdb
Rework hashdb
2014-01-17 10:59:22 -08:00