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

4465 Commits (b1285f5625a65c1f4f313147a2bc2d83a5701fdf)

Author SHA1 Message Date
iglocska b1285f5625 fix: Fixed an invalid array_merge in the attribute fetcher 2016-08-24 09:37:22 +02:00
iglocska 0b9185c1fa fix: Raised the default timeout for modules 
- possible fix for #1466
 2016-08-24 09:36:35 +02:00
iglocska 10593914f8 new: screenshot preview in the event view 2016-08-23 15:00:38 +02:00
Andreas Ziegler 64300fdf6b Merge pull request #1464 from rotanid/indention-fixes 
fix indention of 4 files
 2016-08-23 04:31:42 +02:00
Andreas Ziegler 36accceab5 Merge pull request #1463 from rotanid/config-readability 
better readability of config files
 2016-08-23 04:29:51 +02:00
Andreas Ziegler e6585ed46e chg: fix indention of 4 files 2016-08-23 04:27:28 +02:00
Andreas Ziegler 7d0a6e6e82 chg: better readability of config files 2016-08-23 04:22:35 +02:00
iglocska b08140268b fix: Some exports (HIDS, NIDS) failing on certain MySQL versions due to an only_full_group_by policy violation in the attribute fetcher, fixes #1390 2016-08-23 00:36:44 +02:00
Iglocska 3aca8618b5 fix: Missing ACL entries added 2016-08-22 18:11:54 +02:00
Iglocska 6171e61fdd Revert "chg: remove not used old plugin file" 
This reverts commit dd8ec54e2a.
 2016-08-22 17:51:30 +02:00
Andreas Ziegler cc33af9e1c Merge pull request #1461 from rotanid/cleanup 
Cleanup
 2016-08-22 03:51:35 +02:00
Andreas Ziegler fa8300adea chg: fix indention in some files 2016-08-22 03:40:17 +02:00
Andreas Ziegler 99e6ae7946 chg: add space after keywords if/for/foreach/while/switch/catch 2016-08-22 02:59:20 +02:00
Andreas Ziegler 1c641b809e chg: add spaces before opening curly brackets 2016-08-22 02:57:56 +02:00
Andreas Ziegler 30fb4e2b2e chg: remove whitespace at end of line 2016-08-22 02:54:51 +02:00
Andreas Ziegler cffcfa81d7 chg: remove whitespace (space/tab) from empty lines 2016-08-22 02:52:51 +02:00
Andreas Ziegler 56dc4734cf chg: add newline character before EOF 2016-08-22 02:42:59 +02:00
Andreas Ziegler 8f9332b859 Merge pull request #1460 from rotanid/sightings-cleanup 
chg: cleanup Sighting.php
 2016-08-21 23:55:35 +02:00
Andras Iklody 9b8f89a5e8 Merge pull request #1459 from rotanid/uses-import 
remove several usages of App::import() in favor of App::uses()
 2016-08-21 23:55:16 +02:00
Andreas Ziegler 6c07ae78fa chg: cleanup Sighting.php 2016-08-21 23:53:56 +02:00
Andreas Ziegler c47e99d38a chg: remove usage of App::import in favor of ::uses 2016-08-21 23:42:28 +02:00
Andras Iklody 3d8cd2fb61 Merge pull request #1458 from rotanid/cleanup-old-plugin-orphans 
chg: remove not used old plugin file
 2016-08-21 23:38:28 +02:00
Andreas Ziegler dd8ec54e2a chg: remove not used old plugin file 2016-08-21 23:25:22 +02:00
Iglocska 8f3ac0970d fix: small fix to the Shibboleth authentication 2016-08-21 00:24:54 +02:00
Iglocska c81519b74e chg: If the quickfilter on the event index only returns a single event, redirect to the event view directly, fixes #1430 
- the perfect last-minute-saturday-night patch
 2016-08-20 21:32:17 +02:00
