MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity
1,457 Commits
35 Branches
365 Tags
189 MiB
Commit Graph

1457 Commits (ae23b288e567a11f7dad031c9fbf67e468804302)

Author SHA1 Message Date
iglocska ae23b288e5 Further work on the background jobs 
- started work on scheduling
- view to add scheduled tasks (still needs work)
- moved cache job bulk-code to the job model from the controller
- bootstrap timepicker
 2014-01-02 15:51:41 +01:00
iglocska 0e744871bd Further work on the scheduled tasks 
- Also some changes left off from the previous commit
 2013-12-17 11:38:06 +01:00
iglocska bc42fb99a8 Preparing for the scheduled tasks 
- incorporated cidr from develop
- some other improvements to the background jobs
 2013-12-17 10:15:04 +01:00
iglocska f0944ab9b0 Proposal changes Fixes #192 
- Contextual comments for proposals
- shows proposal count in the top bar
- new view showing all of the events of the user's organisation with an active proposal
 2013-12-12 16:25:20 +01:00
iglocska 98304855b4 Further work on the background jobs 
- contact reporter now moved to the model
- backround job not implemented for it yet
 2013-12-04 16:52:35 +01:00
iglocska 50f3fa40d0 Merge branch 'develop' into feature/CakeResque 
Also, more work on the background jobs
- started work on publishing
- started making the background jobs an optional setting in bootstrap

Conflicts:
	app/Controller/AppController.php
	app/Controller/EventsController.php
 2013-12-04 11:58:01 +01:00
iglocska 48383fe25b Next version of exports done 2013-11-19 11:03:30 +01:00
Alexandru Ciobanu 5f155f47cc Fixed validation on Event::_add() 
Try atomic save for events
Add threat level to JSON sample
 2013-11-18 16:36:18 +01:00
iglocska 6015a6f201 Further work on the exports 2013-11-18 11:35:02 +01:00
Alexandru Ciobanu f36cc43955 replace Risk with ThreatLevel [skip ci] 
- Event.risk has been replaced by Event.threat_level_id.
      all functionality remains the same and users should not see
      any difference.
      ENUM() used for Event.risk is vendor specific and requires
      too many hacks to play nicely with bake.
    - Added default schema file, SQL dumps should be avoided since
      they make updating/upgrading a pain.
    - Removed old unused schemas
 2013-11-17 17:54:15 +01:00
iglocska d54793ffe6 Most of the export caching done 
- also a fair bit of refactoring of the code, fatter models, thinner controllers, component moved to Lib
 2013-11-15 15:39:34 +01:00
Alexandru Ciobanu 233a30b9fd Basic JSON API CRUD [ci skip] 
- adds JSON example to shell scripts
    - adds sample JSON event
    - ??? for some redundant Attribute model conditions
    - updates travis with CakePHP installation
 2013-11-14 12:43:31 +01:00
Alexandru Ciobanu 67eb138800 Display footer notice of missing PGP/GPG key 2013-11-13 17:22:24 +01:00
Alexandru Ciobanu 6e3363825f PHP 5.4 E_STRICT fix 2013-11-12 16:46:17 +01:00
Alexandru Ciobanu fca87bf491 Initial JSON REST 
Some small travins changes too.
FYI there's an automated travis build available at
https://travis-ci.org/MISP/MISP
We don't have unit testing and travis setup is subpar so everything will fail
for now.
 2013-11-12 16:23:37 +01:00
iglocska 38e95a32e8 Merge branch 'hotfix-2.1.31' into develop 2013-11-12 15:15:53 +01:00
iglocska 7f6c8425ae Fix to users with auth key access not being able to reset their authkey 2013-11-12 15:11:59 +01:00
Alexandru Ciobanu 221e35827f First kick at Travis 2013-11-11 23:18:13 +01:00
iglocska fcc7a66a55 More work on the background jobs 
- Started work on the exports
 2013-11-07 15:58:29 +01:00
iglocska 5ee9cb7f08 Removed debugkit 2013-11-06 11:08:56 +01:00
iglocska 1c3425fc91 Merge branch 'develop' into feature/CakeResque 
- develop and the first CakeResque implementation merged

Conflicts:
	app/View/Layouts/default.ctp
 2013-11-06 11:02:23 +01:00
iglocska 0f80145c6d :q 2013-11-06 10:52:18 +01:00
iglocska df40448be0 post merge changes 
- some changes to remove strict messages caused by an update to cakephp

- added missing changes to the sql files - all changes from the merge are reflected in ROLECHANGE.sql, import that to upgrade your instance!
 2013-11-06 10:35:51 +01:00
