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

44 Commits (6a824d1b2092a4e33aea45b3a09d4af47b2e3b49)

Author SHA1 Message Date
Andras Iklody ff822c8bb6 Cleaning up and changing the user guide 
- user guide: information about the new number of attributes field in the list of events added
- updated the event showing a list of events
- removed obsolete images
 2012-11-14 17:27:38 +01:00
Andras Iklody 7543a2aa06 Change to the user manual 
Again a slight change, removed a script that numbered the <h2> headers for the ToC creation. Also fixed a few images.
 2012-11-09 15:32:39 +01:00
Andras Iklody 051f11fc0e New user guide 
User guide for cydefsig v2
 2012-11-09 14:34:02 +01:00
noud f296a9381e RBAC 
real inactive buttons.
 2012-10-25 15:00:43 +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 ec0892a6ad Merge branch 'master' into develop 
Conflicts:
	app/Config/bootstrap.php
 2012-09-25 15:54:25 +02:00
noud af6cb0e896 CakePHP 
Removed diffs that already are placed in build/patches.
 2012-09-25 15:46:50 +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 01ebbbb7d2 Merge branch 'master' into develop 2012-09-25 11:25:27 +02:00
noud c305af94e9 CakePHP 
To be able to update CakePHP (regularly),
we found the current differences and now
put these diffs to build/patches.

Patches are now relative to $CakePHP_HOME.
 2012-09-25 11:22:12 +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 7f40de4427 Merge branch 'coding_standards' 
Conflicts:
	app/Controller/Component/NidsExportComponent.php
 2012-09-21 09:46:08 +02:00
noud 3e5ec0e801 CakePHP 
Located the patches done to CakePHP to be able to upgrade CakePHP.
 2012-09-20 15:59:01 +02:00
noud 38f7c4195c IE 
no scrollbars during print fixed wrong,
now overflow visable i.s.o. hidden.
 2012-09-20 14:51:21 +02:00
noud dcdb025d9c IE 
no scrollbars during print.
 2012-09-20 14:01:51 +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 be10754474 improve logo and email display features 2012-08-31 10:23:40 +02:00
noud 5c39a46fc8 Sync. 
Better square and croped images.
 2012-08-29 13:11:00 +02:00
noud eb8827314d Sync. 
The actual logos used for visable flags in Events::index.
 2012-08-28 15:49: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
deresz ebec1d7f26 Make the documentation "brand-neutral" to be able to develop it in a community. 2012-07-11 11:03:18 +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 ba75b24bb4 forgot to add js to previous commits 2012-05-31 16:11:40 +02:00
Christophe Vandeplas e4feaaa013 Part of the documentation added - docu written by Miguel Soria Machado 
(CERT-EU)
 2012-05-25 14:56:58 +02:00
Christophe Vandeplas 87e12448ab Start of documentation concerning REST. 2012-04-07 09:38:15 +02:00
Christophe Vandeplas fb958eaacc Logging in for REST using Authorized HTTP header field. 2012-04-06 16:32:33 +02:00
Christophe Vandeplas 49aaced78a Merge commit '9e043116228c4866b18e92acb076462845bcf22a' into develop 
Fixed conflicts in: app/View/Events/view.ctp
 2012-04-04 17:53:51 +02:00
Andrzej Dereszowski 17950b965e minor correction: 
- login page does not display "invalid user" when first time presented to the user
- "Log Off" button removed from the print view
 2012-04-02 11:37:32 +02:00
Christophe Vandeplas 0915ce48d3 Added some infoboxes when adding Attributes. 2012-03-31 23:29:56 +02:00
Christophe Vandeplas 7c4394682d Renamed Signature to Attribute 2012-03-26 19:56:44 +02:00
Christophe Vandeplas 86b760cd54 Print Cascading Stylesheets and minor layout fixes 2012-03-25 15:02:15 +02:00
Christophe Vandeplas 754230feb0 Graph for Signatures Type per organisation 2012-03-21 10:34:22 +01:00
Christophe Vandeplas c5954b081b Layout improvements 2012-03-20 15:11:02 +01: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
Christophe Vandeplas 6da66f61b6 Terms and Conditions and News splashpage 
Updated DB structure: ALTER TABLE `users` ADD `termsaccepted` TINYINT( 1
) NOT NULL , ADD `newsread` DATE NOT NULL
 2012-03-13 09:58:34 +01:00
Christophe Vandeplas 101a049ff7 Fixed filesystem permissions 2012-01-05 14:14:54 +01:00
Christophe Vandeplas c68c732bf4 stylesheet improvements 2012-01-05 11:46:59 +01:00
Christophe Vandeplas cb26fb51dc color improvement in notification message 2011-11-28 23:04:54 +01:00
Christophe Vandeplas 1aaad192a1 better color-based error messages 2011-11-27 17:14:59 +01:00
Christophe Vandeplas 8e9cb8a367 minor layout improvements 2011-11-26 12:31:06 +01:00
Christophe Vandeplas 90dff61bb3 initial import 2011-11-26 10:45:31 +01:00