Commit Graph

7 Commits (4fea371c4b417e6eac5cdefe0baf77840f5752a1)

Author SHA1 Message Date
iglocska 485c007b39 Merge branch 'master' into 2.4-beta
Conflicts:
	VERSION.json
	app/Lib/Tools/XMLConverterTool.php
	app/Model/Event.php
	app/Model/EventTag.php
	app/Model/TemplateElementAttribute.php
	app/Model/TemplateElementFile.php
	app/Model/TemplateElementText.php
	app/Model/ThreatLevel.php
	app/View/Attributes/index.ctp
	app/View/Elements/eventattribute.ctp
	app/View/Elements/eventattributerow.ctp
	app/View/Elements/global_menu.ctp
	app/View/Elements/side_menu.ctp
	app/View/Events/automation.ctp
	app/View/Events/index.ctp
	app/View/Pages/administration.ctp
	app/View/ShadowAttributes/index.ctp
	app/View/Tags/index.ctp
2015-11-17 01:14:51 +01:00
iglocska b3a2428345 Merge branch 'basedir' into hotfix-2.3.160
Conflicts:
	app/Controller/AppController.php
	app/View/Pages/administration.ctp
2015-11-17 00:33:34 +01:00
pugilist ec7d85332c modified many instances of html anchors and javascript document.location to use 2015-11-08 15:38:24 -05:00
Iglocska 684be69ed0 Incremental export generation for HIDS and NIDS exports
- Instead of fetching all events at once for the export, events are fetched one by one
- Greatly reduces memory footprint (It mostly depends on the event with the most eligible attributes now, instead of the combined list of all events)
- Because of the lower memory usage, the time taken for the export is also slashed to a fragment of what it was before
2015-07-20 16:25:16 +02:00
iglocska 2afea61ea0 Added the missing ways to exploit the rpz functionality
- rpz added to exports, both old-style and with background workers
- per event rpz functionality added
2015-05-20 16:23:42 +02:00
iglocska f8424d484b Bug fixes
- Fix to some of the exports not working in legacy (non background-job) mode
- Issue also occured while using automation
2014-01-08 17:08:32 +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