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

2251 Commits (c44bee0e965ab8b04aeec20be9a827f1f7decb72)

Author SHA1 Message Date
Iglocska c44bee0e96 Further progress 
- removed some junk
- more work on the background workers
- rewrote the correlation background job - should work correctly now and be a lot more memory efficient
 2015-04-20 13:50:14 +02:00
Iglocska 93c2194e5f Some fixes to the background workers 
- also added date tracking on jobs
 2015-04-20 13:32:34 +02:00
Iglocska bb5f4a96dd Tags added to the e-mail 2015-04-20 12:12:10 +02:00
Iglocska c24704a6c2 Lots of progress 
- further work on implementing the SG changes everywhere
- reworked the alert e-mails
- reworked a lot of the logging
- several convenience methods
 2015-04-20 11:46:55 +02:00
Iglocska 3dd3765e0d Fixed xml download of search results 
- was using an outdated local xml converter
- it now correctly points to the XML conversion tool
 2015-04-19 10:51:29 +02:00
Iglocska 63fd8a51d9 Several fixes 
- views updated
- menues updated
- fixed attribute search
 2015-04-19 10:44:24 +02:00
iglocska 51ea9c090d Further progress 2015-04-18 07:53:18 +02:00
Iglocska 5340abed2e Sharing groups correctly selectable in attributes 
- still needs work
 2015-04-14 18:11:51 +02:00
Iglocska 1e3db8a8ba Further work on the new version 
- org checks fixed in a lot of places
- fixed the searches to work with the new organisations
 2015-04-14 17:51:38 +02:00
Iglocska b163164450 Further work on the sharing groups 2015-04-13 17:52:04 +02:00
Iglocska 28069a0a0f Further work and some cleanup 
- decision to be revised: exports don't expose Sharing groups / org uuids to users unless they are admin (for the future: at least sync users have to be added for the new sync)
 2015-04-13 16:20:21 +02:00
Iglocska 5f70207051 Progress in moving all exports to the new distribution system 2015-04-13 12:42:26 +02:00
Iglocska e0ef372392 Merge branch 'master' into feature/sg 
Conflicts:
	app/Controller/EventsController.php
	app/Controller/UsersController.php
	app/Model/Event.php
 2015-04-12 10:40:31 +02:00
iglocska 0e7b2448d2 Further work on the sharing groups 
- correlations should work fine now
- users can only see events they should be allowed to see on the event index / event view / event history view
 2015-04-10 15:23:53 +02:00
iglocska 5abd8dfead Further work on the sharing groups: 
- changes to the data model
- correlation engine updated
 2015-04-09 17:27:34 +02:00
Iglocska 356e9ec383 Merge branch 'hotfix-2.3.59' 2015-04-08 22:55:08 +02:00
Iglocska 116bf8e425 Fix to an issue with the caching 
- CSV caching was saving to file on each attribute, creating extremely high amounts of I/O
- reduced it to saving to file / event

- fixed incorrect pathing
 2015-04-08 22:47:28 +02:00
