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

25 Commits (c7a98aa286f58a093ad43bf02cea3f0be346b57c)

Author SHA1 Message Date
Noud de Brouwer 1e518f8bc0 Import Regexp 
Renamed Import Whitelist to Import Regexp.
 2012-12-20 18:47:38 +00:00
Noud de Brouwer eb39796472 DB 
clean up conversion.
 2012-12-19 12:12:33 +00:00
Noud de Brouwer 5ecbfd1bbf coding standards 
Coding Standards.
 2012-12-19 02:57:30 +00:00
Andras Iklody 1ceadab700 Added features from branch analysis_levels 
-Analaysis levels setable for events as per milestone item 94
-Password change forced as per milestone item 109
-Added feedback on entered search terms for search attributes
-fixed the authentication issue
-some minor fixes
 2012-12-17 15:51:30 +01:00
noud 094719fa01 Merge branch 'master' into develop 
Conflicts:
	app/Controller/AttributesController.php
	app/Controller/EventsController.php
	app/Controller/ServersController.php
	app/Model/Event.php
 2012-12-12 18:01:39 +01:00
noud dad39083cf CakePHP 
CakePHP update from 2.2.3 to 2.2.4
 2012-12-12 16:51:02 +01:00
noud 26c8ad57ee Role 
renamed everything group to role (i.s.o. renaming just the visable).
 2012-12-12 16:15:01 +01:00
noud 8119d26d35 RBAC and Roles 
did add Acl Admin and Audit.
 2012-12-11 17:40:57 +01:00
noud 75dfba2ae1 sync 
have sync option in role.
and only display the Sync Actions when sync option or admin.
(still has to be disabled if role is below manage org events.
 2012-12-07 15:00:40 +01:00
noud 535a858d13 db 
add the regex table to db conversion.
 2012-12-05 17:51:31 +01:00
noud 2af02aa100 input regex 
use RegexBehavior on Event.info and Attribute.value.
 2012-11-30 13:52:09 +01:00
noud 1e4597c009 distribution 
if distribute upstream, do not alter org, user_id nor distribution
settings.
 2012-11-28 11:09:08 +01:00
noud 957b3e27b8 Merge branch 'master' into develop 
Conflicts:
	app/Controller/ServersController.php
 2012-11-20 11:01:18 +01:00
noud 1cddb6abe0 distribution 
conform latest, having:
- Your organization only
- This server-only
- This Community-only
- Connected communities
- All communities

Push is tested, pull not yet.
 2012-11-16 15:25:57 +01:00
noud 7ccc3a8ba6 db 
db conversion using whitelist, not whitelists.
 2012-11-16 11:15:39 +01:00
noud f5488e653f db 
updated the db conversion from master->develop.
 2012-11-15 14:59:25 +01:00
noud e648817e3d RBAC 
should now respect Manage, so also edit, own and org events
in the db-update procedure as well.
‏
 2012-11-08 14:19:50 +01:00
noud ec0892a6ad Merge branch 'master' into develop 
Conflicts:
	app/Config/bootstrap.php
 2012-09-25 15:54:25 +02:00
noud 18fb8a7a64 CakePHP 
Update from CakePHP to version 2.2.2
as well as needed patch files.
 2012-09-25 15:41:58 +02:00
noud 0d56dfef58 db 
small notes about database.
 2012-09-25 12:43:24 +02:00
noud 8f3d624c1a Merge branch 'master' into develop 
Conflicts:
	app/Controller/AppController.php
	app/Controller/AttributesController.php
	app/Controller/EventsController.php
	app/Controller/ServersController.php
	app/Controller/UsersController.php
	app/Model/Attribute.php
	app/Model/Event.php
	app/Model/Server.php
	app/Model/User.php
	app/View/Attributes/edit.ctp
	app/View/Attributes/index.ctp
	app/View/Elements/actions_menu.ctp
	app/View/Events/add.ctp
	app/View/Events/index.ctp
	app/View/Events/view.ctp
	app/View/Events/xml/view.ctp
	app/View/Servers/index.ctp
	app/View/Users/admin_index.ctp
 2012-09-24 16:02:01 +02:00
Andrzej Dereszowski 3ff180e898 Merge branch 'develop_0.2.2-0.2.3' into develop 
Conflicts:
	app/Config/Schema/schema_0.2.2.php
	app/Config/routes.php
	app/Controller/AppController.php
	app/Controller/UsersController.php
	app/Model/User.php
	app/README.txt
 2012-07-24 16:09:48 +02:00
noud 8216a563dc Servers.lastpushedid and Servers.lastpulledid. 2012-06-29 10:27:19 +02:00
noud 66c5312ea6 DataBase migrate, Audit and Access Control granulation. 2012-06-28 17:24:12 +02:00
Christophe Vandeplas 865a24d0bd Migration to CakePHP 2.1. 
Most of the functionality migrated, Q&A review required.
 2012-03-15 15:06:45 +01:00