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

1441 Commits (48383fe25b8daaf008eefb54909e1b33564a058c)

Author SHA1 Message Date
iglocska 48383fe25b Next version of exports done 2013-11-19 11:03:30 +01:00
iglocska 6015a6f201 Further work on the exports 2013-11-18 11:35:02 +01:00
iglocska d54793ffe6 Most of the export caching done 
- also a fair bit of refactoring of the code, fatter models, thinner controllers, component moved to Lib
 2013-11-15 15:39:34 +01:00
iglocska fcc7a66a55 More work on the background jobs 
- Started work on the exports
 2013-11-07 15:58:29 +01:00
iglocska 5ee9cb7f08 Removed debugkit 2013-11-06 11:08:56 +01:00
iglocska 1c3425fc91 Merge branch 'develop' into feature/CakeResque 
- develop and the first CakeResque implementation merged

Conflicts:
	app/View/Layouts/default.ctp
 2013-11-06 11:02:23 +01:00
iglocska 0f80145c6d :q 2013-11-06 10:52:18 +01:00
iglocska df40448be0 post merge changes 
- some changes to remove strict messages caused by an update to cakephp

- added missing changes to the sql files - all changes from the merge are reflected in ROLECHANGE.sql, import that to upgrade your instance!
 2013-11-06 10:35:51 +01:00
iglocska be723fc821 Merge branch 'feature/discussion' into develop 2013-11-06 10:13:47 +01:00
iglocska 2dd6338ac4 Merge branch 'hotfix-2.1.30' into develop 2013-11-06 10:06:19 +01:00
iglocska 327b336c0c Fix to an issue that prevented attachments being uploaded with invalid category choices when the malware checkbox was ticked 
- re-introduced the removed check for valid category / type combinations based on the checkbox and the chosen category
 2013-11-06 10:02:39 +01:00
iglocska 54a7b66a4b Merge branch 'hotfix-2.1.29' into develop 2013-11-05 13:52:41 +01:00
iglocska acdf9f1b6c Merge branch 'hotfix-2.1.29' 2013-11-05 13:51:18 +01:00
iglocska 2a28591bf7 Loosened the filename validation on attachments 
- filenames without extensions were blocked for example
 2013-11-05 13:48:39 +01:00
iglocska 8a53831b2d Update to the discussions 
- Moved the menues out of the views to the common menu element
 2013-11-04 11:31:15 +01:00
iglocska 08cb33b2bd Some minor changes 
- Contextual comments added to all imports (GFI, ThreatConnect, OpenIOC)

- Some minor fixes to OpenIOC exports and linebreaks in attributes
 2013-11-04 10:11:58 +01:00
iglocska 7979f308e8 Merge branch 'hotfix-2.1.28' into develop 2013-10-31 14:47:38 +01:00
iglocska c95f8ea283 Merge branch 'hotfix-2.1.28' 2013-10-31 14:47:20 +01:00
iglocska 9475216ee0 Linebreaks shown in list attributes 2013-10-31 14:46:55 +01:00
iglocska b538668ee8 Merge branch 'hotfix-2.1.28' into develop 2013-10-31 14:39:49 +01:00
iglocska 34350ccb54 Merge branch 'master' of https://github.com/MISP/MISP 2013-10-31 14:38:55 +01:00
iglocska 53d5b36873 Merge branch 'hotfix-2.1.28' 2013-10-31 14:34:28 +01:00
iglocska dfeee892d6 Line breaks not shown in attribute values 2013-10-31 14:33:57 +01:00
iglocska d7b4c28552 Contextual comments 
- Attributes now have a comment field
 2013-10-30 16:00:46 +01:00
iglocska 088842ad18 Renamed the .sql file used to upgrade 2013-10-30 10:08:42 +01:00
iglocska bbbc17a95b Merge remote-tracking branch 'origin/feature/XML_and_UI' into feature/discussion 
- Also some improvements to the shadow attributes

- some minor UI changes

Conflicts:
	app/Controller/EventsController.php
	app/View/Elements/global_menu.ctp
	app/View/Layouts/default.ctp
 2013-10-30 10:06:12 +01:00
