35236 Commits

Author SHA1 Message Date
Greg DiCristofaro
213a68cc7c merge from jdk17_upgrade and new_table_load 2023-05-19 10:27:55 -04:00
Greg DiCristofaro
3bf20d01b8 Merge branch 'develop' of github.com:sleuthkit/autopsy into jdk17_upgrade 2023-05-19 10:19:43 -04:00
Greg DiCristofaro
51ce59f8da Merge branch 'new_table_load' of github.com:sleuthkit/autopsy into jdk17_ntl 2023-05-19 10:19:20 -04:00
Greg DiCristofaro
5a5b678484 mac prereqs update 2023-05-19 09:46:56 -04:00
eugene7646
cd355e7111
Merge pull request #7770 from eugene7646/lowercase_term_preview_NTL
Lowercase the search term for UI
2023-05-19 09:31:42 -04:00
eugene.livis
67cef93405 Lowercase the serch term for UI 2023-05-19 09:27:46 -04:00
eugene7646
8fbecfafcc
Merge pull request #7769 from eugene7646/lowercase_term_preview
Lowercase the search term for UI
2023-05-19 09:24:16 -04:00
eugene.livis
1d6c2e5dfb Lowercase the serch term for UI 2023-05-19 09:20:30 -04:00
Greg DiCristofaro
f4ff37b046 Merge branch 'new_table_load' of github.com:sleuthkit/autopsy into jdk17_ntl 2023-05-18 22:01:09 -04:00
Greg DiCristofaro
ef4075f592 Merge branch 'develop' of github.com:sleuthkit/autopsy into jdk17_upgrade 2023-05-18 22:00:19 -04:00
Greg DiCristofaro
5c02c62daa Merge branch 'jdk17-linuxMacChanges' into jdk17_upgrade 2023-05-18 21:59:59 -04:00
Greg DiCristofaro
59bcfef79b install application zip path fix 2023-05-18 18:47:30 -04:00
eugene7646
fa3df8ad50
Merge pull request #7768 from eugene7646/kws_fixes_NTL_8498
Fixes for bugs that broke NTL branch (8498)
2023-05-18 15:39:04 -04:00
eugene.livis
4f69e36247 Fixes for bugs that broke NTL branch 2023-05-18 15:37:58 -04:00
eugene7646
149939f63b
Merge pull request #7766 from eugene7646/kws_fixes_8498
Fixes for bugs that broke NTL branch (8498)
2023-05-18 15:14:10 -04:00
eugene.livis
163b6ff53e Fixes for bugs that broke NTL branch 2023-05-18 15:12:48 -04:00
Greg DiCristofaro
9f7a2d8471 Merge branch 'jdk17_upgrade' into jdk17_ntl 2023-05-18 12:45:51 -04:00
Greg DiCristofaro
752b9a1384 add back in junit-4.10 2023-05-18 12:45:19 -04:00
Greg DiCristofaro
e1556b3226 change to jvm args 2023-05-18 11:44:39 -04:00
Greg DiCristofaro
3d69ad4cf4 Merge branch 'jdk17_upgrade' into jdk17_ntl 2023-05-18 11:36:47 -04:00
Greg DiCristofaro
241c43b2c9 eol for netbeans plat properties and xml 2023-05-18 11:36:32 -04:00
Greg DiCristofaro
1902437828 Merge branch 'jdk17_upgrade' into jdk17_ntl 2023-05-18 10:17:21 -04:00
Greg DiCristofaro
2f5c25219b modifying some more platform permissions 2023-05-18 10:15:37 -04:00
Greg DiCristofaro
6009c880ec Merge branch 'jdk17_upgrade' into jdk17_ntl 2023-05-18 09:46:25 -04:00
Greg DiCristofaro
c769d25508 platform permissions update 2023-05-18 09:46:03 -04:00
Greg DiCristofaro
1281fae895 readme updates 2023-05-17 14:45:22 -04:00
Greg DiCristofaro
91e255817a update for readme 2023-05-17 13:50:19 -04:00
Greg DiCristofaro
32e824434b changes for linux and mac installation 2023-05-17 13:36:00 -04:00
Greg DiCristofaro
8e9afae206 merge from new_table_load 2023-05-16 18:56:02 -04:00
eugene7646
e71d3a168e
Merge pull request #7764 from eugene7646/fix_conflicts
Fix conflicts
2023-05-16 17:31:13 -04:00
eugene.livis
6492c9ad30 Fixed merge conflicts and build issues 2023-05-16 13:54:16 -04:00
eugene.livis
ef549e6ce5 Fixed merge conflicts and build issues 2023-05-16 13:45:44 -04:00
eugene7646
fe93aba3aa
Merge pull request #7763 from sleuthkit/revert-7760-revert-7759-merge_dev_fix_conflicts
Revert "Revert "Merge develop, fix conflicts""
2023-05-16 09:59:11 -04:00
eugene7646
1d01046096
Revert "Revert "Merge develop, fix conflicts"" 2023-05-16 09:59:01 -04:00
eugene7646
dd7c17d991
Merge pull request #7760 from sleuthkit/revert-7759-merge_dev_fix_conflicts
Revert "Merge develop, fix conflicts"
2023-05-15 15:28:09 -04:00
eugene7646
2e1ee1fb79
Revert "Merge develop, fix conflicts" 2023-05-15 15:28:01 -04:00
eugene7646
d856384fc6
Merge pull request #7759 from eugene7646/merge_dev_fix_conflicts
Merge develop, fix conflicts
2023-05-15 15:07:34 -04:00
eugene7646
2261d62472
Merge branch 'new_table_load' into merge_dev_fix_conflicts 2023-05-15 15:07:08 -04:00
Greg DiCristofaro
a2343e0815 merge from develop 2023-05-15 13:28:43 -04:00
Greg DiCristofaro
50df2c4f51 fixes for keyword search job panel 2023-05-15 13:26:00 -04:00
Greg DiCristofaro
f5e4b62274 updates to panel 2023-05-15 12:54:55 -04:00
Greg DiCristofaro
9e6ecb1a00 save changes in file 2023-05-15 11:20:07 -04:00
Greg DiCristofaro
2df3452384 save changes in file 2023-05-15 11:07:38 -04:00
Greg DiCristofaro
86b1de466f merge from develop 2023-05-15 11:04:08 -04:00
Greg DiCristofaro
57f2f1c9d7 max 500 characters for report progress panel 2023-05-15 11:01:01 -04:00
Greg DiCristofaro
ead4014b45 export javafx events for controls fx 2023-05-15 09:35:08 -04:00
eugene7646
aae905c784
Merge pull request #7757 from sleuthkit/inline_kws
Inline KWS
2023-05-11 13:38:02 -04:00
eugene7646
6b8927cc13
Merge pull request #7737 from kellykelly3/8467-index-chunks-either
8467 index chunks either
2023-05-11 13:32:58 -04:00
Mark McKinnon
815cd082f3 Update Executables
Update aLeapp to version v3.1.6
Update iLeapp to version v1.18.2
Merge Develop
2023-05-10 16:47:40 -04:00
Mark McKinnon
9efdda902d Merge remote-tracking branch 'upstream/develop' into Update-iLeapp-aLeapp 2023-05-10 15:51:09 -04:00