MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity
656 Commits
34 Branches
365 Tags
189 MiB
Commit Graph

23 Commits (8ca550cbe10af9eba182158118689b87f0a0a946)

Author SHA1 Message Date
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 26c8ad57ee Role 
renamed everything group to role (i.s.o. renaming just the visable).
 2012-12-12 16:15:01 +01:00
noud e4dafd3882 RESTfull sync 
RESTfull attribute add, edit and view, to be usefull in sync.
 2012-12-10 11:32:40 +01:00
noud e20028f053 terms 
activate a route for routeafterlogin on timeout.
 2012-11-22 13:46:42 +01:00
noud 9ec8a888f8 terms 
deactivate a route.
 2012-11-22 11:59:41 +01:00
noud 2f1a055ef2 terms 
better routes to support termaccepted.
 2012-11-22 10:50:25 +01:00
noud 670d2f6311 terms 
route to terms even if an 'admin' option is chosen.
 2012-11-21 16:51:41 +01:00
noud f7c5127da2 RBAC 
change the “Requested Level of User Access” items
conform "draft of Terms-ofUse and Joining Instruction".‏
 2012-11-08 10:31:50 +01:00
noud 582dbb0f7b Audit log 
Search logs and paging now works as expected (conform search
attributes).
 2012-10-31 08:16:37 +01:00
noud d86a0b0639 Audit log 
paging now works.
 2012-10-30 15:17:13 +01:00
noud f3066ddbf8 minor 
cleanup of groups, logs and whitelists views.
 2012-10-30 15:01:59 +01:00
noud c005be5536 CakePHP 
CakePHP update from 2.2.2 to 2.2.3
 2012-10-24 08:23:34 +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 5984f57fb9 CakePHP 
CakePHP update from 2.2.2 to 2.2.3
 2012-10-22 13:26:49 +02:00
noud f8a0e0c6cf Routes (logs pagination) 
recommitted to be sure it's in repo.
 2012-10-17 09:32:07 +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
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 0eb52796ae Admin Paginator fix. 2012-06-29 08:56:00 +02:00
noud 4a12bf960f Admin Paginator fix. 2012-06-29 08:35:32 +02:00
Christophe Vandeplas 9e9837d59d Basic sync push seems to work 2012-05-03 14:32:49 +02:00
Christophe Vandeplas bf8ae66e9c First version or REST API to export data 2012-04-01 17:30:00 +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