iglocska be723fc821 Merge branch 'feature/discussion' into develop 2013-11-06 10:13:47 +01:00
iglocska 2dd6338ac4 Merge branch 'hotfix-2.1.30' into develop 2013-11-06 10:06:19 +01:00
iglocska 8c1d42d1c1 Merge branch 'hotfix-2.1.30' 2013-11-06 10:04:13 +01:00
iglocska 327b336c0c Fix to an issue that prevented attachments being uploaded with invalid category choices when the malware checkbox was ticked 
- re-introduced the removed check for valid category / type combinations based on the checkbox and the chosen category
 2013-11-06 10:02:39 +01:00
iglocska 54a7b66a4b Merge branch 'hotfix-2.1.29' into develop 2013-11-05 13:52:41 +01:00
iglocska acdf9f1b6c Merge branch 'hotfix-2.1.29' 2013-11-05 13:51:18 +01:00
iglocska 2a28591bf7 Loosened the filename validation on attachments 
- filenames without extensions were blocked for example
 2013-11-05 13:48:39 +01:00
iglocska 8a53831b2d Update to the discussions 
- Moved the menues out of the views to the common menu element
 2013-11-04 11:31:15 +01:00
iglocska 08cb33b2bd Some minor changes 
- Contextual comments added to all imports (GFI, ThreatConnect, OpenIOC)

- Some minor fixes to OpenIOC exports and linebreaks in attributes
 2013-11-04 10:11:58 +01:00
iglocska 7979f308e8 Merge branch 'hotfix-2.1.28' into develop 2013-10-31 14:47:38 +01:00
iglocska c95f8ea283 Merge branch 'hotfix-2.1.28' 2013-10-31 14:47:20 +01:00
iglocska 9475216ee0 Linebreaks shown in list attributes 2013-10-31 14:46:55 +01:00
iglocska b538668ee8 Merge branch 'hotfix-2.1.28' into develop 2013-10-31 14:39:49 +01:00
iglocska 34350ccb54 Merge branch 'master' of https://github.com/MISP/MISP 2013-10-31 14:38:55 +01:00
iglocska 53d5b36873 Merge branch 'hotfix-2.1.28' 2013-10-31 14:34:28 +01:00
iglocska dfeee892d6 Line breaks not shown in attribute values 2013-10-31 14:33:57 +01:00
iglocska d7b4c28552 Contextual comments 
- Attributes now have a comment field
 2013-10-30 16:00:46 +01:00
iglocska 088842ad18 Renamed the .sql file used to upgrade 2013-10-30 10:08:42 +01:00
iglocska bbbc17a95b Merge remote-tracking branch 'origin/feature/XML_and_UI' into feature/discussion 
- Also some improvements to the shadow attributes

- some minor UI changes

Conflicts:
	app/Controller/EventsController.php
	app/View/Elements/global_menu.ctp
	app/View/Layouts/default.ctp
 2013-10-30 10:06:12 +01:00
iglocska b2b76779b9 More changes to the discussion boards 
- quote / event tags

- anonymised e-mail addresses
 2013-10-29 13:45:53 +01:00
Christophe Vandeplas e4ef269308 Merge branch 'hotfix/docu' into develop 2013-10-29 11:36:46 +01:00
Christophe Vandeplas 78167dc272 Merge branch 'hotfix/docu' 2013-10-29 11:36:46 +01:00
Christophe Vandeplas b8fa651aad quickstart in docu 2013-10-29 11:36:00 +01:00
iglocska 0591db2a67 Small changes after merging the two feature branches 
- Update to the representation of the new permission flags

- some small issues with the merge resolved
 2013-10-25 11:31:35 +02:00
iglocska 226db074e6 files left off added 2013-10-25 10:42:11 +02:00
iglocska 2b11a78e22 Merge branch 'feature/roleChanges' into feature/XML_and_UI 
Conflicts:
	app/Controller/UsersController.php
	app/View/Regexp/admin_add.ctp
	app/View/Regexp/admin_edit.ctp
	app/View/Regexp/admin_index.ctp
	app/View/Roles/admin_add.ctp
	app/View/Servers/add.ctp
	app/View/Servers/edit.ctp
	app/View/Servers/index.ctp
	app/View/Servers/pull.ctp
	app/View/Servers/push.ctp
 2013-10-25 10:39:18 +02:00
iglocska 0a97f5724a Few more changes 
- some views didn't have the menu element yet
 2013-10-25 10:15:26 +02:00