MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity
11,253 Commits
42 Branches
370 Tags
181 MiB
Commit Graph

11253 Commits (43f0010cab9776d5bb447dc230f488b8229ffa6d)

Author SHA1 Message Date
iglocska 43f0010cab fix: [Training] Some clarifications 2019-03-17 12:13:23 +01:00
iglocska 136019e681 fix: [Training] Function extraction fail 
- Shame. Shame. Shame.
 2019-03-17 11:03:35 +01:00
iglocska ef6c5045a9 fix: [Training] Invalid user input capture fixed 2019-03-17 10:56:07 +01:00
iglocska 2975673217 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-03-17 10:43:52 +01:00
iglocska b207489616 chg: [Training] Further cleanup and interactive mode 
- splitting of some nastier unreadable functions
- added interactive mode
 2019-03-17 10:43:11 +01:00
iglocska a8d4d15cff fix: [training] Added created sync users to the reporting 2019-03-16 20:52:41 +01:00
Andras Iklody 37e9ebdc39
Merge pull request #4313 from pettai/RPZexport 
Add $time for Plugin.RPZ_serial
 2019-03-15 17:41:34 +02:00
mokaddem ce435ce6b9 Merge branch 'extendedDistributionGraph' into 2.4 2019-03-15 16:41:04 +01:00
mokaddem 89196d0847 fix: [distributionNetwork] Added a threshold on the number of 
organisation that can be displayed a time. Will need some more love
later on.
 2019-03-15 16:40:16 +01:00
Alexandre Dulaunoy ae2c513b62
Merge pull request #4309 from mokaddem/extendedDistributionGraph 
Improvement on distribution visualization
 2019-03-15 16:05:17 +01:00
mokaddem aa03357aaa fix: [ACL] Whitelisted `genDistributionGraph` 2019-03-15 15:32:18 +01:00
frpet 06b1d74c7a Add $time for serial 
Add $time for generating unixtime as serial
 2019-03-15 15:28:14 +01:00
Alexandre Dulaunoy 695771eb44
chg: [misp-objects] updated to the latest version 2019-03-15 15:05:17 +01:00
iglocska 11df6ef401 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-03-15 14:33:56 +01:00
iglocska 42e1777a50 new: [galaxies] Allow deleting full galaxies 2019-03-15 14:33:31 +01:00
mokaddem b8334521d3 chg: Updated comments 2019-03-15 11:52:37 +01:00
chrisr3d 23f8d6b668
wip: [enrichment] Capturing attributes & objects returned by modules 2019-03-15 11:31:14 +01:00
chrisr3d b71ec87021
fix: [enrichment] Added missing data field in attribute in case of attachement type attribute 2019-03-15 11:28:42 +01:00
mokaddem 7ce6ef34de Merge branch '2.4' of github.com:MISP/MISP into extendedDistributionGraph 2019-03-15 10:59:38 +01:00
mokaddem 7123c949c2 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-03-15 10:52:08 +01:00
iglocska 6699bb003c chg: [REST] Disable all SSL validation if requested by the user 2019-03-15 10:51:41 +01:00
mokaddem 3bd56a102f fix: [eventFiltering] quickfilter on value does not filter on wrong category 
anymore
 2019-03-15 10:50:16 +01:00
iglocska 5f34880010 chg: [REST] Disable all SSL validation if requested by the user 2019-03-14 18:14:01 +01:00
iglocska bdbba8d009 fix: [Training] Interesting link 
- Someone just told us about fmylife.com - if this day continues like this I might have to post there about the development
 2019-03-14 14:28:49 +01:00
iglocska b1f37257c6 fix: [training] Inverse conditional fixed 2019-03-14 14:26:20 +01:00
iglocska 8c4dc4275a fix: [Training] Duplicate user add handling 2019-03-14 14:20:49 +01:00
iglocska 975f09de6e fix: [Training] Handle sync connections failing to be saved better 2019-03-14 14:18:24 +01:00
iglocska 7bf2968785 fix: [training] Small fix 2019-03-14 14:13:42 +01:00
iglocska 3eafffad4e fix: [training] fixes to the org creation 2019-03-14 14:10:51 +01:00
iglocska b74728bdd0 chg: [Training script] Improvements 
- Create reverse sync accounts/link on demand
- Create admin users for the player teams on demand
- Some minor fixes
 2019-03-14 13:15:41 +01:00
iglocska 79b0be30f6 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-03-14 08:46:35 +01:00
iglocska fb26e3495f chg: [cakephp version] bump 2019-03-14 08:46:10 +01:00
Steve Clement 39b9ac6ca0
Merge pull request #4293 from 4ekin/russian_translation 
fix: Merge issue
 2019-03-14 11:46:36 +06:00
Alexandre Dulaunoy 2544170208
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-03-14 06:32:42 +01:00
Alexandre Dulaunoy 2cf64d545c
chg: [misp-galaxy] updated to the latest version 2019-03-14 06:32:15 +01:00
iglocska eaf71ef6eb fix: [Training] Cause I'm a lumberjack and I'm ok 2019-03-13 18:06:31 +01:00
iglocska 0e76537f7a fix: [Training] AAARGH 2019-03-13 17:31:07 +01:00
iglocska af8f730ebf fix: [training] Further work on the script 2019-03-13 17:27:20 +01:00
iglocska ca4c31dcc0 fix: [training] Allow for self signed certs 2019-03-13 17:20:37 +01:00
iglocska 3dc0244177 fix: [training] Siplified key management 2019-03-13 17:18:55 +01:00
iglocska 86b8fe3a30 fix: [Training] Further fixes 2019-03-13 17:11:04 +01:00
iglocska cbdd2e2cfc fix: [training script] Added some resilience to prior partial executions 2019-03-13 16:58:40 +01:00
iglocska e72e96d85f fix: [training] Fixes based on failed executions 2019-03-13 16:41:27 +01:00
iglocska 712509206c fix: [training script] Case sensitivty fixed 2019-03-13 16:05:25 +01:00
iglocska e49adab132 chg: [training] Some additional changes 2019-03-13 15:50:37 +01:00
iglocska 69fc0edc69 chg: [training script] Added server indication 2019-03-13 15:43:27 +01:00
iglocska e29985b6ab fix: [training script] verbose mode added 2019-03-13 15:40:56 +01:00
iglocska d5f62f62d8 fix: [training script] Minor fixes 2019-03-13 15:28:42 +01:00
iglocska 4c72f22516 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-03-13 15:09:35 +01:00
iglocska eb101c97c4 fix: [training] training setup script now correctly handles settings 2019-03-13 15:08:58 +01:00