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

70 Commits (15f572c627b2a340d416698b5d2b92e249cb0c17)

Author SHA1 Message Date
Andras Iklody 97f56a2275 Further changes to org admins 
org admins can manage their own server connections
org admins cannot see other orgs' users in the users list
 2013-01-29 08:56:38 +01:00
Noud de Brouwer ea9aa8eb3a coding standards 
Coding Standards.
 2012-12-18 19:25:12 +00:00
noud f9190907c0 sync 
admin must be able to delete servers, Andras corrected.
 2012-11-15 13:36:39 +01:00
noud 6cdf440ef6 sync 
admins must be able to delete a server.
 2012-11-15 13:02:56 +01:00
noud 5bcad4ee99 RBAC 
use $isAclAdd for New Server.
 2012-11-15 11:25:09 +01:00
noud 7eb2c0f4df RBAC 
servers, but add only when Manage Organization Events.
 2012-11-09 10:41:16 +01:00
noud a2bc237bcd RBAC 
should now respect Manage, so also edit, own and org events.‏
 2012-11-08 14:09:52 +01:00
noud f296a9381e RBAC 
real inactive buttons.
 2012-10-25 15:00:43 +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
Christophe Vandeplas 35e1a455cd further cleanup of logo improvement 2012-08-31 10:45:54 +02:00
noud 4ae71fc963 Sync. 
Sync worked, but we did not know what to do with user_id and org.
Now, on sync, anonymize the user_id, get the Server.organization and put
that into Event.org.
And, display owning flag if Event.user_id or get the Server.logo
belonging to Event.org (=Server.organization) when Event.user_id is
empty (=0).

To this there is organization name and logo in bootstrap and
other organizations names and logos in Servers.
 2012-08-28 15:36:14 +02:00
noud 66c5312ea6 DataBase migrate, Audit and Access Control granulation. 2012-06-28 17:24:12 +02:00
root b4558887ce Revert "Audit and ACL first cut." 
This reverts commit 5818231f48.
 2012-06-26 09:40:52 +02:00
noud 5818231f48 Audit and ACL first cut. 2012-06-25 15:54:52 +02:00
Christophe Vandeplas efa590de23 moved some functions around 2012-05-25 08:13:40 +02:00
Christophe Vandeplas 6d8b0a98b0 attachment support in REST API 2012-05-22 13:58:37 +02:00
Christophe Vandeplas 9e9837d59d Basic sync push seems to work 2012-05-03 14:32:49 +02:00
Christophe Vandeplas a45b70bc8d Add, edit, delete and (basic) Manual Sync server functionality added 2012-04-04 20:22:22 +02:00