566 Commits

Author SHA1 Message Date
Greg DiCristofaro
2feb49528b
Revert "7/18/23 ntl merge" 2023-07-19 07:19:51 -04:00
eugene.livis
406c655f11 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into new_table_load 2022-09-02 13:06:57 -04:00
Greg DiCristofaro
3fd7600864 hardcoding property file location to avoid qa functional classloader issues 2022-08-31 12:33:56 -04:00
Greg DiCristofaro
9280e21c7f merge from new_table_load 2022-06-01 11:43:31 -04:00
Greg DiCristofaro
536f4ab450 move files to shared config 2022-05-24 21:54:31 -04:00
Greg DiCristofaro
a630a0f088 central repo settings updates 2022-05-16 07:48:26 -04:00
Ann Priestman
0c3164fd8e
Merge pull request #7623 from sleuthkit/develop
merge develop into new_table_load 5/10/22
2022-05-10 08:32:19 -07:00
Greg DiCristofaro
b7c1a06b7a qa functional test fix 5/9/22 2022-05-09 07:53:57 -04:00
eugene7646
f83ae0606c
Merge pull request #7583 from eugene7646/merge_develop
Merge develop
2022-03-21 13:32:03 -04:00
Greg DiCristofaro
0bebac3fa2 7612 central repo test fix 2022-03-16 09:23:10 -04:00
Greg DiCristofaro
61d28f09d4 merge from develop 2022-03-09 11:19:35 -05:00
Greg DiCristofaro
c06184ee7c fixes 2022-02-22 21:00:05 -05:00
Greg DiCristofaro
e8485d0fdf refactor 2022-01-27 11:27:43 -05:00
Greg DiCristofaro
d176beb1e0 refactor names to apply to config and set name separately 2022-01-26 09:02:38 -05:00
Greg DiCristofaro
809bb5e804 remove unused account code 2021-12-27 11:35:38 -05:00
apriestman
ead14262ff Share cache parameters 2021-12-16 14:24:40 -05:00
Eugene Livis
04b764ec8f Fixed and improved functional tests 2021-12-07 16:56:14 -05:00
Eugene Livis
c8625041a3 Resolved merge conflicts. Regex bug fix 2021-12-06 17:40:26 -05:00
Greg DiCristofaro
5c95ce24fc test fixes 2021-12-02 11:26:25 -05:00
Greg DiCristofaro
89b48035d8 merge fix 2021-11-18 20:17:10 -05:00
Eugene Livis
7fd0a42de7 Merge branch 'new_table_load' of github.com:sleuthkit/autopsy into kws_attributes_8117 2021-11-18 14:03:39 -05:00
Richard Cordovano
ab3540df2f
Merge pull request #7419 from eugene7646/com_accounts_8122
Communications accounts DAO (8122)
2021-11-18 13:58:23 -05:00
Greg DiCristofaro
24a15a2969 Merge branch 'new_table_load' of github.com:sleuthkit/autopsy into 8160b-throttleEvents 2021-11-17 19:52:11 -05:00
Eugene Livis
62be745314 Fixes to support expanded KeywordHitSearchParam 2021-11-17 13:55:54 -05:00
Richard Cordovano
4561fe76f7
Merge pull request #7421 from sleuthkit/develop
Merge develop into new_table_load
2021-11-16 10:50:29 -05:00
Eugene Livis
2764c5a2ce More tests, code cleanup 2021-11-15 13:27:41 -05:00
Eugene Livis
0144996d4d Functional test bug fixes 2021-11-15 12:51:06 -05:00
Eugene Livis
b0be8046a5 Getting artifacts via new Blackboard API 2021-11-15 10:36:10 -05:00
Eugene Livis
27d8a94322 Added more functional tests 2021-11-12 13:20:36 -05:00
Eugene Livis
67b89ce858 First cut at functional tests 2021-11-11 16:41:48 -05:00
Greg DiCristofaro
222e31c4e0 views updates 2021-11-11 11:29:44 -05:00
Greg DiCristofaro
397f9fa1c1 Merge branch '8148-viewsDaoTree' into 8151-treeChildren 2021-11-08 10:13:39 -05:00
Eugene Livis
5341b320eb Renamed classes to OsAccountsSearchParams and OsAccountsDAO 2021-11-05 14:14:25 -04:00
Greg DiCristofaro
e529562180 merge from new_table_load 2021-11-05 10:13:18 -04:00
Eugene Livis
9c78ddec9d Added functional tests 2021-11-05 09:47:30 -04:00
Richard Cordovano
973a4aac4c
Merge pull request #7404 from APriestman/8121_getHostsForPerson
8121 Add ability to get host results from a person
2021-11-04 11:21:33 -04:00
apriestman
0843206ade Add ability to get host results from a person 2021-11-04 10:33:45 -04:00
Ann Priestman
2fdfd83d6f
Merge pull request #7403 from sleuthkit/develop
Merge develop
2021-11-04 10:17:06 -04:00
Greg DiCristofaro
100db86ebc Merge branch 'new_table_load' of github.com:sleuthkit/autopsy into 8146b-specialTreeWithPreparedStatements 2021-11-04 09:53:35 -04:00
apriestman
0420a12c4c Merge remote-tracking branch 'upstream/new_table_load' into 8121_dsTreeDAO
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/mainui/datamodel/Bundle.properties-MERGED
#	Core/src/org/sleuthkit/autopsy/mainui/datamodel/MainDAO.java
#	Core/test/qa-functional/src/org/sleuthkit/autopsy/mainui/datamodel/TableSearchTest.java
2021-11-04 08:38:11 -04:00
Greg DiCristofaro
45fb8c35bb merge from new_table_load 2021-11-02 15:13:25 -04:00
Ann Priestman
78f827e77c
Merge pull request #7394 from eugene7646/tags_dao_8123
Tags DAO (8123)
2021-11-02 13:52:04 -04:00
apriestman
c819656881 Test fixes 2021-11-02 13:30:54 -04:00
apriestman
fec212ee1f Finished first pass 2021-11-02 09:08:48 -04:00
Greg DiCristofaro
7eee782fcf refactoring 2021-11-01 14:15:27 -04:00
Eugene Livis
05fdf573e9 More functional tests 2021-10-28 16:24:05 -04:00
Eugene Livis
39332f78db Functional tests 2021-10-28 16:13:43 -04:00
Eugene Livis
5a44fe0aaa First cut at functional tests 2021-10-28 15:09:17 -04:00
apriestman
24cf8315b8 Optimize artifact methods 2021-10-28 15:08:41 -04:00
William Schaefer
ee18447185 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 7953-InterestingItemReplaceFileAndArtifact 2021-10-27 14:51:20 -04:00