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

11478 Commits (9893a0839fb0f6981ce891895a5c5ccdfb50a25e)

Author SHA1 Message Date
iglocska 9893a0839f Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-04-04 13:42:39 +02:00
iglocska 7a1dbe4c1f fix: [API] role_id is not required when POSTing users if a default role is set on the instance 2019-04-04 13:42:06 +02:00
Andras Iklody 235fad24c8
Merge pull request #4419 from RichieB2B/ncsc-nl/sql-cleanup 
Be consistent in quoting table names
 2019-04-04 13:18:45 +02:00
Andras Iklody 78d94870e4
Merge pull request #4421 from andir/2.4-linotp 
new: WIP LinOTP authentication
 2019-04-04 13:18:23 +02:00
Andras Iklody 7f09d52045
Merge pull request #4420 from RichieB2B/ncsc-nl/misp-wipe-update 
Update misp-wipe
 2019-04-04 11:51:03 +02:00
Richard van den Berg be3d76d8c1 Wipe new SQL tables in misp-wipe 2019-04-04 11:40:40 +02:00
Richard van den Berg 1a855f2ddf Be consistent in quoting table names 2019-04-04 11:27:16 +02:00
iglocska ee23056237 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-04-04 11:24:20 +02:00
iglocska 13fb91a101 Merge branch 'feature/assetloader' into 2.4 2019-04-04 11:24:05 +02:00
iglocska e397bdbb39 new: [UI] refactor of the asset loading 2019-04-04 11:22:59 +02:00
Raphaël Vinot 599590e923 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-04-04 10:54:12 +02:00
Raphaël Vinot a54899a34b fix: Missing test files in PyMISP 2019-04-04 10:54:04 +02:00
iglocska 8e124dc4d5 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-04-04 10:48:34 +02:00
iglocska 4d3d8b1b9a fix: [UI] Reverted some breaking changes 2019-04-04 10:48:10 +02:00
Raphaël Vinot b543e5bda5 chg: Bump PyMISP 2019-04-04 10:44:53 +02:00
iglocska 31ac700a15 fix: [API] Correctly embed attributes and the event metadata in the object via /objects/view/[ID] 2019-04-04 10:35:53 +02:00
iglocska 7b9c1c9f24 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-04-04 10:11:37 +02:00
iglocska ad53fc2c17 fix: [API] /objects/view should return dictionary not list 2019-04-04 10:11:07 +02:00
chrisr3d 825a0a1aab Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2019-04-04 09:49:53 +02:00
iglocska b2ebee7e48 fix: [JS] fixed a JS breaking bug 2019-04-04 09:37:52 +02:00
iglocska f2a75336ea Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-04-04 09:35:47 +02:00
iglocska e6ceed598d fix: [UI] Changed the querystring loading for css/js 2019-04-04 09:35:20 +02:00
chrisr3d f933355513 Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2019-04-04 09:22:28 +02:00
Steve Clement 91c0faf9dc
Merge pull request #4416 from tom564/patch-1 
Fix blank $PATH_TO_MISP
 2019-04-04 16:21:09 +09:00
Steve Clement 70a57c9587
Merge pull request #4413 from iwitz/2.4 
fix: allow x-frames in apache configs
 2019-04-04 16:17:25 +09:00
chrisr3d 4236a7dbee
chg: [cti-python-stix2] Bumped latest version 2019-04-04 09:15:52 +02:00
Steve Clement 0cfe265469
Merge pull request #4410 from 4ekin/fix-i18n 
Fix i18n in controllers, views, Attribute model
 2019-04-04 16:14:36 +09:00
chrisr3d 406570098c
wip: [enrichment] Added javascript function to fetch all elements from the view 2019-04-03 22:59:58 +02:00
chrisr3d 610e58f8e4
wip: [enrichment view] Displaying multiple additional fields 
- Object ID of the object containing the attribute
  which was used to query the module is displayed,
  if it is this attribute is part of an object
- Displaying Object meta-category and uuid as well
- Multiple displaying arragements
- Redefinition of some classes to help finding
  every element of the form
 2019-04-03 22:54:09 +02:00
chrisr3d f775b71a32
fix: [enrichment view] Fixed distribution display at attribute level 2019-04-03 22:50:58 +02:00
chrisr3d 590a18656d
add: [enrichment] Added MISP Objects distribution in the view 2019-04-03 22:44:21 +02:00
tom564 bd652c5c60
Fix blank $PATH_TO_MISP 
Move  PATH_TO_MISP=${PATH_TO_MISP:-$(locate MISP/app/webroot/index.php|sed 's/\/app\/webroot\/index\.php//')} outside of if statement checking if manual input is required otherwise is only executed if locate is unable to determine path.
 2019-04-03 20:56:35 +01:00
chrisr3d fcca264eb7 Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2019-04-03 16:30:00 +02:00
chrisr3d 83edc0188d
add: [freetext import] Added disable_correlation checkbox 
- We can now disable correlation on attributes from
  the resolved attributes view
 2019-04-03 16:19:17 +02:00
iglocska e4aad19ae7 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-04-03 15:52:44 +02:00
iglocska 6f6e41b497 new: [tags] refactor of the tag picker 
- massive performance boost
- re-introduction of the custom tags
 2019-04-03 15:52:05 +02:00
Alexandre Dulaunoy 19a20bc678
chg: [misp-objects] updated to the latest version 2019-04-03 14:35:29 +02:00
iwitz a6521034f3 fix: allow x-frames in apache configs 2019-04-03 11:36:15 +02:00
iglocska bb42cf79ba fix: [UI] Performance boost for the tag selector 2019-04-03 10:50:52 +02:00
iglocska 9d19c89c5b Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-04-03 10:34:06 +02:00
iglocska a4de5b314c fix: [UI] Check if user is logged in switched to on-demand JSON version 2019-04-03 10:33:37 +02:00
Steve Clement cc767b4976
Merge pull request #4390 from couchuser12345/couchuser12345-patch-1 
Add updateUser to default config
 2019-04-03 11:35:16 +09:00
Steve Clement 6ef74e4f67
Update WarninglistsController.php 
Added more __()
 2019-04-03 10:52:18 +09:00
Steve Clement 2b5fb170c1
Update WarninglistsController.php 
typo
 2019-04-03 10:40:49 +09:00
Steve Clement 2b43201ae3
Merge pull request #4408 from iwitz/patch-6 
add: RHEL7 php-gd installation
 2019-04-03 10:22:34 +09:00
chrisr3d a2e4dee4aa
wip: [enrichment view] Reordered different elements and classes 
- Making the next step iterations easier
 2019-04-02 22:27:33 +02:00
Andras Iklody 65e14b9f76
Merge pull request #4411 from obert01/fix-iconlinks-accessibility 
Accessibility: added roles and aria labels for many icons/links
 2019-04-02 16:27:50 +02:00
4ekin 5c51e78320 fix: TODO i18n strings in Attribute Model and updated default.pot 2019-04-02 16:59:49 +03:00
4ekin 27cdc71568 fix: Fixed i18n strings in Views 2019-04-02 16:57:57 +03:00
4ekin c32d3bce32 fix: Fixed i18n strings in Controllers 2019-04-02 16:57:41 +03:00