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

455 Commits (91f96427db16e1749ddaa688d2ff17341635cca1)

Author SHA1 Message Date
noud e01dd6de77 distribution 
do not display distribution 'All' in Events index or Event view.
 2012-10-24 08:57:41 +02:00
noud 5149952c9d JQuery 
bump JQuery from 1.7.2(.min) to 1.8.2(.min).
 2012-10-24 08:29:07 +02:00
noud c005be5536 CakePHP 
CakePHP update from 2.2.2 to 2.2.3
 2012-10-24 08:23:34 +02:00
noud a502b4dde7 IDS Signature 
corrected wrong description for IDS Signature.
 2012-10-24 08:22:49 +02:00
noud 23cce1e2db Correlation. 
to overcome a possible error on empty correlations.
 2012-10-23 17:28:56 +02:00
noud 9790c4b60f Crypt_GPG 
small comment about debug and
small note in readme about file rights.
 2012-10-23 17:27:50 +02:00
noud b6c6fda2ee outcommented a debug (PGP related). 2012-10-23 15:01:34 +02:00
noud cb677105b1 blackhole 
add component security to GroupsController.
 2012-10-23 15:00:48 +02:00
noud 1b570b9183 Pulldowns 
removed the select optgroup.
 2012-10-23 14:58:50 +02:00
noud 7a7a1142f6 distribution. 
distribution on add is default "All".
 2012-10-23 12:16:16 +02:00
noud fb38f0ca92 GFI Sandbox 
regexp replacement of usernames.
 2012-10-23 12:05:40 +02:00
noud 4b096fa584 distribution 
changes and cleanup.
 2012-10-23 11:28:39 +02:00
noud 1f428e4aa5 Wording change 
so this works.
 2012-10-22 16:39:33 +02:00
Andrzej Dereszowski 25e63dda68 Wording change 
Changed Private column to Distribution + some minor vocabulary changes.
 2012-10-22 16:29:08 +02:00
noud 5a385b4e0b Merge branch 'master' into develop 2012-10-22 15:27:12 +02:00
noud e300ab7ffa Merge branch 'master' of ssh://misp.ncirc.nato.int/home/git/cydefsig.git 2012-10-22 15:14:33 +02:00
noud c512be8064 JQuery 
bump JQuery from 1.7.2(.min) to 1.8.2(.min).
 2012-10-22 13:38:52 +02:00
noud 5984f57fb9 CakePHP 
CakePHP update from 2.2.2 to 2.2.3
 2012-10-22 13:26:49 +02:00
noud e13d6f26e8 IDS Signature 
corrected wrong description for IDS Signature.
 2012-10-22 13:24:45 +02:00
noud a7347064f7 IDS Signature description 
wrong description for signature.
(possible commited 2 times)
 2012-10-22 12:08:24 +02:00
noud e693571fde private 
description in event::view().
 2012-10-22 11:18:53 +02:00
noud 833f6d074f Correlation. 
to overcome a possible error on empty correlations.
 2012-10-19 15:04:31 +02:00
noud 0d65adc9d5 Merge branch 'master' into develop 2012-10-19 13:31:19 +02:00
noud 897732cd46 Crypt_GPG 
small comment about debug and
small note in readme about file rights.
 2012-10-19 13:17:56 +02:00
noud 7077d1e8d4 GFI sandbox. 
better representation of a downloadable attribute
in a link (just href the file name, not including the path).
 2012-10-19 10:04:20 +02:00
noud eae89d95cd Private. 
Add "Pull only" as a sharing state where,
everybody does see an event, is pullable,
but will never be pushed.

Has a generatePrivate for db conversion now.
 2012-10-18 11:40:12 +02:00
Andrzej Dereszowski 0402c291a2 New attribute type - yara sig 2012-10-18 09:56:46 +02:00
noud 67e50cb612 Private 
Private events are true private and
running a server in 2 modes (private and sync),
so real private (red) or private to server (amber)
or full distributable (green).

Mind this needs a change to tables events, attributes and correlation.
These are in MYSQL.private.sql.
 2012-10-17 14:45:26 +02:00
noud bf4e46da8f Merge branch 'master' into develop 2012-10-17 13:26:16 +02:00
noud 899ef6300b blackhole 
i have an idea this blackholeCallback seems to overcome a lot of
blackhole situations we got.
Notably during deleting multiple events from the index,
this improved not getting a blackhole a lot.
 2012-10-17 13:00:50 +02:00
noud 5bef441aba GFI Sandbox 2012-10-17 10:42:09 +02:00
noud f8a0e0c6cf Routes (logs pagination) 
recommitted to be sure it's in repo.
 2012-10-17 09:32:07 +02:00
noud 9435419ebc RBAC 
Group in user profile is no link.
 2012-10-11 17:17:21 +02:00
noud f3af4278b9 Merge branch 'master' into develop 2012-10-10 16:20:25 +02:00
noud 2763f0811b Code Standards 
Given xxx.default.php, do not check database.php anymore.
 2012-10-10 16:19:09 +02:00
noud f400755f7c RBAC 
more correct deactivated buttons being gray but as well having no
effect.
 2012-10-10 16:13:53 +02:00
noud e1aed1c4c1 RBAC 
removed a leftover on in-activating buttons that did show on IE.
 2012-10-10 15:51:18 +02:00
noud 85cef3d5b1 Merge branch 'master' into develop 2012-10-10 14:04:01 +02:00
Andrzej Dereszowski e20cbf3303 NCIRC PHP security settings compatibility patch 
This patch corrects a small thing in Cake code that makes it compatible with open_basedir restriction NCIRC uses in /etc/php.ini

	new file:   build/patches/lib_Cake_View_MediaView.php.diff
 2012-10-10 13:34:34 +02:00
noud aea3aa5934 xxx.default.php 
put plugins loading into bootstrap.default.php
 2012-10-10 11:43:04 +02:00
noud 7bf0e2f882 Groups 
Do not delete group if there is still Users as children.
 2012-10-10 10:53:52 +02:00
noud 870372fb07 Merge branch 'master' into develop 
Conflicts:
	app/Config/bootstrap.php
 2012-10-10 08:37:12 +02:00
Andrzej Dereszowski 6698e4c05e Cosmetic changes 
Descriptions in the export functionality polished.
 2012-10-09 16:08:38 +02:00
Andrzej Dereszowski 0a5d506847 Merge branch 'master' of ssh://misp.ncirc.nato.int:55555/home/git/cydefsig 2012-10-09 14:49:41 +02:00
Andrzej Dereszowski c90ec416f0 Configuration files renamed to better handle git merges on production systems. 
Please add new features with their default values. Their should contain only example values.

	renamed:    app/Config/bootstrap.php -> app/Config/bootstrap.default.php
	renamed:    app/Config/core.php -> app/Config/core.default.php
	renamed:    app/Config/database.php -> app/Config/database.default.php
 2012-10-09 14:44:25 +02:00
noud d112775251 Merge branch 'master' into develop 2012-10-09 13:10:27 +02:00
noud 93720a6228 Comment. 
The actual view to be able to send comment to Org or Owner/user_id.
 2012-10-09 12:57:45 +02:00
noud e57dfa0740 export. 
Use config CyDefSIG.name in NIDS export.
 2012-10-09 12:57:10 +02:00
noud a5ad4b734e Comment. 
Be able to send comment to Org or Owner/user_id.
 2012-10-09 12:49:42 +02:00
noud 1d7860f633 Version. 
Display a version in header.
 2012-10-09 11:45:21 +02:00