MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity
7,604 Commits
34 Branches
365 Tags
189 MiB
Commit Graph

97 Commits (025b2a4e5daffe805f3ae41e87d3f1e9c367805d)

Author SHA1 Message Date
iglocska 025b2a4e5d fix: valueNotEmpty() switched to stringNotEmpty for the attribute value validation 
- Core 1+2 of the new laptop
 2018-04-09 13:58:24 +02:00
iglocska 2e24f86bca fix: Further fixes to the new zmq system 2017-10-27 12:16:57 +02:00
Kevin Allix 2248846706 attachments_dir: Default value queried through a function to workaround PHP inability to have anything useful stored in a class property 2017-07-10 12:42:23 +02:00
Kevin Allix 1ea33e811a Add an optional setting attachments_dir, and adapt existing code to use that setting 2017-07-07 17:29:13 +02:00
iglocska 1e61074115 fix: Relaxed UUID4 requirement for UUID validation 
- we shouldn't enforce anything beyond the basic format
 2017-06-12 22:39:02 +02:00
Ángel González 620bb6dad0 Change feedback about email notification on sending proposals 
Move from a “Failed for at least one recipient” warning notification
to warn when it was not sent to anyone, which is more interesting for
the user sending the proposal.

Fixes #2158
 2017-05-05 01:26:12 +02:00
iglocska 59c1db5312 fix: Fixed an issue where a proposal not having an assigned organisation broke the synchronisation on a pull 2017-04-13 21:51:20 +02:00
iglocska c603607cd0 fix: Added default value to proposal_to_delete 2017-03-06 09:57:32 +01:00
iglocska 4801b47a8a fix: On newer MySQL versions proposing a deletion to an attribute failed, fixes #1741 2016-12-09 09:26:58 +01:00
Iglocska 12c3acede2 fix: Don't correlate shadow attributes to attributes in the same event 2016-10-21 13:55:10 +02:00
Andreas Ziegler 25e52a6786 chg: remove some references to variables 2016-09-15 17:08:58 +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 fb655c2ff9 chg: use 1/0 not true/false for conditions & other boolean sqlquery elements 2016-08-17 18:52:22 +02:00
iglocska 7b6604de5b chg: Added the tracking to all queued jobs 2016-08-15 16:30:37 +02:00
Iglocska f2e99cfbb9 fix: Allow correlations between a proposal and attributes in the same event 2016-07-19 15:38:47 +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
Iglocska bae6eadfe7 Revert "chg: remove obsolete uuid() wrapper" 
This reverts commit 77ca0f8dd4.
 2016-07-08 14:50:00 +02:00
Andreas Ziegler 81ab0774f5 fix: use different variable name in sub-loop 2016-07-07 15:38:27 +02:00
Andreas Ziegler 77ca0f8dd4 chg: remove obsolete uuid() wrapper 2016-07-07 15:13:16 +02:00
Andreas Ziegler da4d005cc6 chg: remove obsolete upload function from ShadowAttribute 2016-06-22 01:16:43 +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 4dd5df53c8 Merge pull request #1255 from rotanid/bugfix 
fix: case-insensitive functions calls
 2016-06-12 05:41:05 +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
Andras Iklody fa8c66f6a6 Merge pull request #1218 from rotanid/newlines 
chg: add newline character before EOF to non-minified (text-)files
 2016-06-06 10:21:15 +02:00
Andreas Ziegler 1d06f25b38 chg: add newline character before EOF to non-minified (text-)files 2016-06-06 10:09:55 +02:00
Andras Iklody 97772c3cee Merge pull request #1217 from rotanid/zip-exec-error-handling 
Zip exec error handling
 2016-06-06 09:43:45 +02:00
Andreas Ziegler 8cdbafa4a5 chg: error handling after zip execution 2016-06-06 09:38:52 +02:00
Andreas Ziegler 629e8ee7b9 chg: remove comment: there is no exec wrapper in cakephp 2016-06-06 09:35:34 +02:00
Andreas Ziegler 0117555a99 chg: remove handling of unsupported OS Windows 2016-06-06 09:14:34 +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 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
Andreas Ziegler 8a9ffc1f9b remove obsolete space from: File ( 2016-05-31 18:03:59 +02:00
Andreas Ziegler dc0974a55b misc cleanup 2016-05-21 05:10:49 +02: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
Andreas Ziegler 9db0777533 improve some text passages 2016-05-20 16:46:06 +02:00
Andreas Ziegler 7ae4c37f0b progressive removal of commented out if-statements 2016-05-20 00:48:54 +02:00
iglocska 73375042e6 Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2016-05-13 20:47:10 +02:00
iglocska 9434a2364f fix: Fixes to issues with MYSQL >= 5.7 2016-05-13 20:44:16 +02:00
Iglocska b75cfb842b chg: Prevent attribute edit on deleted attributes, prevent proposal correlation on deleted attributes 2016-05-11 10:38:35 +02:00
devnull- bd6f5f8b20 Add 'certif_public' in the fields 2016-04-05 18:01:50 +02:00
Iglocska daeaee6483 Merge branch '2.4' into feature/enrichment 
Conflicts:
	app/Model/Event.php
 2016-03-19 16:55:42 +01:00
Iglocska d66a43aad1 Set proposal's deleted field to 0 if nothing is set before saving, fixes #988 2016-03-09 14:34:35 +01:00