Andras Iklody bba55d913a Merge pull request #1454 from ppanero/sso_integration_plugin 
Bug fixing on shibboleth auth. DB group loading and missing email bug…
 2016-08-20 18:54:17 +02:00
Andras Iklody 2bcb59980f Merge pull request #1456 from rotanid/fileaccess-overhaul 
FileAccess cleanup/consistency
 2016-08-19 20:52:56 +02:00
Andreas Ziegler f0905dc536 chg: rename FileAccess to FileAccessTool 
every other tool classes name in the Lib/Tools/ folder also ends with "Tool"
 2016-08-19 19:25:32 +02:00
Andreas Ziegler a2ff5424e1 chg: change FileAccess from static to instantiable class 2016-08-19 19:22:15 +02:00
ppanero 9e0801cc20 Bug fixing on shibboleth auth. DB group loading and missing email bugs fixed 2016-08-19 14:32:47 +02:00
Andras Iklody 5ae656800e Merge pull request #1451 from cristianbell/fix_minor_code_fixes 
fix: minor code issues:
 2016-08-18 15:38:46 +02:00
Cristian Bell 0829939929 fix: minor code issues: 
- added brackets to the IF/ELSE statement.
 2016-08-18 15:34:30 +02:00
Cristian Bell 8ea25e56f0 fix: minor code issues: 
- redundant var initialisation
- for the automatically created organization the "created_by" is 0, which produces a Notice error in /View/Organization/view.ctp
 2016-08-18 15:20:53 +02:00
Andras Iklody e9ac6cdfb0 Merge pull request #1443 from rotanid/boolean-datatype-handling 
change of boolean datatype handling #2
 2016-08-18 09:51:29 +02:00
Andras Iklody 02b8a940df Merge pull request #1446 from cristianbell/chg_1445_OrgUUID_visible_to_everyone 
chg: Org UUID visible on the organisations/view/ page #1445
 2016-08-18 09:29:01 +02:00
Cristian Bell 234730e1a7 chg: Org UUID visible on the organisations/view/ page #1445 
- uuid field always visible even when value is empty.
 2016-08-18 09:28:21 +02:00
iglocska e3aa6d4d98 Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2016-08-18 00:36:39 +02:00
iglocska a301635ccf fix: Attribute delete should not return the full event via REST, instead a message saying that it was deleted similar to the event deletion is enough, fixes #1449 2016-08-18 00:35:54 +02:00
Andras Iklody c14b54fa0c Merge pull request #1447 from rotanid/cakephp-update-286 
update cakephp to 2.8.6
 2016-08-17 22:16:40 +02:00
Andreas Ziegler 9f952b595c chg: update cakephp to 2.8.6 2016-08-17 19:24:23 +02:00
Cristian Bell 862f528088 chg: Org UUID visible on the organisations/view/ page #1445 2016-08-17 19:13:07 +02:00
Andreas Ziegler fb655c2ff9 chg: use 1/0 not true/false for conditions & other boolean sqlquery elements 2016-08-17 18:52:22 +02:00
iglocska 06aa741a0e fix: Added check for instances not using database sessions to skip the automatic session cleanup 
- But... Use database sessions.
 2016-08-17 18:08:22 +02:00
iglocska c0cc185cc3 Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2016-08-17 16:26:05 +02:00
iglocska 5d412b426d fix: fixed an issue with the histogram on newer MySQL versions 2016-08-17 16:25:39 +02:00
Raphaël Vinot 9265510498 Merge pull request #1444 from Rafiot/bump_pymisp 
Bump PyMISP
 2016-08-17 15:05:03 +02:00
Raphaël Vinot 2aaf72576b Bump PyMISP 2016-08-17 14:58:15 +02:00
iglocska c0e1bc1c3f fix: Invalid response by the queryEnrichment() function if the module server is not reachable 2016-08-17 13:38:19 +02:00
iglocska e867a47569 Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2016-08-17 09:44:37 +02:00
iglocska c1cdb3b461 Fix: cleaner input for caching jobs 2016-08-17 09:43:57 +02:00