MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity
6,648 Commits
63 Branches
383 Tags
216 MiB
Commit Graph

6648 Commits (67d37a283faab5c95e88cb539743b26c8e2743d6)

Author SHA1 Message Date
Alexandre Dulaunoy 1c11b47583
misp-object templates updated to latest version 2017-11-22 20:53:37 +01:00
Thomas Gardner 93160d69c1 added target-email to FreeText Import types 2017-11-22 11:07:42 -07:00
chrisr3d 13a3105d6b Merge branch '2.4' of github.com:MISP/MISP into stix2experiments 2017-11-22 18:17:06 +01:00
chrisr3d 2ff3ddce31 fix: disabled pretty argument 
used while stringifying the final Bundle
 2017-11-22 18:05:56 +01:00
Andras Iklody 9bdd4e64f8
Merge pull request #2671 from milankowww/return-to-orig-url 
change behavior of login page to return to original page after authen…
 2017-11-22 17:28:31 +01:00
Andras Iklody 01b14fcaf9
Merge pull request #2670 from milankowww/self-signed-certificate-verification 
fix: self signed cert verification
 2017-11-22 17:25:09 +01:00
Andras Iklody 01112951be
Merge pull request #2669 from milankowww/support-touch-screens 
fix: settings editor not working on touch devices
 2017-11-22 17:24:43 +01:00
Milan Pikula 3626f3ce67 change behavior of login page to return to original page after authentication 2017-11-22 17:15:51 +01:00
Alexandre Dulaunoy 6d56e02603
MISP objects updated to the latest version 2017-11-22 17:10:04 +01:00
Milan Pikula 22fbe12762 fix: don't verify peer name on self signed certs; don't verify self signed peer if cert is missing 2017-11-22 16:19:41 +01:00
Andras Iklody 7dbe813e89
Merge pull request #2668 from JanSkalny/fix_settings_editor 
fix: refresh rows in settings editor
 2017-11-22 16:14:09 +01:00
Milan Pikula aeee784901 fix: settings editor not working on touch devices 2017-11-22 16:04:35 +01:00
Jan Skalny 084a3eb3ba fix: refresh rows in settings editor 2017-11-22 15:58:47 +01:00
iglocska 325ca46871 fix: Relaxed email validation 
- because unicode tlds / domains are such a great idea
 2017-11-22 13:45:39 +01:00
chrisr3d ee1cde286a chg: wip 2017-11-22 11:25:32 +01:00
chrisr3d 6eb9de24b4 chg: wip 2017-11-22 11:23:09 +01:00
chrisr3d 14ec39a679 Merge branch '2.4' of github.com:MISP/MISP into stix2experiments 2017-11-22 11:21:46 +01:00
iglocska f259a51247 fix: Fixed invalid timestamp generation 2017-11-22 10:59:42 +01:00
iglocska 75041b5e1f Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2017-11-22 10:56:11 +01:00
iglocska a70b786e25 fix: If no distribution level set, don't try to check if it's set to sharing group on the attribute level 
- Attribute->editAttribute()
 2017-11-22 10:55:24 +01:00
Alexandre Dulaunoy 132eb06269
New relationships added 2017-11-22 10:07:33 +01:00
chrisr3d 2018797ee2 Starting to parse info for a stix import 2017-11-20 18:24:24 +01:00
Alexandre Dulaunoy 7ed2e5b9c9
fix: MISP object updated to the latest version to fix the unusable ASN template 2017-11-19 10:38:22 +01:00
iglocska 9a052fe42f Merge branch '2.4' of github.com:MISP/MISP into 2.4 2017-11-19 10:05:42 +01:00
iglocska d0247a22d8 fix: Attribute deletes are again synced correctly 2017-11-19 10:05:13 +01:00
Andras Iklody 4a39bddd16
Merge pull request #2651 from ppanero/sso_org_fix 
Added possibility to use always default org for new users
 2017-11-17 19:48:41 +01:00
Pablo Panero 491e826690 added possibility to use always default org for new users 2017-11-17 17:06:52 +01:00
iglocska d09edd434c fix: Fixes an issue where assigning sharing groups based on existing IDs didn't work for event creation via the API 
- expected full sharing groups as provided by the sync, references didn't work
 2017-11-17 13:31:55 +01:00
iglocska cbbcac7302 fix: Fixed the broken feed preview 2017-11-17 09:00:15 +01:00
iglocska 296be7cece Merge branch 'feature/stixunclutter' into 2.4 2017-11-16 16:40:56 +01:00
iglocska 30f9cdd558 fix: Fixed the new path for the stix files 2017-11-16 16:38:19 +01:00
iglocska 45a2d1a09b new: Added phone number recognition to the freetext import tool 
- also, changed the massaging of phone number type attributes to replace 00 with +
 2017-11-16 16:25:46 +01:00
iglocska b6c9b09bee fix: Moved the conversion to JSON after the massage of the data for stix 2017-11-16 12:51:38 +01:00
iglocska d6b6767b0d fix: Add galaxy to valid log action list 2017-11-16 12:16:03 +01:00
iglocska 67d9cd6a6c new: Include user action in zmq 2017-11-16 12:15:39 +01:00
iglocska 85d2dc73c7 Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2017-11-16 11:48:44 +01:00
iglocska 33ba84c0bf new: added logging to galaxy attach/detach tasks 2017-11-16 11:48:17 +01:00
Andras Iklody 13be48539b
Merge pull request #2295 from norpol/patch-1 
Fix gpgv2+ key generation
 2017-11-16 11:09:25 +01:00
chrisr3d cae5600e16 chg: make misp to stix export work with MISP json formatted 2017-11-16 11:04:51 +01:00
iglocska dd658056dc chg: push MISP json formatted events to the stix exporter (pending rework) instead of the direct output of fetchEvents() 2017-11-16 10:52:44 +01:00
Alexandre Dulaunoy 3352dc43ea
Merge pull request #2640 from SHSauler/patch-4 
Fix: shebang mixup backup-script
 2017-11-16 10:49:13 +01:00
iglocska 943f18d6cc new: push the action for user updates/creations/logins along with the user object to the ZMQ channel 2017-11-16 08:58:53 +01:00
iglocska 5303b86987 fix: 984732984th time is the charm... 2017-11-16 08:50:06 +01:00
iglocska 1058345ee7 fix: Reduced the user data to just a partial user object and organisation object for the zmq push 2017-11-16 08:48:59 +01:00
iglocska 8f71ce66af fix: Fixed the pubsub user push if the user object is not contained within a User key 2017-11-16 08:44:28 +01:00
iglocska e6bff6072c fix: Previous commit didn't trigger in all cases 2017-11-16 08:41:54 +01:00
iglocska bce9b94c28 chg: Push the full user object to the ZMQ feed 2017-11-16 08:37:53 +01:00
Steffen Sauler 750696ea8e
Fix: shebang mixup 
/!bin/sh to !/bin/sh
 2017-11-15 16:54:24 +01:00
iglocska 03a27bec13 Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2017-11-15 14:58:07 +01:00
iglocska a935c74a3a fix: Fixed slow /tags/index calls using the API 
- burned the stupid out of the API
 2017-11-15 14:57:20 +01:00