6672 Commits

Author SHA1 Message Date
Jason Letourneau
15fd54bb0b Merge remote-tracking branch 'origin/pr/529' into develop 2014-03-07 10:35:48 -05:00
Jason Letourneau
1f96e20e50 Merge remote-tracking branch 'origin/pr/528' into develop 2014-03-07 10:35:43 -05:00
Jason Letourneau
41def13c7c resolved conflict 2014-03-07 10:35:21 -05:00
Jason Letourneau
ba0cc8da0e resolved conflict 2014-03-07 10:29:53 -05:00
Jason Letourneau
238d3ecf92 Merge remote-tracking branch 'origin/pr/525' into develop 2014-03-07 10:28:32 -05:00
Jason Letourneau
2667b6aaee Merge remote-tracking branch 'origin/pr/524' into develop 2014-03-07 10:28:28 -05:00
Jason Letourneau
4c967de40f Merge remote-tracking branch 'origin/pr/523' into develop 2014-03-07 10:28:25 -05:00
Jason Letourneau
68b5bb0ed4 Merge remote-tracking branch 'origin/pr/522' into develop 2014-03-07 10:28:20 -05:00
Jason Letourneau
04e156c860 Merge remote-tracking branch 'origin/pr/521' into develop 2014-03-07 10:28:18 -05:00
Jason Letourneau
261803389a Merge remote-tracking branch 'origin/pr/520' into develop 2014-03-07 10:28:14 -05:00
Jason Letourneau
27dfa08307 Merge remote-tracking branch 'origin/pr/519' into develop 2014-03-07 10:28:10 -05:00
Jason Letourneau
6123f8c707 Merge remote-tracking branch 'origin/pr/518' into develop 2014-03-07 10:28:06 -05:00
Jason Letourneau
251bb8db30 Merge remote-tracking branch 'origin/pr/517' into develop 2014-03-07 10:27:49 -05:00
Jason Letourneau
9b561dbddd Merge remote-tracking branch 'origin/pr/516' into develop 2014-03-07 10:27:44 -05:00
Jason Letourneau
d5b008c733 Merge remote-tracking branch 'origin/pr/515' into develop 2014-03-07 10:27:36 -05:00
Jason Letourneau
0aad4b480d Merge remote-tracking branch 'origin/pr/514' into develop 2014-03-07 10:27:33 -05:00
Jason Letourneau
38dc0c414e Merge remote-tracking branch 'origin/pr/513' into develop 2014-03-07 10:27:30 -05:00
Jason Letourneau
ba3ab5e175 Merge remote-tracking branch 'origin/pr/512' into develop 2014-03-07 10:27:27 -05:00
Jason Letourneau
cce96735c8 Merge remote-tracking branch 'origin/pr/511' into develop 2014-03-07 10:27:23 -05:00
Jason Letourneau
4879882898 Merge remote-tracking branch 'origin/pr/506' into develop 2014-03-07 10:27:18 -05:00
Jason Letourneau
6a6f4a10ca merge conflict resolved 2014-03-07 10:27:06 -05:00
Jason Letourneau
ab9c9f7160 Merge remote-tracking branch 'origin/pr/499' into develop 2014-03-07 10:24:06 -05:00
Jason Letourneau
f8b682437d Merge remote-tracking branch 'origin/pr/498' into develop 2014-03-07 10:23:50 -05:00
Richard Cordovano
f1d4dcf80b Refined ingest module API 2014-03-07 00:47:49 -05:00
Richard Cordovano
02c1f109aa Refine ingest API and work on adapting file ext mismatch ingest module 2014-03-07 00:04:50 -05:00
Kay Bassi
4641c72d0a More translation 2014-03-06 18:10:06 -08:00
Samuel H. Kenyon
fb5c514321 Merge remote-tracking branch 'upstream/develop' into searchoptions 2014-03-06 16:34:27 -05:00
Samuel H. Kenyon
728fbc1947 Radio buttons are now arranged horizontally. 2014-03-06 16:34:03 -05:00
Richard Cordovano
111414b1fe Adapt (minimally) keyword search module to new ingest API 2014-03-06 16:20:17 -05:00
Samuel H. Kenyon
63aa8d182b Color the mag glass in the search button icon for rollover and pressed states. 2014-03-06 16:01:43 -05:00
Samuel H. Kenyon
0eae6ef5e9 Don't add substring regex to a user's regex string. 2014-03-06 15:52:56 -05:00
Samuel H. Kenyon
7786093c9f Fix missing highlighting content for substring match searches. 2014-03-06 15:28:50 -05:00
Richard Cordovano
222afe05cc Merge pull request #532 from shahit2/timezoom
Timezoom
2014-03-06 14:39:40 -05:00
Nick Davis
4b38f3d27b Merge branch 'core-menuactions' of ssh://repo.narfindustries.com/autopsy-jp into core-menuactions 2014-03-06 14:21:20 -05:00
Nick Davis
8cdf16c289 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into core-menuactions 2014-03-06 14:20:59 -05:00
Kay Bassi
47be7d37cb Initial translation 2014-03-06 10:59:56 -08:00
Samuel H. Kenyon
7bdc501934 Fix some of the logic for escaping on regex input. 2014-03-06 13:51:09 -05:00
Trilok Shahi
20c2a35a16 timezoom changes 2014-03-06 13:46:52 -05:00
Samuel H. Kenyon
427a99fb30 Re-enable the enter key to search ability. 2014-03-06 13:41:57 -05:00
Kay Bassi
b1e7bd85f4 Completed translation 2014-03-06 10:27:47 -08:00
Samuel H. Kenyon
ccb15a338a KeywordSearchPanel now derives directly from Swing panel. 2014-03-06 13:23:54 -05:00
Richard Cordovano
72972fe199 Simplify new KeywordSearchManager class 2014-03-06 13:10:29 -05:00
Richard Cordovano
05c9e0876c Merge pull request #473 from shahit2/object
added object ID column
2014-03-06 12:26:18 -05:00
Richard Cordovano
66cb306c92 Merge pull request #470 from shahit2/timeline2
changed timezone and times to UTC for display
2014-03-06 12:25:41 -05:00
Richard Cordovano
9072407bf6 Commit notes and steps towards a keyword lists manager 2014-03-06 12:15:01 -05:00
Samuel H. Kenyon
658a44044f Factory should use isLiteral() for literal, not isEscaped(). This seems to fix the preview column issue. 2014-03-05 17:57:19 -05:00
Richard Cordovano
1ef860294a Refactored keyword search (transitional) for new ingest API 2014-03-05 17:27:20 -05:00
Samuel H. Kenyon
8cdec14a95 Visual changes to the search KeywordSearchPanel. 2014-03-05 17:15:44 -05:00
Richard Cordovano
d6dc5922c7 Merge pull request #531 from alexjacks92/develop
Style issues.
2014-03-05 17:02:40 -05:00
Samuel H. Kenyon
f63d6f68d1 Delete old settings menu. 2014-03-05 16:53:52 -05:00