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

3959 Commits (52cd830a4d533e33f46fe17de1a9e8048b0f3f52)

Author SHA1 Message Date
Andras Iklody 52cd830a4d Merge pull request #1216 from rotanid/no-windows 
chg: remove handling of unsupported OS Windows
 2016-06-06 09:25:31 +02:00
Andreas Ziegler 0117555a99 chg: remove handling of unsupported OS Windows 2016-06-06 09:14:34 +02:00
iglocska afe9b8a203 fix: Can't add Elements to a newly created Template. fixes #1188 2016-06-05 16:52:22 +02:00
Iglocska b094af8b12 fix: Fixed epel url for centos 7.x 2016-06-05 23:27:13 +02:00
Iglocska 3172be5d40 fix: minor cosmetic issue in distribution, fixes #1197 2016-06-06 00:35:19 +02:00
Iglocska 6fce5530cd fix: use of unset variable in Model/Event.php sendContactEmailRouter(), fixes #1210 2016-06-04 22:43:43 +02:00
Andras Iklody 939ecfdafd Merge pull request #1214 from rotanid/fileaccesshandling 
EventsController: optimise file handling
 2016-06-04 18:47:01 +02:00
Andras Iklody 3c1a76cb39 Merge pull request #1213 from rotanid/ModelEventCleanup2 
Model/Event.php cleanup 2
 2016-06-04 18:45:21 +02:00
Iglocska 9ff9ed3953 Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 
Conflicts:
	app/Model/Event.php
 2016-06-04 18:37:52 +02:00
Iglocska 799242238c fix: Fix to a duplicate parameter passed to fetchevent instead of passing the "to" parameter as expected 2016-06-04 18:34:58 +02:00
Andras Iklody 47a3c6aa46 Merge pull request #1212 from rotanid/ModelEventCleanup 
Model/Event.php cleanup
 2016-06-04 18:34:17 +02:00
Andras Iklody 5ca519ca47 Merge pull request #1211 from rotanid/braces 
Braces
 2016-06-04 18:29:37 +02:00
Andreas Ziegler b40ca422ab EventsController: optimise file handling 2016-06-04 18:17:39 +02:00
Andreas Ziegler b3aa7dc8c0 Model/Event.php: remove unused functions 2016-06-04 17:23:06 +02:00
Andreas Ziegler 552e702f97 Model/Event.php: remove unused variables 2016-06-04 17:23:06 +02:00
Andreas Ziegler 9a0b419915 Model/Event.php: use different key variable in sub-loop 2016-06-04 17:08:14 +02:00
Andreas Ziegler 7139dc6084 Model/Event.php: fix indention 2016-06-04 17:07:25 +02:00
Andreas Ziegler 0ee1058b99 Model/Event.php: fix method invocation 2016-06-04 17:06:55 +02:00
Andreas Ziegler a5d261afec Model/Event.php: add variable defaults 2016-06-04 17:06:01 +02:00
Andreas Ziegler a6ca4afb31 Model/Event.php: correct function naming 2016-06-04 17:05:13 +02:00
Andreas Ziegler c44a02c2b6 Model/Event.php: remove duplicate array keys 2016-06-04 17:04:27 +02:00
Andreas Ziegler 958aa7c414 use consistent spacing around else if 2016-06-04 15:49:54 +02:00
Andreas Ziegler e600df3262 use consistent spacing around else 2016-06-04 15:46:34 +02:00
Andreas Ziegler 7cadf8340c remove space after unset before opening brace 2016-06-04 15:45:57 +02:00
Andreas Ziegler 985451642e add space after keywords if/for/foreach/while/switch/catch 2016-06-04 15:45:39 +02:00
Andreas Ziegler 8f9e152d8c add space before opening curly brackets 2016-06-04 15:45:11 +02:00
Andras Iklody 66d0bca85b Merge pull request #1209 from rotanid/removal 
WhitelistsController.php: remove obsolete variable
 2016-06-04 09:23:53 +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
Andras Iklody 344c5f7672 Merge pull request #1206 from rotanid/obsolete-spaces 
Removal of obsolete whitespace/spaces
 2016-06-04 09:17:34 +02:00
Andreas Ziegler cc125b60e9 WhitelistsController.php: remove obsolete variable 2016-06-04 03:58:53 +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 bba7e60e85 remove empty lines at end of files 2016-06-04 01:10:05 +02:00
Andreas Ziegler 898ea1d97c remove whitespace (space/tab) from empty lines 2016-06-04 01:08:16 +02:00
Iglocska 5e4f09352d fix: reverted a patch to allow organisations without uuids to be added 2016-06-03 21:55:52 +02:00
Andras Iklody 55ff877d26 Merge pull request #1203 from sfossen/patch-23 
allow related events to send org uuid, since events send them already
 2016-06-03 21:32:24 +02:00
Andras Iklody 0117752901 Merge pull request #1202 from sfossen/patch-22 
not local and no uuid, it's an invalid organisation
 2016-06-03 21:31:50 +02:00
Andras Iklody 927800a081 Merge pull request #1154 from sfossen/patch-12 
reduce warnings in debug log
 2016-06-03 21:31:18 +02:00
Steve Fossen 399a86c8fe allow related events to send org uuid, since events send them already 
There is the potential, that an org shows up in the RelatedEvent before it shows up in an Event and causes sync to fail. Already submitted a pull request to fix the crash, but potential for incomplete data.
 2016-06-03 11:56:47 -07:00
Steve Fossen e54b74551f not local and no uuid, it's an invalid organisation 
sync fails with
[2016-06-01 21:04:26] main.ERROR: {"queue":"default","id":"99b7d5ef61e24389ea2edf8c3f209856","class":"ServerShell","args":[["pull","1","1","full","2075"]]} failed: SQLSTATE[HY000]: General error: 1364 Field 'uuid' doesn't have a default value {"type":"fail","log":"SQLSTATE[HY000]: General error: 1364 Field 'uuid' doesn't have a default value","job_id":"99b7d5ef61e24389ea2edf8c3f209856","time":55606,"worker":"misp:14872"} []
 2016-06-03 10:43:09 -07:00
Iglocska 6e9a448cbd fix: Cannot delete users, fixes #1200 2016-06-03 17:43:27 +02:00
Iglocska 3a28167a80 Merge remote-tracking branch 'origin/2.4' into 2.4 2016-06-03 17:40:36 +02:00
Raphaël Vinot 557d39ee36 Update PULL_REQUEST_TEMPLATE.md 2016-06-03 16:04:04 +02:00
Raphaël Vinot 2f58f20b49 Update PULL_REQUEST_TEMPLATE.md 2016-06-03 15:49:58 +02:00
Raphaël Vinot 54d9a88e0a Update ISSUE_TEMPLATE.md 2016-06-03 10:52:04 +02:00
Andras Iklody ac4afa35c2 Merge pull request #1193 from rotanid/defaults 
add some defaults
 2016-06-03 02:10:00 +02:00
Andras Iklody 93a07436d7 Merge pull request #1192 from rotanid/removal 
Removal of obsolete code
 2016-06-03 01:48:34 +02:00
Andreas Ziegler 8c21fa27d0 add some variable defaults 2016-06-03 01:44:07 +02:00