iglocska b2b76779b9 More changes to the discussion boards 
- quote / event tags

- anonymised e-mail addresses
 2013-10-29 13:45:53 +01:00
Christophe Vandeplas e4ef269308 Merge branch 'hotfix/docu' into develop 2013-10-29 11:36:46 +01:00
Christophe Vandeplas 78167dc272 Merge branch 'hotfix/docu' 2013-10-29 11:36:46 +01:00
Christophe Vandeplas b8fa651aad quickstart in docu 2013-10-29 11:36:00 +01:00
iglocska 0591db2a67 Small changes after merging the two feature branches 
- Update to the representation of the new permission flags

- some small issues with the merge resolved
 2013-10-25 11:31:35 +02:00
iglocska 226db074e6 files left off added 2013-10-25 10:42:11 +02:00
iglocska 2b11a78e22 Merge branch 'feature/roleChanges' into feature/XML_and_UI 
Conflicts:
	app/Controller/UsersController.php
	app/View/Regexp/admin_add.ctp
	app/View/Regexp/admin_edit.ctp
	app/View/Regexp/admin_index.ctp
	app/View/Roles/admin_add.ctp
	app/View/Servers/add.ctp
	app/View/Servers/edit.ctp
	app/View/Servers/index.ctp
	app/View/Servers/pull.ctp
	app/View/Servers/push.ctp
 2013-10-25 10:39:18 +02:00
iglocska 0a97f5724a Few more changes 
- some views didn't have the menu element yet
 2013-10-25 10:15:26 +02:00
iglocska 3c58e0071a Further work on the UI 
- reworked almost all of the side menues to be centralised

- Some fixes for the IOC export not handling two new-ish types correctly

- Some changes to the menues (including a few options that didn't exist before)

- rework of the popovers in some forms
 2013-10-24 16:41:42 +02:00
iglocska 0cb7653d41 Merge branch 'develop' into feature/XML_and_UI 2013-10-24 16:10:58 +02:00
iglocska d5d2e900c4 First revision of the unified menu and XML upload 
- centalising the side menu for easier maintainability

- XML upload of event(s) from the interactive interface
 2013-10-24 10:33:34 +02:00
iglocska 6f262e7cc2 Merge branch 'hotfix-2.1.27' into develop 2013-10-18 11:00:31 +02:00
iglocska 5811b5109c Merge branch 'hotfix-2.1.27' 2013-10-18 11:00:05 +02:00
iglocska 814fdba4ed Small cosmetic fix 
- fixed a cosmetic issue with 3+ digit ID numbers, an event info with wide characters can cause the pivot element to flow over into a second row.
 2013-10-18 10:58:40 +02:00
iglocska 195993dd3a Quick fix for the export changes 
- pass by references on method calls removed
 2013-10-17 17:41:46 +02:00
Christophe Vandeplas 04afc57bd5 Merge branch 'feature/IDSsuri' into develop 2013-10-17 15:16:03 +02:00
Christophe Vandeplas 9ed21a0b21 snort export, updated urls, new url is backwards compatible 2013-10-17 15:13:49 +02:00
Christophe Vandeplas 61f027e862 NIDS - fixes issue from last commit 2013-10-17 13:53:14 +02:00
Christophe Vandeplas a7009ada9d NIDS - substitute illegal chars, improved some rules 2013-10-17 13:49:22 +02:00
iglocska f445c0ddb8 Merge branch 'hotfix-2.1.26' into develop 
Conflicts:
	app/Controller/AttributesController.php
 2013-10-15 10:35:08 +02:00
iglocska e25143ba59 Merge branch 'hotfix-2.1.26' 2013-10-15 10:32:04 +02:00
iglocska 1f6024f27d UI fixes 
- popover effect in IE/Chrome not as annoying anymore
- only the active select will have a popover, clicking away destroys it

- Added popovers to the add attachments instead of the old info fields
 2013-10-15 10:28:43 +02:00
Christophe Vandeplas ed266c7262 performance improvements in email and dns. rule for user agent 2013-10-15 07:49:38 +02:00
Christophe Vandeplas 23edf3dd06 improvements in the email NIDS rules 2013-10-11 15:21:45 +02:00