Richard Cordovano
|
49922d02cd
|
Merge remote-tracking branch 'upstream/develop' into collaborative
|
2015-04-16 10:07:15 -04:00 |
|
Richard Cordovano
|
87cbca1b46
|
Merge pull request #1163 from sidheshenator/report_generation_panel_fix
Cancel button disabled on report generation completion(with or without e...
|
2015-04-16 10:02:42 -04:00 |
|
sidheshenator
|
772c6773a8
|
made reportProgressBar color less bright
|
2015-04-16 09:41:00 -04:00 |
|
Eamonn Saunders
|
ad5a11386c
|
Added Solr settings to Multi User options panel...again.
|
2015-04-15 20:31:38 -04:00 |
|
Richard Cordovano
|
db0ee81975
|
Merge branch 'collaborative' of https://github.com/sleuthkit/autopsy into msg_infrastructure
|
2015-04-15 18:33:09 -04:00 |
|
Richard Cordovano
|
b47d73da0d
|
Resolve merge conflicts for cherry-pick of Case class formatting
|
2015-04-15 18:13:46 -04:00 |
|
esaunders
|
e018f2291b
|
Resolved merge conflicts.
|
2015-04-15 16:02:00 -04:00 |
|
Eamonn Saunders
|
a2c78156a9
|
Added Solr settings to Multi User options panel.
|
2015-04-15 14:58:19 -04:00 |
|
Eamonn Saunders
|
c28c2d3934
|
Added Solr and database strings for Multi User options panel.
|
2015-04-15 14:55:35 -04:00 |
|
Eamonn Saunders
|
247ef1f1ec
|
Added CaseType member and accessor. Modified CaseType enum so as not to confuse me with its use of caseName.
|
2015-04-15 14:53:12 -04:00 |
|
Richard Cordovano
|
ecf8e81466
|
Added comments to Case class two-stage init
|
2015-04-15 13:11:54 -04:00 |
|
Richard Cordovano
|
b9948d36e2
|
Formatted Case.java and fixed IDE highlighted code issues
|
2015-04-15 13:08:34 -04:00 |
|
Richard Cordovano
|
c5acbb3810
|
Merge branch 'collaborative' of https://github.com/sleuthkit/autopsy into messenger_infrastructure_2
|
2015-04-15 12:59:42 -04:00 |
|
Richard Cordovano
|
0f33b2ccf7
|
Remove unused constant from MulitUserSettingsPanel
|
2015-04-15 12:32:34 -04:00 |
|
Richard Cordovano
|
9d7f649397
|
Remove unused imports from MultiUserSettingsPanel, MessageServiceConnectionInfo
|
2015-04-15 12:28:11 -04:00 |
|
Richard Cordovano
|
d6d74a53de
|
Complete multiuser settings panel additions for message service
|
2015-04-15 12:08:25 -04:00 |
|
Eamonn Saunders
|
a59dfb83c5
|
Added properties for indexing server host and port (and methods to access them).
|
2015-04-14 18:09:32 -04:00 |
|
Richard Cordovano
|
3d85a9d93a
|
Build out Messenger package a little more
|
2015-04-14 16:18:20 -04:00 |
|
Richard Cordovano
|
aa4e3906a2
|
Formatted Case class
|
2015-04-14 16:00:27 -04:00 |
|
Richard Cordovano
|
10a8e731f7
|
Simplify MessageServiceConnectionInfo API, tidy Messenger
|
2015-04-14 12:46:39 -04:00 |
|
Richard Cordovano
|
14f49ff78c
|
Add message service settings, part two
|
2015-04-14 12:31:08 -04:00 |
|
sidheshenator
|
748c62091f
|
ReportGeneration and progress panel modified for single report generation
|
2015-04-14 10:57:29 -04:00 |
|
Richard Cordovano
|
cd0f8a63d3
|
Merge branch 'collaborative' of https://github.com/sleuthkit/autopsy into messenger_infrastructure
|
2015-04-13 18:44:36 -04:00 |
|
Richard Cordovano
|
9ed219b870
|
Add message service settings, part one
|
2015-04-13 18:43:43 -04:00 |
|
Richard Cordovano
|
40d2ff0070
|
Merge pull request #1190 from karlmortensen/JNI_comms
JNI comms up and going
|
2015-04-13 17:56:06 -04:00 |
|
Karl Mortensen
|
8c15029a08
|
Update dbtype, remove comments, add bad credential warning
|
2015-04-13 16:58:50 -04:00 |
|
Karl Mortensen
|
158f635492
|
add warning if multi-user settings are invalid
|
2015-04-13 15:55:06 -04:00 |
|
Richard Cordovano
|
774ce9d390
|
Merge branch 'develop' of https://github.com/sleuthkit/autopsy into messenger_infrastructure
|
2015-04-13 15:41:42 -04:00 |
|
Richard Cordovano
|
9ffc4d6108
|
Merge remote-tracking branch 'upstream/develop' into collaborative
|
2015-04-13 15:39:17 -04:00 |
|
Karl Mortensen
|
242c7b1b82
|
JNI comms up and going
|
2015-04-13 14:55:46 -04:00 |
|
sidheshenator
|
3d5f08bc9f
|
jython 2.5.3 standalone callable jar included. Dox reflect appropriate changes
|
2015-04-13 14:11:43 -04:00 |
|
Eamonn Saunders
|
0bb37a029e
|
- Added support for connecting to remote Solr server.
- Refactored local Solr server startup logic.
|
2015-04-09 11:58:26 -04:00 |
|
Richard Cordovano
|
339defb5f0
|
Merge remote-tracking branch 'upstream/develop' into collaborative
|
2015-04-06 10:04:07 -04:00 |
|
Brian Carrier
|
4450707e63
|
Add check for non-files to ingest modules
|
2015-04-03 21:33:37 -04:00 |
|
Richard Cordovano
|
dd91ea187d
|
Merge branch 'collaborative' of https://github.com/sleuthkit/autopsy into collaborative
|
2015-04-03 12:43:57 -04:00 |
|
Richard Cordovano
|
d3ac7cab2c
|
Disable (temporarily) Messenger in Case class
|
2015-04-03 12:43:24 -04:00 |
|
Richard Cordovano
|
d251c805ad
|
Merge pull request #1170 from karlmortensen/xsd
force CaseType and DatabaseName to occur together. Either we have 0 or 1...
|
2015-04-03 12:42:27 -04:00 |
|
Karl Mortensen
|
0947a9ccd1
|
force CaseType and DatabaseName to occur together. Either we have 0 or 1 sets of them, and a set MUST include both of them.
|
2015-04-03 11:45:34 -04:00 |
|
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 |
|
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 |
|
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
|
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 |
|
Richard Cordovano
|
e5a694669a
|
Merge remote-tracking branch 'upstream/develop' into collaborative
|
2015-04-02 13:15:01 -04:00 |
|