Iglocska 1ff0ade5cb Merge branch 'triple-dots' into hotfix-2.3.59 2015-04-08 22:41:54 +02:00
Iglocska 99fae827a3 Merge branch 'cakeresque-update' into hotfix-2.3.59 2015-04-08 22:40:42 +02:00
Iglocska 35976ac847 Merge branch 'cakephp-update' into hotfix-2.3.59 2015-04-08 22:38:18 +02:00
Iglocska 9f09d6d7e5 Merge branch 'cakeresque-queues' into hotfix-2.3.59 2015-04-08 22:37:30 +02:00
Iglocska 06f8a9bbd6 Merge branch 'proxy' into hotfix-2.3.59 2015-04-08 22:36:13 +02:00
Iglocska 99cabe39b9 Merge branch 'ids_example' into hotfix-2.3.59 2015-04-08 22:35:03 +02:00
Iglocska 75925223f5 Merge branch 'password' into hotfix-2.3.59 2015-04-08 22:33:52 +02:00
Iglocska 7f2ce6c12b Merge branch 'gitignore' into hotfix-2.3.59 2015-04-08 22:31:30 +02:00
Iglocska c2d5a5f1fc Merge branch 'stix_no_random_ids' into hotfix-2.3.59 2015-04-08 22:30:39 +02:00
Iglocska 348923691f Merge branch 'stix-info' into hotfix-2.3.59 2015-04-08 22:29:36 +02:00
Iglocska f21cddfb05 Merge branch 'install-centos' into hotfix-2.3.59 2015-04-08 22:28:59 +02:00
Iglocska 094f932616 Merge branch 'disallow_unpublished_events' into hotfix-2.3.59 2015-04-08 22:22:22 +02:00
Richard van den Berg 09171aa415 Include composer.phar self-update 2015-04-08 14:27:04 +02:00
Richard van den Berg c49c387337 Only truncate string if adding ... will make it shorter 2015-04-08 14:08:38 +02:00
iglocska 9ccf69f35a User edit fixed 
- choose organisation from a list as expected
- fixed refreshauth
 2015-04-08 13:10:52 +02:00
Richard van den Berg eb9adae030 Use cake-resque:4.1.2 
- Remove --no-update for cake-resque
 - Added UPDATE.txt for keeping up2date between major releases
 2015-04-08 13:05:05 +02:00
iglocska fcaccb1784 Update to the roles and user filtering 
- new role permission added for SG editors
- roles reworked, permissions all looked up centrally from the role model instead of code replication across controllers and views
- user filtering now correctly uses organisation objects instead of org strings
 2015-04-07 14:47:14 +02:00
iglocska 1afa15120f Further work on the sharing groups 2015-04-07 00:24:44 +02:00
Iglocska 01b3d1a126 Merge branch 'hotfix-2.3.58' 2015-04-02 00:17:01 +02:00
Iglocska cc5c32fca2 Sync update issue fixed 
- attributes were not correctly updated during a manual push due to an incorrect conditional
- re-publishing was unaffected
 2015-04-02 00:14:36 +02:00
Richard van den Berg 0306912271 Remove gitlink for app/Plugin/CakeResque 
CakeResque is installed with composer.phar

Removing the gitlink gets rid of this annoying error message:
No submodule mapping found in .gitmodules for path 'app/Plugin/CakeResque'
 2015-03-24 10:27:13 +01:00
Richard van den Berg 056b21ff6f Update cakephp to latest 2.6 branch 2015-03-24 10:03:17 +01:00
Richard van den Berg fa112d77c3 Use correct CakeResque queues 2015-03-23 17:58:41 +01:00
iglocska f7f200deb8 Further progress 2015-03-21 14:27:53 +01:00
Richard van den Berg 75f93641dc Use isOK() for version check 2015-03-19 15:09:54 +01:00
Richard van den Berg 850e4bd19f Catch HTTP error codes 2015-03-19 14:05:10 +01:00
Richard van den Berg 2f58fdec0d Catch invalid proxy configuration 2015-03-19 13:33:17 +01:00
Richard van den Berg 106b6cb06b Allow SyncTool with empty $server 2015-03-19 13:03:16 +01:00
Richard van den Berg 05bc4c4389 Allow SyncTool to be used for generic HTTP(S) connections 2015-03-19 12:57:46 +01:00
Richard van den Berg 0e66ff140f Use SyncTool for diagnostics 2015-03-19 12:31:35 +01:00
Richard van den Berg b62032fc7b Fix typo 2015-03-19 12:20:16 +01:00
Richard van den Berg 2ccab722d7 Add proxy section to server diagnostics 2015-03-19 12:15:28 +01:00
Richard van den Berg 0d242d8549 configProxy() checks for empty arguments, no need to do it twice 2015-03-19 10:03:40 +01:00