4fea371c4b
Fix permissions
2016-02-11 17:03:51 +01:00
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
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
ec7d85332c
modified many instances of html anchors and javascript document.location to use
2015-11-08 15:38:24 -05:00
3584e52ccf
Blackhole message due to csrf replaced with something more obvious, fixes #504
...
- user will get an explanation of the csrf error and that going back and refreshing the form will fix it
- also, there is a link that will take the user to the baseurl (which will redirect to the login page if the csrf issue occured on the login page)
2015-05-27 18:22:51 +02:00
957b3e27b8
Merge branch 'master' into develop
...
Conflicts:
app/Controller/ServersController.php
2012-11-20 11:01:18 +01:00
18fb8a7a64
CakePHP
...
Update from CakePHP to version 2.2.2
as well as needed patch files.
2012-09-25 15:41:58 +02:00
865a24d0bd
Migration to CakePHP 2.1.
...
Most of the functionality migrated, Q&A review required.
2012-03-15 15:06:45 +01:00
William Robinet