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

4169 Commits (77ca0f8dd46222c2a0c7bc38608e0215988f33f3)

Author SHA1 Message Date
Andreas Ziegler 77ca0f8dd4 chg: remove obsolete uuid() wrapper 2016-07-07 15:13:16 +02:00
Iglocska 19781ee3c9 Revert "fix: Fixed an issue where an event view by a malformed UUID would result in a lookup against the leading numerical value in the malformed UUID, fixes #1338" 
This reverts commit 1b06413375.
 2016-07-07 15:06:53 +02:00
Iglocska b0ca0d6130 Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2016-07-07 08:49:59 +02:00
Iglocska 1b06413375 fix: Fixed an issue where an event view by a malformed UUID would result in a lookup against the leading numerical value in the malformed UUID, fixes #1338 2016-07-07 08:48:42 +02:00
Andras Iklody 2a16e9ce10 Merge pull request #1339 from rotanid/bugfix-uuid-id-check 
fix: check for correct event uuid and id
 2016-07-07 08:42:18 +02:00
Andreas Ziegler 30fe924e25 fix: check for correct event uuid and id 2016-07-07 03:44:30 +02:00
Andreas Ziegler 8b97dfd26f Merge pull request #1337 from CheYenBzh/2.4 
openIOC import issue / fileAccess class not found / Update EventsController.php
 2016-07-06 12:11:11 +02:00
CheYenBzh c10c24aa6b Update EventsController.php 2016-07-06 12:04:10 +02:00
Andras Iklody 9a7c8b801a Merge pull request #1332 from rotanid/mysql-sql-cleanup 
MYSQL.sql cleanup #3
 2016-07-06 08:36:29 +02:00
Andreas Ziegler 5e680a7e72 update db_version in MYSQL.sql 2016-07-06 00:22:54 +02:00
Andreas Ziegler 2f2da8515f fix: add warninglist tables to MYSQL.sql 2016-07-06 00:22:19 +02:00
Andreas Ziegler 2f2952cff2 fix: use same default value as in AppModel update mechanism 2016-07-06 00:21:28 +02:00
Andreas Ziegler 8ce679df91 chg: move tables to retain alphabetical order 2016-07-06 00:17:59 +02:00
Alexandre Dulaunoy a566ff45a2 Chg: Taxonomies updated to the latest version 2016-07-05 22:01:07 +02:00
Iglocska 8c7d8c46a2 fix: tag keywords in attribute search filter has issues with an empty newline, fixes #1330 2016-07-05 15:22:17 +02:00
Iglocska 6e000b8681 fix: Fixed leading/trailing white spaces from breaking the quick filter on the event index, fixes #1329 2016-07-05 13:39:37 +02:00
Iglocska 6aaed7b32f Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2016-07-05 09:45:13 +02:00
Andras Iklody 82f3dd3583 Merge pull request #1327 from rotanid/mysql-sql-cleanup 
MYSQL.sql cleanup #2
 2016-07-05 08:41:06 +02:00
Andreas Ziegler 0c2d3603d1 chg: remove quotes from integers in MYSQL.sql 2016-07-05 04:53:56 +02:00
Andreas Ziegler 664503a54d chg: KEY/INDEX are synonyms in MySQL, use INDEX only 2016-07-05 04:42:29 +02:00
Andreas Ziegler 3495e71449 Merge pull request #1326 from rotanid/fopen-handling-clean 
chg: coding conventions in FileAccess.php
 2016-07-04 22:55:49 +02:00
Andreas Ziegler 78e8371608 chg: coding conventions in FileAccess.php 2016-07-04 22:54:35 +02:00
Andras Iklody fbc1432d3a Merge pull request #1283 from RichieB2B/ncsc/fix-push-events 
Push events to server with push rules on non-exportable tags
 2016-07-04 19:48:47 +02:00
Andras Iklody d67fd402fe Merge pull request #1286 from rotanid/shadowattribute-uploadattachment-removal 
remove obsolete upload function from ShadowAttribute
 2016-07-04 19:48:00 +02:00
Andras Iklody 94f7f0d718 Merge pull request #1256 from rotanid/cleanup2 
misc cleanup round 3
 2016-07-04 19:45:54 +02:00
Iglocska 7f8f430913 Merge branch 'cleanup3' into 2.4 2016-07-04 19:43:12 +02:00
Iglocska 57ceb304c3 Merge branch 'write' into 2.4 2016-07-04 19:35:01 +02:00
Iglocska b80cc56ec9 Merge branch '2.4' into write 2016-07-04 19:33:45 +02:00
Andras Iklody 7191550616 Merge pull request #1324 from rotanid/mysql-cleanup 
MYSQL.sql cleanup
 2016-07-04 16:02:43 +02:00
Andreas Ziegler c92058a0b5 chg: remove quotes from integers in MYSQL.sql 2016-07-04 15:50:53 +02:00
Andreas Ziegler 46b0dd1cb2 chg: use lowercase for int in whole MYSQL.sql 2016-07-04 15:49:20 +02:00
Andreas Ziegler fd5e463926 chg: remove duplicate spaces from MYSQL.sql 2016-07-04 15:49:15 +02:00
Iglocska 5c0f9f565c Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2016-07-02 23:47:09 +02:00
Andras Iklody b35794a14f Merge pull request #1319 from cristianbell/fix-939_graceful_maintenance_page 
issue 993: Graceful maintenance message.
 2016-07-03 21:07:46 +02:00
Iglocska 034b89ac2e chg: Added autoRegenerate to default.core.php 
- renews the session on activity
 2016-07-02 23:46:19 +02:00
Iglocska ea17d33fba Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2016-07-02 22:46:24 +02:00
Iglocska 543293060f chg: Added pull diagram 2016-07-02 22:46:02 +02:00
Alexandre Dulaunoy fd67b8de2c Updated MISP taxonomies 2016-07-01 19:06:17 +02:00
Andras Iklody d9868b7970 Merge pull request #1321 from cristianbell/chg_adding_job_duration_time 
chg: adding job duration to the "Job done." text.
 2016-07-01 16:24:12 +02:00
Raphaël Vinot 7624e1000b Merge pull request #1320 from Rafiot/update_tests 
Update testing
 2016-07-01 15:56:26 +02:00
Iglocska 4aaed22c50 fix: Fixed an issue with an invalid offset in a comparison when adding events 2016-07-01 15:51:17 +02:00
Raphaël Vinot ccb4fc2515 Use more reasonable tests 2016-07-01 15:44:25 +02:00
Cristian Bell 0cdcb23ca6 chg: adding job duration to the "Job done." text. 2016-07-01 14:52:02 +02:00
Raphaël Vinot 1fa1777e89 Update testing 2016-07-01 14:32:04 +02:00
Cristian Bell 7b65a52a44 issue 993: Graceful maintenance message. 2016-06-30 17:33:23 +02:00
Andras Iklody f239e151ce Merge pull request #1317 from cristianbell/fix-mail_jobs_date_modified 
Email jobs do not update the date modified once completed.
 2016-06-30 16:26:14 +02:00
Cristian Bell 6e62a3b662 Email jobs do not update the date modified once completed. 2016-06-30 16:16:16 +02:00
Iglocska a97d90ca5a fix: removed duplicate of the same condition 2016-06-30 11:46:27 +02:00
Iglocska 2a7115bb91 Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2016-06-30 11:45:25 +02:00
Iglocska ab3b85b1cc fix: Filtering on attributes in the event view gives a no attributes warning if a tab doesn't contain attributes 
- Warning now only triggers if the event doesn't have any attributes in any tabs
 2016-06-30 11:44:26 +02:00