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

1957 Commits (d0b441132bb8c9a5437eb913132311c556fdce57)

Author SHA1 Message Date
iglocska 97358a405e Proposal package now correctly saved on the far end 2014-08-12 18:05:26 +02:00
iglocska 9799c1d9dd More work on the sync fix 2014-08-12 17:25:09 +02:00
iglocska 6bca13b3e5 Further work on the sync fixes 2014-08-12 15:35:32 +02:00
iglocska 8b16f0cf18 Push now also only does a differential push 
- send uuids of events to be pushed together with timestamps to the other instance
- other instance removes events that are already up to date or locally created from the array
- sends the remaining uuids back
- first instance initiates the push of events that were not filtered out
 2014-08-12 11:54:00 +02:00
iglocska 6e168e5b57 Small fix to the proposal accept button and cakephp 2.4.8+ (related to 3da49c9) 2014-08-12 09:43:53 +02:00
iglocska e6c28fe69a Futher work on the proposal sync 2014-08-11 16:40:09 +02:00
iglocska 1bbf678f70 Further changes 2014-08-11 16:26:49 +02:00
iglocska 99c04afa85 First round of fixes 2014-08-11 15:11:57 +02:00
iglocska 2ad040f0e6 view left off from previous commit 2014-08-08 15:33:57 +02:00
iglocska 559b39ceb5 Reworking of the event filtering 2014-08-08 15:28:37 +02:00
iglocska 8e987bee67 Made thread title clickable in event discussions fixes #270 2014-08-06 14:37:19 +02:00
iglocska e537c3aa49 Fixed an ajax issue with event discussions 
- could not add posts via the event view
- related to 3da49c964b
 2014-08-06 14:07:30 +02:00
iglocska a6a353252e Merge branch 'hotfix-2.2.34' into develop 2014-08-06 13:47:51 +02:00
iglocska 04b26743fa Merge branch 'hotfix-2.2.34' 2014-08-06 13:47:26 +02:00
iglocska f86bb89e14 Commas in CSV now escaped properly fixes #281 2014-08-06 13:46:52 +02:00
iglocska 90a5832638 Performance 2014-08-06 13:40:23 +02:00
iglocska de9affda91 Small performance improvement 
The contributor field in the event view is evaluated based on proposal log entries from the log table affecting the current event. In order to improve performance, the LIKE check for the event ID is moved to the last argument in order to avoid parsing rows that could be ignored by the other arguments quicker.
 2014-08-06 11:16:27 +02:00
iglocska edc8029869 Updated cakephp 2014-08-06 10:09:04 +02:00
iglocska 3da49c964b Fixed broken AJAX queries in MISP as a result to changes in cakephp 2.4.8+ 
A change in cakephp version 2.4.8+ has resulted in ajax form submitions breaking. Reason for this was a change in the SecurityComponent taking the url specified in the form into account when generating the CSRF tokens.

This is now fixed by embedding the correct url in the ajax forms.
 2014-08-06 10:02:52 +02:00
iglocska 53ac9a16da More missing <?php tags 2014-08-05 11:24:07 +02:00
iglocska 9902217ac5 Missing <?php tag in a view file 2014-08-05 10:32:49 +02:00
iglocska 9e227ef724 Missing view file added 2014-08-04 18:15:39 +02:00
iglocska 83d5e191fc Updates to the STIX export 2014-08-04 18:07:15 +02:00
iglocska 525ef65008 Fix to the previous commit 
- previous commit broke the flash message alignment when debug was enabled
 2014-08-03 21:24:46 +02:00
Alexandre Dulaunoy 65ed10fe12 Update INSTALL.txt 
Fix #252
 2014-08-02 09:16:16 +02:00
iglocska 51d83f8ceb Fixed the annoying collapsing top bar 2014-08-01 15:41:48 +02:00
iglocska 2ddad51056 Merge branch 'develop' of https://github.com/MISP/MISP into develop 2014-08-01 15:30:48 +02:00
iglocska 23bc4127bf Merge branch 'feature/stix_export' into develop 2014-08-01 15:29:49 +02:00
iglocska b983147061 Some cleanup 2014-08-01 15:29:16 +02:00
iglocska 2915be5020 Download stix xml / json result 2014-08-01 15:22:39 +02:00
iglocska 5257fa2b4a removed old junk version of the export 2014-08-01 14:15:39 +02:00
iglocska 167e5e43a3 First version of the STIX export implementation 
- currently to_xml() has performance issues, if it's not resolved fast, it would be a good idea to move the export to the background workers

- some UI changes
 2014-08-01 14:14:20 +02:00
Christophe Vandeplas 9da90a1f0c Merge branch 'hotfix/export_suricata' into develop 2014-07-29 14:30:03 +02:00
Christophe Vandeplas 2b932d7b0f Merge branch 'hotfix/export_suricata' 2014-07-29 14:30:02 +02:00
Christophe Vandeplas f4e6e3fb12 regex bugfix in the ids export + suricata export using dns keyword 2014-07-29 14:28:34 +02:00
iglocska 7651f95faa Python scripts to handle the conversion from a MISP JSON event to stix/cybox 2014-07-25 10:47:08 +02:00
iglocska 40baedc531 Merge branch 'feature/templates' into develop 2014-07-19 16:26:36 +02:00
iglocska c64d6a8c93 same org / site admin restriction on freetext importer added 2014-07-19 16:25:43 +02:00
iglocska 61d2fe54ff Start of the stix export tool 2014-07-19 16:24:25 +02:00
iglocska c5ed7531cd Truncated the event info fragment shown in the pivot bubbles by one extra character 2014-07-19 16:03:21 +02:00
iglocska e1988690c6 Merge branch 'feature/templates' into develop 
Conflicts:
	app/Model/Event.php
 2014-07-19 15:51:30 +02:00
iglocska d3d578d622 Update to the main MYSQL.sql file 2014-07-19 15:48:42 +02:00
iglocska bfdd2ee571 Update for the MYSQL scripts for the new features 2014-07-19 15:46:52 +02:00
iglocska ab5b9a9dae Several features finished 
- first version of templating system complete
- first version of freetext importer complete
- first version of mass attribute replace tool complete

- some UI changes
 2014-07-19 15:09:37 +02:00
iglocska 893ef5a129 Freetext import tool 
Added freetext import tool
 2014-07-10 17:02:19 +02:00
iglocska 029ef252a2 Some fixes to the templating 
- resolved bugs with permissions
- fixed the broken mass delete tool
- Fixed an issue with the type not being chosen correctly for file type attributes when created through the templating tool
 2014-07-08 11:31:23 +02:00
iglocska 45d826a252 First version of the templating feature complete 
- still needs some refinement, but it's feature-complete
 2014-07-02 16:20:19 +02:00
iglocska 4b19de1033 Merge branch 'hotfix-2.2.33' into develop 2014-06-27 21:38:31 +02:00
iglocska 4a8ffe2330 Merge branch 'hotfix-2.2.33' 2014-06-27 21:38:13 +02:00
iglocska 72d4db3007 2 Background worker issues fixed 
- Start-up script could only be started from the script's location

- Division by zero in e-mail alerts when calculating the progress of the background job
 2014-06-27 21:36:14 +02:00