MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity
17,853 Commits
35 Branches
366 Tags
190 MiB
Commit Graph

17853 Commits (a6b76e70ae94996ea05540f43b8dff5aba163666)

Author SHA1 Message Date
Jakub Onderka a6b76e70ae chg: [internal] Optimise loading event correlation graph 2020-12-23 12:49:59 +01:00
Jakub Onderka e7076d1afc
Merge pull request #6778 from JakubOnderka/tag-info 
Tag info popover
 2020-12-23 11:24:28 +01:00
Jakub Onderka 97dbe0b4ba
Merge pull request #6749 from JakubOnderka/hide-orgs-from-sg 
Hide orgs from sharing group view
 2020-12-23 11:22:17 +01:00
Jakub Onderka 4d4b306b60 new: [internal] New model method find('column') 2020-12-23 10:42:05 +01:00
Jakub Onderka bf27358584 new: [security] Check org list when accessing distribution graph 2020-12-22 23:43:30 +01:00
Jakub Onderka 800da386ff new: [security] Test for hide_organisations_in_sharing_groups setting 2020-12-22 23:43:30 +01:00
Jakub Onderka 970c12a303 chg: [UI] Use chosen when select contains more than 10 sharing groups 2020-12-22 23:43:30 +01:00
Jakub Onderka a585466dff new: [security] Setting to hide orgs form sharing group view 2020-12-22 23:43:30 +01:00
Jakub Onderka b73e978c09
Merge pull request #6788 from JakubOnderka/ui-fixes 
UI fixes
 2020-12-22 23:28:59 +01:00
Jakub Onderka ccdd1de5d9 fix: [UI] Change role name for admin view and add title 2020-12-22 18:11:35 +01:00
Jakub Onderka b325ec58d4 fix: [UI] Redirect after add role modal to index page 2020-12-22 17:56:00 +01:00
Jakub Onderka 307a273e77 chg: [role] Do not allow delete role when is still assigned to user 2020-12-22 17:52:58 +01:00
Jakub Onderka f840165662 chg: [UI] Show cancel button for event report filter 2020-12-22 17:52:58 +01:00
Jakub Onderka ba9a33e0a1 chg: [UI] Merge roles index and admin_index 2020-12-22 17:52:58 +01:00
Jakub Onderka 59c733ab98
Merge pull request #6789 from JakubOnderka/sighting-tag-group 
Sighting tag group
 2020-12-22 15:59:02 +01:00
Jakub Onderka 0c722243e5 fix: [sighting] Grouping sighting fetch for tags 2020-12-22 15:29:08 +01:00
Jakub Onderka 44ffccf5cb fix: [UI] Cancelling search didn't work for index table 2020-12-22 14:50:57 +01:00
Jakub Onderka 123fce3f10 chg: [UI] Rotate header for role index table 2020-12-22 14:50:57 +01:00
Jakub Onderka 49185c48df chg: [UI] Site admin redirects from role index to admin index 2020-12-22 14:50:57 +01:00
Jakub Onderka be11c542e8 fix: [UI] Add Object works again for all databases 2020-12-22 14:50:57 +01:00
Jakub Onderka 66586a8766 chg: [UI] Set dbclickAction for user index 2020-12-22 14:50:57 +01:00
Jakub Onderka 8e47092b46 fix: [UI] Remove unnecessary padding from form 2020-12-22 14:50:57 +01:00
Jakub Onderka aa27703d02 fix: [UI] Correctly show contributors in event view 2020-12-22 14:50:57 +01:00
Jakub Onderka 2a3d49921c fix: [UI] Fix attribte search in event view 2020-12-22 14:50:57 +01:00
Alexandre Dulaunoy 1c12de00fa
Merge branch 'develop' of github.com:MISP/MISP into develop 2020-12-22 12:53:07 +01:00
Alexandre Dulaunoy 3247d3959c
Merge branch '2.4' into develop 2020-12-22 12:52:36 +01:00
Alexandre Dulaunoy 6dcca5527e
chg: [veracode] removed 2020-12-22 12:50:08 +01:00
Alexandre Dulaunoy 419c7dd1ca
Veracode added 2020-12-22 12:39:53 +01:00
Alexandre Dulaunoy 926dea22c8
CodeQL added 2020-12-22 12:39:02 +01:00
Alexandre Dulaunoy 99166f9f7b
handlerSSL should be true 2020-12-22 10:48:23 +01:00
Jakub Onderka 402baa4677 fix: [UI] Show error message when galaxy info couldn't be loaded 2020-12-21 22:51:04 +01:00
Jakub Onderka df5f65da25 chg: [UI] Go directly to edit mode after clicking to "Edit report" button 2020-12-21 22:45:29 +01:00
Jakub Onderka 8403bdee44 chg: [UI] Make event report page nicer 2020-12-21 22:43:27 +01:00
Jakub Onderka 9fb2b15c90
Merge pull request #6497 from JakubOnderka/experimental-cake-tmp-response 
Experimental: new: [internal] Allow to output directly TmpFileTool
 2020-12-21 21:13:30 +01:00
Jakub Onderka 1a184ebbb5 new: [internal] Allow to output directly TmpFileTool 2020-12-21 21:02:37 +01:00
Jakub Onderka e52a11efa2
Merge pull request #6787 from JakubOnderka/sighting-rest-optim 
chg: [sighting] Faster and memory efficient rest search
 2020-12-21 21:01:28 +01:00
Jakub Onderka a040c0c8b8
Merge pull request #6786 from JakubOnderka/sighting-bug-6773 
fix: [sighting] Order must contain group for some mysql servers
 2020-12-21 21:01:09 +01:00
Alexandre Dulaunoy d20fe0c851
Merge pull request #6785 from StefanKelm/2.4 
Typos
 2020-12-21 20:19:49 +01:00
Jakub Onderka 0e31996be3 chg: [sighting] Faster and memory efficient rest search 2020-12-21 19:18:22 +01:00
Jakub Onderka b770e46efb fix: [sighting] Order must contain group for some mysql servers 2020-12-21 18:38:59 +01:00
StefanKelm adb37f6980
Update indexForEvent.ctp 2020-12-21 17:35:20 +01:00
StefanKelm 7cfcd3acdf
Update importReportFromUrl.ctp 2020-12-21 17:34:54 +01:00
Jakub Onderka 6ea0d644d2
Merge pull request #6581 from JakubOnderka/newsread-loading 
chg: [internal] Move user checks to one place
 2020-12-21 17:31:48 +01:00
Alexandre Dulaunoy 708f01e83a
Merge branch '2.4' into develop 2020-12-21 16:13:53 +01:00
Alexandre Dulaunoy b7aebf90e5
Merge pull request #6783 from FafnerKeyZee/patch-1 
Add the possibility to have a '-' in the baseurl
 2020-12-21 14:56:44 +01:00
Fafner [_KeyZee_] fb7c98ebcf
Add the possibility to have a '-' in the baseurl 
With the actual regex in testBaseURL, we can not have a '-' inside the BaseURL, I did a quick fix
 2020-12-21 14:39:25 +01:00
Steve Clement f6eccb65b1
Merge branch '2.4' into develop 2020-12-21 13:33:26 +09:00
Steve Clement 62571cc27f
chg: [installer] Latest update 2020-12-21 13:24:02 +09:00
Steve Clement c6c34564ca
fix: [installer] Typo 2020-12-21 13:17:06 +09:00
Jakub Onderka e18743a7cf
Merge pull request #6782 from JakubOnderka/taxonomies-view 
chg: [UI] Convert taxonomies to default view
 2020-12-20 17:23:34 +01:00