Commit Graph

26 Commits (6ef27e41f4164a753aa12de2f9579ea5f1b32ca1)

Author SHA1 Message Date
iglocska d0b441132b Fix to the capitalisation in the user index filter and fix to the scripts tmp folder not being created on git clone 2014-10-24 14:17:58 +02:00
iglocska 1d15f14bc3 Merge branch 'develop' of https://github.com/MISP/MISP into develop 2014-09-15 11:06:48 +02:00
iglocska 31d1e98f67 Updated .gitignore 2014-09-15 11:06:08 +02:00
iglocska cb251c69ab Merge branch 'hotfix-2.2.40' into develop 2014-09-12 13:33:55 +02:00
iglocska d51fa92206 Changes to CakeResque installation fixes #287
- CakeResque's installation instructions changed
2014-09-12 13:29:30 +02:00
iglocska b178358f2a Default config.php added 2014-09-10 11:48:48 +02:00
iglocska 167e5e43a3 First version of the STIX export implementation
- currently to_xml() has performance issues, if it's not resolved fast, it would be a good idea to move the export to the background workers

- some UI changes
2014-08-01 14:14:20 +02:00
iglocska 45d826a252 First version of the templating feature complete
- still needs some refinement, but it's feature-complete
2014-07-02 16:20:19 +02:00
iglocska 0873b305a5 Some cleanup 2014-03-11 11:45:40 +01:00
iglocska 6dc75d6b22 Integration of plugins / cake core into MISP as submodules
- easier installation script
- the goal is to reduce the procedure to a few steps
2014-02-07 09:03:28 +01:00
iglocska 4ba0976405 Added structure for export folders
- previously not added because git ignores empty directories
2014-02-06 14:29:18 +01:00
iglocska d403eed399 Update to gitignore 2014-02-06 14:09:24 +01:00
iglocska 50f3fa40d0 Merge branch 'develop' into feature/CakeResque
Also, more work on the background jobs
- started work on publishing
- started making the background jobs an optional setting in bootstrap

Conflicts:
	app/Controller/AppController.php
	app/Controller/EventsController.php
2013-12-04 11:58:01 +01:00
iglocska 0f80145c6d :q 2013-11-06 10:52:18 +01:00
iglocska e73b5d716a Accidental change to gitignore reversed 2013-07-31 15:12:47 +02:00
iglocska 8d2595d592 Breadcrumbs for the views
- makes navigating the site easier
- some new css changes to support this
2013-07-31 15:08:10 +02:00
Christophe Vandeplas 06038ca39c updated gitignore 2013-04-16 22:09:03 +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 e2df7442a4 shit 2012-07-02 16:26:50 +02:00
Christophe Vandeplas 07fc2d2022 cleanup of directory 2012-06-08 17:03:27 +02:00
Christophe Vandeplas fb958eaacc Logging in for REST using Authorized HTTP header field. 2012-04-06 16:32:33 +02:00
Andrzej Dereszowski ed298aa0dd logo position corrected 2012-04-02 11:22:19 +02:00
Christophe Vandeplas da2687846b Implemented file-upload of attachment or password protected
malware-samples. Base code contributed by Andrzej Dereszowski
2012-03-23 20:04:22 +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 1980998ee7 minor fixes in git repo 2011-12-11 16:59:35 +01:00
Christophe Vandeplas 90dff61bb3 initial import 2011-11-26 10:45:31 +01:00