noud
016df03ba7
sync
...
validation on server.authkey having minlenght of 40 like user.authkey.
2012-11-20 17:18:16 +01:00
noud
03578fecdd
code standards
...
html cleanup.
2012-11-20 16:55:55 +01:00
noud
4e93fabbed
html
...
removed some html giving warnings.
2012-11-20 15:17:42 +01:00
noud
5d58c52281
sync
...
corrected pull for events having no distributable attributes.
2012-11-20 14:35:02 +01:00
noud
b00cc0e8b2
sync & code
...
a new NameController() needs $Name->constructClasses().
odd this ever did work before (CakePHP 2.2.2 versus 2.2.3 diff?).
2012-11-20 13:55:53 +01:00
noud
5a35e1a918
sync & merge
...
merged develop with master and have to alter ServersController a little.
2012-11-20 11:14:57 +01:00
noud
957b3e27b8
Merge branch 'master' into develop
...
Conflicts:
app/Controller/ServersController.php
2012-11-20 11:01:18 +01:00
noud
8b3903cde6
sync
...
push from v2 to v1.
2012-11-20 09:54:54 +01:00
noud
faa1e838fd
correlation
...
just for intermediate db-update.
(all MYSQL.*.sql should be removed lateron)
2012-11-20 09:01:05 +01:00
noud
466e7ae2a3
code standards
...
whitespace police.
2012-11-20 08:58:14 +01:00
noud
7c878af986
terms
...
slight better formulated AppController::beforeFilter()
2012-11-20 08:42:32 +01:00
noud
2f53972b99
code standards
...
conform code standards.
2012-11-20 08:37:33 +01:00
noud
f41c42196c
version
...
removed a "-" copied in from a patch file.
2012-11-19 16:14:43 +01:00
noud
7a0068936a
terms
...
slight better formulated AppController::beforeFilter()
2012-11-19 15:40:26 +01:00
noud
b2c268845f
code standards
...
respect code standards.
2012-11-19 14:49:38 +01:00
noud
52c9114694
sync
...
array correction done so no 2 kinda the same tests during pull.
2012-11-19 13:42:41 +01:00
noud
543f7c3570
sync
...
pull goes okay with just one event.
pull with multiple events was already okay.
2012-11-19 13:25:40 +01:00
noud
c8c58fa1b9
PHP
...
CakePHP php minimum_version="5.2.8" but lcfirst was introduced in PHP
5.3, so i reverted to 'strtolower(substr('.
2012-11-19 11:02:59 +01:00
noud
491b225953
users views
...
whole menu in admin_view.
active delete button in edit.
2012-11-19 10:47:36 +01:00
noud
8f70b7ce9e
sync
...
sync attributes on pull.
2012-11-19 09:13:08 +01:00
noud
d3cf89660b
sync
...
conform the new distribution.
pull on events works too.
2012-11-19 09:02:43 +01:00
noud
1cddb6abe0
distribution
...
conform latest, having:
- Your organization only
- This server-only
- This Community-only
- Connected communities
- All communities
Push is tested, pull not yet.
2012-11-16 15:25:57 +01:00
noud
5d37e93eb6
code
...
have the distribution description in one place, just the model.
2012-11-16 11:43:47 +01:00
noud
2a12a5db3e
dns
...
config if there is a name server available and do not use if not there.
2012-11-16 11:22:19 +01:00
noud
7ccc3a8ba6
db
...
db conversion using whitelist, not whitelists.
2012-11-16 11:15:39 +01:00
noud
51145da87a
index
...
some line disapeared, in view as well on attribute level.
Andras Iklody suggested a html non breaking space, that worked.
2012-11-16 10:18:37 +01:00
noud
2d3132ef53
code
...
removed small double code.
2012-11-16 10:11:52 +01:00
noud
247525ccbf
sync (publish)
...
Event publish button in events index and event view does
report push failure(s) if any remote server is down.
2012-11-16 10:09:04 +01:00
noud
fdd999ef35
correlation
...
fixed correlations being double accounted.
2012-11-15 15:53:07 +01:00
noud
c1207184f5
db
...
extra name migratemisp11to2 to run on server.
2012-11-15 15:36:25 +01:00
noud
f5488e653f
db
...
updated the db conversion from master->develop.
2012-11-15 14:59:25 +01:00
noud
4f234d1d46
terms
...
take 2, for a user must accept terms.
2012-11-15 13:50:20 +01:00
noud
f9190907c0
sync
...
admin must be able to delete servers, Andras corrected.
2012-11-15 13:36:39 +01:00
noud
8d2e665ceb
terms
...
reverted just done commit
(Can't use method return value in write context ).
2012-11-15 13:24:34 +01:00
noud
8125c0c938
terms
...
check for user logged in (if not a server looks total stalled).
2012-11-15 13:23:08 +01:00
noud
6cdf440ef6
sync
...
admins must be able to delete a server.
2012-11-15 13:02:56 +01:00
noud
7e01b300b8
logout
...
keep the logout in footer as well (besides the logout in menu).
2012-11-15 11:38:37 +01:00
noud
5bcad4ee99
RBAC
...
use $isAclAdd for New Server.
2012-11-15 11:25:09 +01:00
noud
7a96c66b49
whitelist
...
cleanup whitelist.
2012-11-15 09:31:34 +01:00
noud
e8a7b6e0fe
hostname & port
...
if no baseurl given in bootstrap.php use the server configuration.
2012-11-15 08:36:42 +01:00
Andras Iklody
fd5512375f
Merge branch 'develop' of ssh://172.29.79.164/home/git/cydefsig into develop
2012-11-14 17:28:07 +01:00
Andras Iklody
ff822c8bb6
Cleaning up and changing the user guide
...
- user guide: information about the new number of attributes field in the list of events added
- updated the event showing a list of events
- removed obsolete images
2012-11-14 17:27:38 +01:00
noud
74d4746a4b
code standards
...
slight updated code standards test script.
2012-11-14 17:26:46 +01:00
noud
ea0ab59e4f
code standards
...
corrections toward code standards.
2012-11-14 17:16:36 +01:00
noud
b84bc50c56
index
...
some line disapeared.
Andras Iklody suggested a html non breaking space, that worked.
2012-11-14 16:43:24 +01:00
noud
ff9acf6fde
count
...
result view for AttributesController::checkComposites()
2012-11-14 16:24:57 +01:00
noud
6b06ba7ff6
count & GFI Sandbox
...
count # attributes in events index.
plus various fixes for distribution in correlation of a GFI Sandbox
upload.
2012-11-14 16:14:04 +01:00
noud
ec2b20334f
Merge branch 'develop' of ssh://misp.ncirc.nato.int/home/git/cydefsig.git into develop
2012-11-14 15:15:28 +01:00
noud
c599c2c23e
GFI Sandbox
...
files having size 0 are not md5 summed in CakePHP.
2012-11-14 15:12:19 +01:00
Andras Iklody
5ed034ecea
Small change to the user guide
...
Fixed the table of contents misalignment and added a line about IE9/10 compatibility mode causing issues
2012-11-14 11:48:15 +01:00