MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity
506 Commits
35 Branches
366 Tags
190 MiB
Commit Graph

506 Commits (d3cf89660bf922727bbda2ace08f74e92f125ab9)

Author SHA1 Message Date
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
noud 7171b5027e correlation 
if second attribute, create the reverse correlation as well.
 2012-11-14 11:28:42 +01:00
noud 3a84ffb59f terms 
user must accept terms.
 2012-11-14 10:52:53 +01:00
noud b99d568433 correlation 
resolved comment typo.
 2012-11-14 08:29:05 +01:00
noud 3af7e001ff RBAC 
corrected mayModify in Attribute/edit.ctp.
 2012-11-13 14:34:37 +01:00
noud 723ef6c3d1 correlation 
respect distribution Org in correlations.
(for this
add correlations.1_private conform MYSQL.correlaton.sql
and
AppController::generateCorrelation() must be run)
 2012-11-13 14:13:38 +01:00
noud ceeaa05ab5 Merge branch 'develop' of ssh://misp.ncirc.nato.int/home/git/cydefsig.git into develop 2012-11-13 09:50:03 +01:00
Andras Iklody 7543a2aa06 Change to the user manual 
Again a slight change, removed a script that numbered the <h2> headers for the ToC creation. Also fixed a few images.
 2012-11-09 15:32:39 +01:00
noud 3ea6967919 merge 
botched merge..so commit..but empty.
 2012-11-09 15:24:30 +01:00
Andras Iklody 0566304530 Update to the new user guide 
The old script to create an automatic table of contents was accidentally left in in the previous version, it is removed now.
 2012-11-09 15:18:30 +01:00
Andras Iklody 051f11fc0e New user guide 
User guide for cydefsig v2
 2012-11-09 14:34:02 +01:00
noud 8eb56ebc43 RBAC 
AttributesController::edit() know's it's own attribute now for RBAC
check.
 2012-11-09 14:33:54 +01:00
noud 1183437606 correlation 
respect distribution Org only.
 2012-11-09 13:42:15 +01:00
noud dd979f7325 sync 
make pull work on an event with just one attribute.
 2012-11-09 13:01:00 +01:00
noud 911c9a8da6 RBAC 
admin can always publish.
 2012-11-09 11:35:32 +01:00
noud bcf5e58888 RBAC 
slight better left menu if no <ul><li>items.
 2012-11-09 11:28:51 +01:00
noud 94926312d9 RBAC 
better users views.
 2012-11-09 11:09:39 +01:00
noud 7eb2c0f4df RBAC 
servers, but add only when Manage Organization Events.
 2012-11-09 10:41:16 +01:00
noud 4d132d4cd7 RBAC 
do not show New Event if no right.
 2012-11-09 10:26:16 +01:00
noud 55f9b594d7 RBAC 
just edit your own did still give edit org as well.
can be tested if now correct.
 2012-11-09 10:14:40 +01:00
noud 4cc6b8055f RBAC 
now should be okay on the checkGroup.
(mind, we have a PHP 5.3.10 (dev) and 5.2.10 (f.a.) difference.
for CakePHP should be php > 5.2.8, pear > 1.9.0 and phpunit 3.5.0)
 2012-11-08 15:28:21 +01:00