Noud de Brouwer
afd7977929
coding standards
...
Coding Standards.
2012-12-19 02:33:09 +00:00
Noud de Brouwer
9ca03f1f37
coding standards
...
Coding Standards.
2012-12-19 01:48:53 +00:00
Noud de Brouwer
31207a5696
coding standards
...
Coding Standards typo.
2012-12-18 20:45:57 +00:00
Noud de Brouwer
5b806d36f7
coding standards
...
Coding Standards.
2012-12-18 19:55:50 +00:00
Noud de Brouwer
0e668e6b90
coding standards
...
Coding Standards.
2012-12-18 19:51:42 +00:00
Noud de Brouwer
2643da164c
coding standards
...
Coding Standards.
2012-12-18 19:36:34 +00:00
Noud de Brouwer
4f629ecc8d
coding standards
...
Coding Standards work file.
2012-12-18 19:26:58 +00:00
Noud de Brouwer
ea9aa8eb3a
coding standards
...
Coding Standards.
2012-12-18 19:25:12 +00:00
Noud de Brouwer
d89ab91dee
coding standards
...
Coding Standards.
2012-12-18 16:44:07 +00:00
Noud de Brouwer
df74ac1cc8
PHP
...
lcfirst (PHP 5 >= 5.3.0).
2012-12-18 08:38:29 +00:00
Noud de Brouwer
fea8450388
generateAllFor<FieldName>
...
missed adding app/Lib/CamelCase.php and app/Config/routes.php.
2012-12-18 08:03:01 +00:00
Noud de Brouwer
8ca550cbe1
event.analysis
...
set analysis* in view().
2012-12-18 03:59:45 +00:00
Noud de Brouwer
b5205163fd
paging
...
6 (used during test) -> 60 again.
2012-12-18 03:54:31 +00:00
Noud de Brouwer
8864ee78f7
generateAllFor<FieldName>
...
so we can use an URL like:
http://localhost/ <TableName>/generateAllFor<FieldName>/newValue/oldValue
for example:
http://localhost/events/generateAllForAnalysis/0/null
http://localhost/users/generateAllForInvitedBy/1/0
http://localhost/users/generateAllForRoleId/1/0
2012-12-18 03:50:52 +00:00
Noud de Brouwer
68617350e8
Sanitize
...
Sanitize::clean() but redo the info and value fields.
2012-12-18 03:18:48 +00:00
Noud de Brouwer
9211e4d405
search
...
After added feedback on entered search terms for search attributes
and search logs, this now also works for LogsController::index()
and next and previous page.
Signed-off-by: Noud de Brouwer <noud4@home.nl>
2012-12-18 03:01:02 +00:00
Noud de Brouwer
d5bcee63af
Merge branch 'develop' of ssh://misp.ncirc.nato.int/home/git/cydefsig into develop
2012-12-17 17:35:01 +00:00
Noud de Brouwer
8c7f8921a7
Sanitize
...
do not Sanitize::clean() $this->request->data.
2012-12-17 17:33:21 +00:00
Andras Iklody
38506ecaf8
Added missing 4th option to analysis levels
2012-12-17 17:52:30 +01:00
Andras Iklody
716559d5e3
added a missing view for password changes
2012-12-17 17:37:37 +01:00
Andras Iklody
7def9f6afc
Fixed an issue with the events
2012-12-17 17:31:10 +01:00
Andras Iklody
099e5d92be
Fix for the Attributes
2012-12-17 17:21:57 +01:00
Noud de Brouwer
46ab0d2e58
sanitize
...
small correction on a "\n" in info.
2012-12-17 15:51:14 +00:00
Andras Iklody
b6807708ee
2 SQL files missing
...
- added them now
2012-12-17 16:03:10 +01:00
Andras Iklody
1ceadab700
Added features from branch analysis_levels
...
-Analaysis levels setable for events as per milestone item 94
-Password change forced as per milestone item 109
-Added feedback on entered search terms for search attributes
-fixed the authentication issue
-some minor fixes
2012-12-17 15:51:30 +01:00
noud
9e9f34cb58
Merge branch 'master' into develop
2012-12-13 16:26:29 +01:00
noud
5ae254792c
oeps
...
leftover debug() removed.
2012-12-13 16:25:53 +01:00
noud
2903493205
Merge branch 'master' into develop
...
Conflicts:
app/Controller/AttributesController.php
app/Controller/EventsController.php
2012-12-13 16:03:35 +01:00
noud
276cb5df10
RESTfull sync
...
this is in responce to the email
From: <User1088@QET.BE>
To: <ndebrouwer@hotmail.com>, <andrzej.dereszowski@ncirc.nato.int>
Subject: Re: sync/REST
Date: Fri, 7 Dec 2012 13:30:10 +0000
in this there is a complaint about the RESTfull sync workings.
the email hints about 2 possible options:
i) RESTfull add event without attributes (conform the web interface)
ii) RESTfull add event with attributes (more conform the code)
both are implemented and can be choisen in bootstrap.php by
Configure::write('CyDefSIG.rest', 'ii') or 'i'.
2012-12-13 15:52:00 +01:00
noud
094719fa01
Merge branch 'master' into develop
...
Conflicts:
app/Controller/AttributesController.php
app/Controller/EventsController.php
app/Controller/ServersController.php
app/Model/Event.php
2012-12-12 18:01:39 +01:00
noud
dad39083cf
CakePHP
...
CakePHP update from 2.2.3 to 2.2.4
2012-12-12 16:51:02 +01:00
noud
b4711463f8
JQuery
...
bump JQuery from 1.8.2(.min) to 1.8.3(.min).
2012-12-12 16:30:19 +01:00
noud
f8d277cee6
ExtJs
...
reverted, cause no need.
was:
does not show on production.
this is the ExtJs not being there?
or php (>5.2.8) not build without --disable-json.
2012-12-12 16:23:28 +01:00
noud
1dbb03a181
Role
...
renamed everything group to role (i.s.o. renaming just the visable).
2012-12-12 16:19:49 +01:00
noud
26c8ad57ee
Role
...
renamed everything group to role (i.s.o. renaming just the visable).
2012-12-12 16:15:01 +01:00
noud
52a7625a9d
Source Code Review
...
sanitize everything displayed from the db.
(and some small coding standard whitespaces)
2012-12-12 14:01:00 +01:00
noud
26518fd813
Roles
...
only be able to tick actions when manage (& publish) org events.
2012-12-12 10:36:17 +01:00
noud
8119d26d35
RBAC and Roles
...
did add Acl Admin and Audit.
2012-12-11 17:40:57 +01:00
noud
079ce88793
RESTfull sync
...
Let RESTfull only work conform the web pages (to Christophes wish),
so add/edit event apart from add/edit attribute.
(there is annotation in the code to revert back to full RESTfull and
add/edit the attribute(s) alongside add/edit the event.)
2012-12-11 16:11:45 +01:00
noud
6f4b72f214
RESTfull sync
...
redone delete attribute and add that to the sync.
2012-12-11 10:33:32 +01:00
noud
718691a627
RESTfull
...
make RESTfull event add and edit work again.
2012-12-10 13:49:56 +01:00
noud
e4dafd3882
RESTfull sync
...
RESTfull attribute add, edit and view, to be usefull in sync.
2012-12-10 11:32:40 +01:00
noud
75dfba2ae1
sync
...
have sync option in role.
and only display the Sync Actions when sync option or admin.
(still has to be disabled if role is below manage org events.
2012-12-07 15:00:40 +01:00
noud
c2fa68a198
attributes
...
display "#Attr.".
2012-12-07 14:03:28 +01:00
noud
45cbe60aa7
distribution
...
show "All" if distribution is All communities in Events/index.ctp and
Events/view.ctp.
2012-12-07 14:01:41 +01:00
noud
e24ff690bb
RESTfull/sync
...
redid the sync, so if add and exist, send HTTP 302 and different
Location, and do edit there.
Still, the final result has to compare the attributes and if needed
RESTfull delete.
2012-12-07 13:56:19 +01:00
Andras Iklody
c452027340
changes to the related events mouseover bubble
...
Removed unneeded headers and changed the address to relative to avoid the
sending of an OPTIONS REST request.
2012-12-06 16:08:21 +01:00
noud
627e2ba156
db
...
clean up temp db .sql files.
2012-12-06 10:09:08 +01:00
noud
27f724f3eb
db
...
clean up temp db .sql files.
2012-12-06 10:04:35 +01:00
noud
0fb14b410e
db
...
besides regex data in MYSQL.txt for a clean install
have MYSQL.regex.sql for a Cydefsig update.
2012-12-06 08:42:41 +01:00