Commit Graph

736 Commits (3b07348849d13bb1693e0644577d8a8d23695015)

Author SHA1 Message Date
Noud de Brouwer 3b07348849 distribution
attributes inherit distribution from event.
2013-01-25 11:25:18 +00:00
Andras Iklody d4c5460d9e Org admin can only see org logs
Added check for the above
2013-01-25 11:21:39 +01:00
Noud de Brouwer d6adb11f52 RBAC
only create users within own organisation.
2013-01-25 07:52:32 +00:00
Noud de Brouwer 3d40095547 coding standards
Coding Standards.
2013-01-25 07:51:20 +00:00
Andras Iklody 24b10579ad Pull fixed
Fixed the issues with pull, should work fine now
2013-01-24 17:32:57 +01:00
Noud de Brouwer 3917e93ae6 coding standards
Coding Standards.
2013-01-24 14:35:13 +00:00
Andras Iklody ce4bf4bd1b Fixed push/publish
Fixed a few issues that caused push/publish not to work
2013-01-24 15:10:59 +01:00
Noud de Brouwer 01c0dc0e71 RBAC
org admin and RBAC admin.
2013-01-24 10:35:59 +00:00
deresz b1b47bc56f Better fix to Sanitize::clean() problem
'escape' option was removed.
2013-01-24 10:38:51 +01:00
Noud de Brouwer f8b9d85c62 Sanitize
Sanitize can not be used in PGP key.
2013-01-24 08:19:47 +00:00
Noud de Brouwer 48ad60eb61 GPG
start of check/correct.
2013-01-23 15:22:21 +00:00
Noud de Brouwer e4a812f0ff DB
in conversion create Blacklist table as well.
2013-01-23 14:44:41 +00:00
Noud de Brouwer ef0f2201ac PGP
clean key remark.
2013-01-23 13:41:34 +00:00
Noud de Brouwer 9da93c51a6 PGP
direction-like-out-commented try.
2013-01-23 12:31:55 +00:00
Noud de Brouwer 8bf8ef17ca RBAC
so role is editable.
(i will not commit/push during after hours ;) )
2013-01-22 18:37:30 +00:00
Noud de Brouwer 732ac3609f Merge branch 'develop' of ssh://misp.ncirc.nato.int/home/git/cydefsig into develop 2013-01-22 15:25:51 +00:00
Noud de Brouwer 7e5c34770e RBAC
role editable on user page (by admin).
2013-01-22 15:25:08 +00:00
deresz 355e9a435e Roles controller Jquery helper added
For some reason I needed it
2013-01-22 16:15:32 +01:00
Noud de Brouwer 125869c1d8 RBAC
roles/view/<id>.
2013-01-22 15:12:36 +00:00
Noud de Brouwer 06b062dacc RBAC
ampesant in html.
2013-01-22 14:46:39 +00:00
Noud de Brouwer 7c33a412b2 RBAC
admin must be able to edit role, where-ever.
2013-01-22 14:39:54 +00:00
Andras Iklody 41049c4e83 Distribution level explanation
The description of the distribution levels has been updated
2013-01-22 15:18:26 +01:00
Andras Iklody 2718bc6c09 Slight change to distribution description
Changed the explanation for each distribution level on event creation
2013-01-22 15:14:08 +01:00
Noud de Brouwer 50e80e18e8 sync
curl test update using a generic named xml.
2013-01-22 14:12:51 +00:00
Noud de Brouwer 8526459173 Merge branch 'develop' of ssh://misp.ncirc.nato.int/home/git/cydefsig into develop 2013-01-22 10:06:31 +00:00
Noud de Brouwer 94bf4e8025 sql blacklist
somehow all _working_ code for blacklist got committed and pushed
but not the sql db change, find this here-in.
2013-01-22 09:45:02 +00:00
Andras Iklody 3e0bc0a4fd Small change to batch searches
An empty new line caused every attribute to be displayed. Fixed.
2013-01-18 11:31:06 +01:00
Andras Iklody f544ac2e08 Batch search for attributes
Implementation of request to be able to do batch attribute searches
2013-01-17 16:03:04 +01:00
Noud de Brouwer 4c4a2bcb89 error
behavior error or just plain wrong on our side.
2013-01-16 15:31:52 +00:00
Noud de Brouwer 755f19c560 error
behavior error or just plain wrong on our side.
2013-01-16 15:27:15 +00:00
Noud de Brouwer 4073bd9b65 error
behavior error or just plain wrong on our side.
2013-01-16 14:11:02 +00:00
Noud de Brouwer 804a0cf0f6 PHP practice
array-content.
2013-01-14 16:32:09 +00:00
Noud de Brouwer 89845933a4 CakePHP
odity, if i add "tes\ntestt\ntes", blacklist the testt,
i get "tes\ntestt" as content. (other behaviors?)
2013-01-14 16:23:57 +00:00
Noud de Brouwer 6e06f665a8 Blacklist
Blacklist gets activated on Event.info and Attribute.value.
2013-01-10 14:43:37 +00:00
Noud de Brouwer 3dec0d997b Behavior
Use settings, par-example, name a field to Import Blacklist.
2013-01-10 12:37:07 +00:00
Noud de Brouwer 2215f1a579 Blacklist
AdminCrud looking for Blacklist Flash message
and Import Blacklist menu button.
2013-01-09 15:04:48 +00:00
Noud de Brouwer 5fc0656896 Blacklist
A list of stringparts not to be able to enter.
2013-01-09 14:58:52 +00:00
Noud de Brouwer a9a1bc91a1 AdminCrud and coding standard
more AdminCrud and coding standard clean up.
2013-01-04 15:48:46 +00:00
Noud de Brouwer c7a98aa286 AdminCrud
use of the AdminCrud component.
2013-01-04 14:49:52 +00:00
Noud de Brouwer a982839958 app syntax
Controller/Component to share AdminCrud.
2013-01-04 13:14:47 +00:00
Noud de Brouwer 120f907427 git
redo 'git-trigger' change.
2013-01-04 13:13:06 +00:00
Noud de Brouwer 4f9a2a5dd9 git
pardon i seem to have had a:
Error: messages not turned on: /dev/ttyp3: Operation not permitted
2013-01-02 15:32:47 +00:00
Noud de Brouwer e14d8d758d unused & coding standard
Removed some total unused code and corrected some toward the CakePHP coding standard.
2013-01-02 14:49:49 +00:00
Noud de Brouwer 4737fdaaf9 Signature Blacklist
removed unused view.
2012-12-20 18:57:36 +00:00
Noud de Brouwer ca290b0357 Import Regexp
removed unused code.
2012-12-20 18:56:04 +00:00
Noud de Brouwer 1e518f8bc0 Import Regexp
Renamed Import Whitelist to Import Regexp.
2012-12-20 18:47:38 +00:00
Andras Iklody 0f751eb742 Validation field
A field in the event index showing it clearly whether the event has been
published or not - shows a small image (placeholder atm)
2012-12-20 16:56:56 +01:00
Andras Iklody 879154eab2 Fixed deprecated errors
Removed cause of deprecated errors (Pass by reference)
2012-12-20 14:48:23 +01:00
Noud de Brouwer a17eaa69ad log & code duplication
$this->Html->image($nonExistingImage)
showed up in tmp/logs/error.log and
the origin this is in 2 Views, so a View Element was created.
2012-12-20 10:33:54 +00:00
Noud de Brouwer e077993f44 doc & build
move technical_design into app/build/.
2012-12-19 20:11:14 +00:00