jmillman
|
f7e56bebcc
|
Merge branch 'develop' into include_all_drawable_mimetypes
Conflicts:
ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/DrawableDB.java
|
2015-07-02 17:20:46 -04:00 |
|
jmillman
|
276a6155cf
|
comments
|
2015-07-02 16:23:08 -04:00 |
|
jmillman
|
ae38edf854
|
add some more image format extensions
|
2015-07-02 15:24:53 -04:00 |
|
jmillman
|
4db07ba65e
|
add "undisplayable" icon to DrawableTile.fxml and SlideShow.fxml; show this icon , when we can't display the contents of a drawable file.
|
2015-07-02 15:04:37 -04:00 |
|
jmillman
|
798ce18f0b
|
fix animated gif loading; add "undisplayable" icon to DrawableTile.fxml
|
2015-07-02 14:14:53 -04:00 |
|
jmillman
|
47d6318ecd
|
Merge remote-tracking branch 'upstream/develop' into include_all_drawable_mimetypes
Conflicts:
ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/DrawableDB.java
|
2015-07-02 14:14:07 -04:00 |
|
jmillman
|
bf68bea824
|
Merge remote-tracking branch 'upstream/develop' into include_all_drawable_mimetypes
Conflicts:
ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/DrawableDB.java
|
2015-07-02 12:56:32 -04:00 |
|
Richard Cordovano
|
593fc2ca2d
|
Merge pull request #1363 from sidheshenator/goto_hex_offset
jump to hex offset implemented
|
2015-07-02 11:23:57 -04:00 |
|
jmillman
|
1138ed5f89
|
fix video/supoprted mimetype confusion
|
2015-07-02 10:34:14 -04:00 |
|
jmillman
|
8c224393e5
|
remove unsed icons
|
2015-07-02 10:33:34 -04:00 |
|
Richard Cordovano
|
e59ba14a44
|
Merge pull request #1417 from millmanorama/concurrent_hashmap_npe_fix
improve synchronization and guard the videoFileMap from null keys to eliminate NPE
|
2015-07-02 09:36:25 -04:00 |
|
Richard Cordovano
|
9de25349c8
|
Merge pull request #1419 from sidheshenator/py_module_fix
jython moduleName getting regex fixed
|
2015-07-02 09:35:14 -04:00 |
|
Richard Cordovano
|
d6ef60ec5d
|
Merge pull request #1416 from millmanorama/contents_tree_fix
fix rebuilding the contents tree when switching grouping
|
2015-07-02 09:33:26 -04:00 |
|
sidheshenator
|
cb346a00fe
|
jython moduleName getting regex fixed
|
2015-07-01 17:33:32 -04:00 |
|
jmillman
|
beb8efaa6a
|
Extract FileTypeUtils from ImageGalleryModule
remove FileTypeIcons
remove deprecated method from GroupManager
|
2015-07-01 15:58:37 -04:00 |
|
jmillman
|
64e887b098
|
work towards showing a filetype icon even when we can't show the file
|
2015-07-01 15:58:30 -04:00 |
|
jmillman
|
e2cb9544f8
|
experimental work to show mimetype icon for undisplayable images/videos
|
2015-07-01 15:58:24 -04:00 |
|
jmillman
|
13d60ead02
|
use FileTypeDetector and mimetypes to decide what to include only falling back on extension if we can not get a mime type.
|
2015-07-01 15:58:15 -04:00 |
|
jmillman
|
924d012527
|
fix rebuilding the contents tree when switching grouping
|
2015-07-01 15:54:07 -04:00 |
|
jmillman
|
5866b88a35
|
improve synchronization and guard the videoFileMap from null keys to eliminate NPE
|
2015-07-01 15:52:12 -04:00 |
|
Richard Cordovano
|
a07802d73c
|
Merge pull request #1407 from millmanorama/manually_sort_unseengroups
replace buggy JavaFX SortedLists with explicit sorting
|
2015-06-30 16:24:46 -04:00 |
|
Richard Cordovano
|
e1a6068298
|
Merge pull request #1406 from millmanorama/tag_group_menu
fix tag group menu bug ...
|
2015-06-30 16:23:45 -04:00 |
|
Richard Cordovano
|
6129da5679
|
Merge pull request #1405 from millmanorama/duplicate_tag_warning
Duplicate tag warning
|
2015-06-30 16:23:17 -04:00 |
|
Richard Cordovano
|
ae1019ad54
|
Merge pull request #1404 from millmanorama/hash_set_display
Hash set display
|
2015-06-30 16:20:36 -04:00 |
|
Brian Carrier
|
fd6c748e51
|
Updated to develop flag
|
2015-06-29 19:07:07 -04:00 |
|
Brian Carrier
|
8f50658aac
|
Merge branch 'release-3.1.3' into develop
|
2015-06-29 19:05:07 -04:00 |
|
jmillman
|
3e3a48e184
|
replace buggy JavaFX SortedLists with explicit sorting
|
2015-06-29 16:08:22 -04:00 |
|
jmillman
|
019e0b9584
|
fix tag group menu bug
|
2015-06-29 15:38:07 -04:00 |
|
jmillman
|
8b30d1bb7b
|
check for duplicate tags in ImageGallery like we do in Autopsy.
|
2015-06-29 14:43:18 -04:00 |
|
jmillman
|
d883992685
|
remove dependency on openjfx-dialogs since we are building on java 8u40
|
2015-06-29 14:42:39 -04:00 |
|
jmillman
|
27dab95e5a
|
fix catch block around Case.getCurrentCase to catch IllegalStateException
|
2015-06-29 14:40:29 -04:00 |
|
jmillman
|
3a37fe0ef1
|
fixup! Merge branch 'develop' into hash_set_display
|
2015-06-29 11:15:20 -04:00 |
|
jmillman
|
ae9f9b0e31
|
Merge branch 'develop' into hash_set_display
Conflicts:
ImageGallery/src/org/sleuthkit/autopsy/imagegallery/ImageGalleryController.java
ImageGallery/src/org/sleuthkit/autopsy/imagegallery/actions/AddTagAction.java
ImageGallery/src/org/sleuthkit/autopsy/imagegallery/actions/CategorizeAction.java
ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/CategoryManager.java
ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/DrawableDB.java
ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/grouping/GroupManager.java
ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/MetaDataPane.java
|
2015-06-29 11:11:09 -04:00 |
|
jmillman
|
a234f9647d
|
Merge branch 'develop' into hash_set_display
Conflicts:
ImageGallery/src/org/sleuthkit/autopsy/imagegallery/ImageGalleryController.java
ImageGallery/src/org/sleuthkit/autopsy/imagegallery/actions/AddTagAction.java
ImageGallery/src/org/sleuthkit/autopsy/imagegallery/actions/CategorizeAction.java
ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/CategoryManager.java
ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/DrawableDB.java
ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/grouping/GroupManager.java
ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/MetaDataPane.java
|
2015-06-29 11:07:15 -04:00 |
|
jmillman
|
0854d5bd41
|
Merge branch 'develop' into hash_set_display
Conflicts:
ImageGallery/src/org/sleuthkit/autopsy/imagegallery/ImageGalleryController.java
ImageGallery/src/org/sleuthkit/autopsy/imagegallery/actions/AddTagAction.java
ImageGallery/src/org/sleuthkit/autopsy/imagegallery/actions/CategorizeAction.java
ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/CategoryManager.java
ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/DrawableDB.java
ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/grouping/GroupManager.java
ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/MetaDataPane.java
|
2015-06-29 10:54:38 -04:00 |
|
Brian Carrier
|
9b182d18fa
|
added to python docs
|
2015-06-26 20:50:10 -04:00 |
|
Brian Carrier
|
4441de5d4f
|
Merge branch 'release-3.1.3' of github.com:sleuthkit/autopsy into release-3.1.3
|
2015-06-26 17:14:49 -04:00 |
|
Brian Carrier
|
1592f4c814
|
updated sample to do name comparison lowercase and restrict to end
|
2015-06-26 17:14:24 -04:00 |
|
Richard Cordovano
|
3b9aebd33a
|
Merge branch 'develop' of https://github.com/sleuthkit/autopsy into develop
|
2015-06-26 12:03:45 -04:00 |
|
Richard Cordovano
|
72ba0cad26
|
Add timestamps to notifications
|
2015-06-26 12:03:10 -04:00 |
|
Richard Cordovano
|
45f6c9db5b
|
Merge pull request #1401 from sleuthkit/ZIP_error_messages
Added full path to error and warning messages for ZIP extraction
|
2015-06-26 09:19:18 -04:00 |
|
Brian Carrier
|
53fac9b8a4
|
Added event firing after creating aftifact into sample and made multi-line
|
2015-06-25 22:55:23 -04:00 |
|
Brian Carrier
|
9a385b6d7b
|
Added full path to error and warning messages for ZIP extraction
|
2015-06-25 21:34:01 -04:00 |
|
Richard Cordovano
|
9195700dfa
|
Merge pull request #1399 from millmanorama/events_tags_categories_rework
Events tags categories rework
|
2015-06-25 12:39:45 -04:00 |
|
jmillman
|
5b904edba6
|
fix merge mistakes
|
2015-06-25 11:31:53 -04:00 |
|
jmillman
|
622da1c8de
|
use private notifyPropertyChangeEvent() method in notifyNewDataSource
|
2015-06-25 10:56:26 -04:00 |
|
jmillman
|
773e4293c5
|
SlideShow toggle is disabled when there is no group selected; fix relative paths to images in fxml
|
2015-06-25 10:55:13 -04:00 |
|
jmillman
|
bb85f3feda
|
SlideShow toggle is disabled initialy; fix relative paths to images in fxml
|
2015-06-25 10:55:11 -04:00 |
|
jmillman
|
257ebc64da
|
clean up add tag action, use invokeLater not invokeAndWait; getNonCategoryTagNames returns TagNames in alphabetical order by displayname
|
2015-06-25 10:54:44 -04:00 |
|
jmillman
|
e157a5b53b
|
only add new cat tag if there is no existing cat tag. put adding and removing fileids to/from group on jfx thread; remove file from groups when adding to new catagory based on new tag
|
2015-06-25 10:54:28 -04:00 |
|