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

349 Commits (72730e54ef162c430667ba586c5cdaf8bf1c631f)

Author SHA1 Message Date
Andreas Ziegler 4b8a82098d chg: replace 4 spaces after tab by double tab 2016-09-05 00:45:51 +02:00
iglocska 14e384e8a2 chg: text moved to the first choice for internal reference category attributes 2016-09-02 21:32:56 +02:00
Andreas Ziegler cf2f0dc625 chg: remove some obsolete code 2016-09-01 05:15:36 +02:00
iglocska f448f1201c fix: Cleaner way of handling no correlations in the correlation engine changes 2016-08-28 00:45:31 +02:00
iglocska eebf3a4494 fix: Fixed a missing field in the correlation lookup causing travis to fail 2016-08-28 00:15:34 +02:00
iglocska 80170ed5cc fix: Remove incorrect correlations on deleted attributes 2016-08-28 00:06:52 +02:00
iglocska 5ab8167425 fix: Performance boost for the correlations 
Going through insertMulti to insert correlations to get a massive speed boost
 2016-08-28 00:03:13 +02:00
iglocska 399a039065 fix: cleanup of some unused code 
- based on @rotanid's findings
 2016-08-26 07:44:40 +02:00
iglocska 873b201eb0 Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2016-08-25 11:38:59 +02:00
iglocska 822b0bf8fa chg: Cleanup of the controllers and models 
- removed incorrect, useless boiler plate comments
- kept useful comments intact
- added some missing line breaks to make the codebase a bit more uniform
- removed some obviously obsolete TODO comments
 2016-08-25 11:38:37 +02:00
Andreas Ziegler e8599fb16c chg: new filename regex & separate functions 2016-08-24 15:31:17 +02:00
Andras Iklody 0093bb08be Merge pull request #1471 from rotanid/filename-regexes 
filename regex changes
 2016-08-24 09:43:00 +02:00
iglocska b1285f5625 fix: Fixed an invalid array_merge in the attribute fetcher 2016-08-24 09:37:22 +02:00
Andreas Ziegler eb66a80c76 chg: filename regex changes 2016-08-24 02:35:04 +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
Andreas Ziegler fa8300adea chg: fix indention in some files 2016-08-22 03:40:17 +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 47c6feab4d fix: Various fixes to the cached exports 
- Tightened the rules for export generation when no valid published events exist
- Corrected various issues with the progress bars
- Added the missing JSON export to the caches
- XML/JSON caches now correctly take into account the cached attachent inclusion setting
- MISP will now show the users browsing the export page whether attachments will be cached with the current settings or not
- Added correct progress bar to the HIDS export
 2016-07-30 18:08:19 +02:00
Andreas Ziegler dd30621155 chg: use CASE WHEN instead of IF in $virtualFields 2016-07-11 21:26:25 +02:00
Andreas Ziegler ff7a7de938 chg: use 1/0 not true/false for conditions & other boolean sqlquery elements 2016-07-11 21:26:16 +02:00
Iglocska 9522c96d54 Revert "Revert "chg: remove obsolete uuid() wrapper"" 
This reverts commit bae6eadfe7.
 2016-07-11 00:59:47 +02:00
Andreas Ziegler d2f43eb8c4 Merge pull request #1349 from rotanid/mail-regex-change 
additional chars in mail address regex
 2016-07-10 01:35:56 +02:00
Andreas Ziegler efe31e8b07 fix: additional chars =~ in mail address regex 2016-07-10 01:32:37 +02:00
Iglocska bae6eadfe7 Revert "chg: remove obsolete uuid() wrapper" 
This reverts commit 77ca0f8dd4.
 2016-07-08 14:50:00 +02:00
Andreas Ziegler 77ca0f8dd4 chg: remove obsolete uuid() wrapper 2016-07-07 15:13:16 +02:00
Andreas Ziegler 69ae8adf1f fix: move case statement and add break 2016-06-27 14:08:54 +02:00
Andreas Ziegler 89e8307c1a chg: remove some obsolete FIXME notes 
the lines have been checked, only secure values are used as part of filenames and paths
 2016-06-20 22:30:57 +02:00
Andreas Ziegler 5b390a0e32 chg: compress IPv6 addresses on import 2016-06-14 02:20:31 +02:00
Andreas Ziegler 4dd5df53c8 Merge pull request #1255 from rotanid/bugfix 
fix: case-insensitive functions calls
 2016-06-12 05:41:05 +02:00
Andreas Ziegler 03fd7ddbb9 Merge pull request #1238 from rotanid/cleanup 
cleanup obsolete code
 2016-06-12 05:39:12 +02:00
Andreas Ziegler 90aaf09415 chg: remove useless empty comments at end of line 2016-06-12 05:35:52 +02:00
Andreas Ziegler 5a701e7ded fix: case-insensitive functions calls 2016-06-12 05:33:34 +02:00
Andreas Ziegler 03f71dc213 chg: use escapeshellarg() instead of addslashes() with exec() 2016-06-12 04:43:05 +02:00
Iglocska 6275e4fcd4 fix: reverted the change from addslashes -> escapeshellargs. Will revisit the reason it was causing the uploads to fail at a later point in time 2016-06-09 15:02:10 +02:00
Andreas Ziegler f6948a83a4 chg: use escapeshellarg() instead of addslashes() with exec() 2016-06-06 15:48:01 +02:00
Andreas Ziegler 8cdbafa4a5 chg: error handling after zip execution 2016-06-06 09:38:52 +02:00
Andreas Ziegler 958aa7c414 use consistent spacing around else if 2016-06-04 15:49:54 +02:00
Andreas Ziegler 985451642e add space after keywords if/for/foreach/while/switch/catch 2016-06-04 15:45:39 +02:00
Andras Iklody ca057e877b Merge pull request #1207 from rotanid/semicolon 
remove obsolete semicolon after closing curly bracket
 2016-06-04 09:17:56 +02:00
Andreas Ziegler 81d197ed16 remove obsolete semicolon after closing curly bracket 2016-06-04 02:21:23 +02:00
Andreas Ziegler c1eda1e04b remove single spaces after tabs 2016-06-04 01:54:19 +02:00
Andreas Ziegler 8a2352f7b8 remove single spaces in front of tabs 2016-06-04 01:14:25 +02:00
Andreas Ziegler 0fe692c56a remove whitespace at end of line 2016-06-04 01:10:45 +02:00
Andreas Ziegler 898ea1d97c remove whitespace (space/tab) from empty lines 2016-06-04 01:08:16 +02:00
Iglocska 2c690aea81 Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2016-06-03 01:39:07 +02:00
Iglocska 3b6a852428 chg: valueIsUnique assumed the deleted flag to be set on attributes 2016-06-03 01:27:12 +02:00
Andreas Ziegler 8a9ffc1f9b remove obsolete space from: File ( 2016-05-31 18:03:59 +02:00
Steve Fossen a308f8dcf5 don't bother trimming if it's going to exit anyways. 
removes a warning on empty attribute.
 2016-05-27 07:00:55 -07:00
Andras Iklody 6d068e4928 Merge pull request #1151 from rotanid/filechecks 
small change to file checks
 2016-05-20 17:05:27 +02:00
Andreas Ziegler e21fa21de8 small change to file checks, use readable() instead of exists() 2016-05-20 16:57:34 +02:00