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

34 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 0f80145c6d :q 2013-11-06 10:52:18 +01:00
iglocska 0b807a2666 Some cleanup 
- removal of references to the old blacklist
 2013-07-11 10:47:44 +02:00
Christophe Vandeplas 69251490ef Merge branch 'feature/gui' of https://github.com/MISP/MISP into 
feature/gui

Conflicts:
	app/View/Logs/admin_index.ctp
	app/View/Logs/admin_search.ctp
	app/View/Users/memberslist.ctp
 2013-05-31 17:50:00 +02:00
iglocska ade17b3214 Shell scripts updated to populate the ACL 2013-03-12 09:13:57 +01:00
Noud de Brouwer ce44cdb529 coding standards 
this is to the new php53-pear-CakePHP_CodeSniffer-0.1.11.
 2013-02-15 14:20:03 +00:00
Noud de Brouwer 48ad60eb61 GPG 
start of check/correct.
 2013-01-23 15:22:21 +00:00
Noud de Brouwer e4a812f0ff DB 
in conversion create Blacklist table as well.
 2013-01-23 14:44:41 +00:00
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
noud 26c8ad57ee Role 
renamed everything group to role (i.s.o. renaming just the visable).
 2012-12-12 16:15:01 +01:00
noud 2b9b3f176b db 
make top db conversion script path relative.
 2012-12-06 08:25:25 +01:00
noud 535a858d13 db 
add the regex table to db conversion.
 2012-12-05 17:51:31 +01:00
noud 2a96b33d15 os 
various test dirs added just for conveniance.
 2012-11-26 15:41:34 +01:00
noud 957b3e27b8 Merge branch 'master' into develop 
Conflicts:
	app/Controller/ServersController.php
 2012-11-20 11:01:18 +01:00
noud f5488e653f db 
updated the db conversion from master->develop.
 2012-11-15 14:59:25 +01:00
noud d043d759d5 install. 
variable cydefsig home dir.
 2012-10-29 16:49:53 +01:00
noud 870372fb07 Merge branch 'master' into develop 
Conflicts:
	app/Config/bootstrap.php
 2012-10-10 08:37:12 +02: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 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
noud 94a367c2f5 CakePHP Coding Standards 
http://book.cakephp.org/2.0/en/contributing/cakephp-coding-conventions.html

Eclipse:
Window->Preferences
	General->Editors->Text Editors
		Displayed tab width:	4
		Insert spaces for tabs	NOT
	PHP->Code Style->Formatter
		Tab policy:	Tabs
File->Convert Line Delimeters To->Unix [default]

http://mark-story.com/posts/view/static-analysis-tools-for-php
for instance:
phpcs --standard=CakePHP app/Model/

Not yet done is all camel caps format.
 2012-09-18 15:30:32 +02:00
noud 253d8e1b58 Merge branch 'master' into develop 
Conflicts:
	app/Controller/EventsController.php
	app/Model/Attribute.php
	app/View/Events/view.ctp
 2012-09-17 13:02:53 +02:00
noud 6b52841521 Login. 
small shell script to reset password. Used like:
./Console/cake password <email> <passwd>
 2012-09-05 13:46:24 +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
Andrzej Dereszowski 2d8695732d Merge branch 'develop' of code.lab.modiss.be:cydefsig into develop_0.2.2_fixes 2012-07-02 17:11:38 +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 9a30ba883f updated console version from newer cakephp 2012-06-08 17:00:07 +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