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

250 Commits (3ff180e898a42249ab89388b2d085f986dcf894f)

Author SHA1 Message Date
Andrzej Dereszowski 3ff180e898 Merge branch 'develop_0.2.2-0.2.3' into develop 
Conflicts:
	app/Config/Schema/schema_0.2.2.php
	app/Config/routes.php
	app/Controller/AppController.php
	app/Controller/UsersController.php
	app/Model/User.php
	app/README.txt
 2012-07-24 16:09:48 +02:00
git 8ba98a1e57 Rollback of pagination on event view 
Comeback to previous event layout. This does not change the preformance issue so it is not worth to put in stable.
We will move it to the devel branch
 2012-07-24 15:44:04 +02:00
noud de89d28caa Fix, paging on event with lots of attributes. 2012-07-20 13:27:55 +02:00
noud c1ed9c5839 2 new bugs: 
- event with lots of attributes has no paging.
- non-composite attribute and non-printable.
 2012-07-20 08:51:20 +02:00
noud e9234bcee7 Fixed non-printable in no-composite attribute. 2012-07-20 08:48:12 +02:00
noud 25d5ff4290 Show events with user.email if admin. 2012-07-19 14:53:12 +02:00
noud 78f629e6dd Redo Event.user_id 2012-07-19 14:52:27 +02:00
noud c086981676 Search Attributes fixed. 2012-07-19 11:41:04 +02:00
noud 29a67f4d96 Fixes the Search Attributes. 2012-07-19 11:41:04 +02:00
noud 8db00efdac Remove extra dot between filename and ext when downloading attachment. 2012-07-19 11:41:04 +02:00
deresz d879deb027 news: removed some old stuff 
EventsController: contact mail display name from the config file
 2012-07-19 09:48:45 +02:00
Andrzej Dereszowski bf98f2db3c Merge branch 'develop_0.2.2_fixes' into develop 
Conflicts:
	app/Model/Attribute.php
 2012-07-11 16:15:27 +02:00
noud e353c405e1 New bug.. type filename|md5, conform type md5 strtolower. 2012-07-11 14:37:04 +02:00
noud 5c1a8e22fb Fix, do strtolower on types filename|md5 and filename|sha1 conform types 
md5 and sha1.
 2012-07-11 14:35:46 +02:00
deresz ebec1d7f26 Make the documentation "brand-neutral" to be able to develop it in a community. 2012-07-11 11:03:18 +02:00
noud 25d33e3578 New bug, authError gets displayed before login. 2012-07-11 10:20:44 +02:00
noud e67d9ebdec Fix to authError getting displayed before login. 2012-07-11 10:19:57 +02:00
noud 50e24c7c56 Upload always ticked if malware-sample, always unticked if attachment. 2012-07-11 09:48:44 +02:00
noud c1823b1cf4 Corrects the download in IE fix, to filename.ext.zip or filename.ext. 
(Got filename.ext.zip.zip for attachment and filename.ext.ext for
malware given the previous fix)
 2012-07-10 17:23:00 +02:00
noud 3f9e1d650b New bug, Add User and validation error gives extra authkey not defined. 2012-07-10 15:39:08 +02:00
noud a08842e7d4 Fix to New User, some validation error then authkey not defined. 2012-07-10 15:38:10 +02:00
noud c1bc80ac61 Download attachment does not work on MS Internet Explorer. 
This _can_ be a fix, not sure. If not, CakePHP bug #2554 or others.
 2012-07-10 13:36:32 +02:00
noud 1f894119c7 One extra bug (IE download). 2012-07-10 11:42:35 +02:00
noud 8f4727e3ad Correction to upload so zip only ticked when malware and not when 
attachement.
 2012-07-10 11:39:43 +02:00
noud 1a56db0aac Do validation after edit attribute. 2012-07-09 15:13:54 +02:00
noud aaefa228f0 Bug found. 2012-07-09 15:12:58 +02:00
noud 1143ee265d Fix to: Add attribute, non-valid, correct, ´black-holed´. 2012-07-09 14:18:26 +02:00
noud 4ac501d54e Only show categories with type attachment or malware-sample in Add 
Attachement view. (this was..No possibility to upload if type
attachement or malware-sample is not in category.)
 2012-07-09 14:14:55 +02:00
noud e09c2c9160 2 extra bugs found. 2012-07-09 14:09:24 +02:00
noud ed41233f2a No possibility to upload if type attachement or malware-sample is not in 
category.
 2012-07-06 13:48:17 +02:00
noud 6c6086c5c8 List of outstanding and fixed bugs. 2012-07-06 13:45:31 +02:00
deresz 73e87f31e0 Use CyDefSIG.name from Config in alert e-mail subjects. 2012-07-04 17:15:01 +02:00
deresz dbf7fafea8 Correction to "link" attribute type - links were not actually created. 
Also changed it to proper "cake" way.
 2012-07-04 15:51:19 +02:00
noud 63bdfe2961 Edit composite attribute to non-composite attribute fix. 2012-07-04 14:05:18 +02:00
deresz 50e3566f3a Some modifications to category/attribute matrix. MISP database is now compatible for sync with CyDefSIG. 2012-07-04 11:28:40 +02:00
Andrzej Dereszowski 2d8695732d Merge branch 'develop' of code.lab.modiss.be:cydefsig into develop_0.2.2_fixes 2012-07-02 17:11:38 +02:00
Andrzej Dereszowski e2df7442a4 shit 2012-07-02 16:26:50 +02:00
noud 5bac9ac928 Forgot LogableBehavior in the first commit. 2012-07-02 12:52:57 +02:00
Christophe Vandeplas 811428e9f5 forgot debug comment 2012-06-29 13:43:22 +02:00
Christophe Vandeplas 09c4656944 improved NIDS output 2012-06-29 13:41:23 +02:00
noud 8216a563dc Servers.lastpushedid and Servers.lastpulledid. 2012-06-29 10:27:19 +02:00
noud 9c1c32f959 Audit and Access Control granulation in News page. 2012-06-29 09:36:47 +02:00
noud 0eb52796ae Admin Paginator fix. 2012-06-29 08:56:00 +02:00
noud 4a12bf960f Admin Paginator fix. 2012-06-29 08:35:32 +02:00
noud 66c5312ea6 DataBase migrate, Audit and Access Control granulation. 2012-06-28 17:24:12 +02:00
Christophe Vandeplas 500418cb61 fixed silly bug in priority assignment of nids export 2012-06-28 14:58:19 +02:00
root b4558887ce Revert "Audit and ACL first cut." 
This reverts commit 5818231f48.
 2012-06-26 09:40:52 +02:00
noud 5818231f48 Audit and ACL first cut. 2012-06-25 15:54:52 +02:00
noud ce7fee4971 Revert "Audit database table." 
This reverts commit f5bf89e624.
 2012-06-25 15:13:51 +02:00
Christophe Vandeplas 5993e3eec8 fixed nids snort rule conversion because of greedy * and + 2012-06-25 10:18:45 +02:00