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

2840 Commits (cd886b4a7977edc4d345d845f77c0eee0f7cb27b)

Author SHA1 Message Date
iglocska da8b2604ba Fixes to some validations issues using cakephp 2.7 2015-10-18 20:51:37 +02:00
iglocska ff4ea7fa1f Fix to the pubsub tool 2015-10-18 20:21:26 +02:00
iglocska 867dbbc7a3 Small fix thta resolves the inability to delete orgs 2015-10-18 19:51:11 +02:00
iglocska 37faddff62 Further progress 
- rework of the push mechanism
- rework of the object capture on add
- rework of the sync filter UI
 2015-10-18 18:03:48 +02:00
iglocska fdcac8b72c Further work on the filter UI 2015-10-18 09:36:55 +02:00
Iglocska 94963852e2 Fixed an issue with ajax forms 2015-10-17 01:06:58 +02:00
Iglocska 044996bdb5 New feature: Proposal to delete attribute, fixes #315 
- Users can now propose a deletion to an attribute
  - also tied into the mass accept mechanism
  - new UI elements to go along with this

- Code refactoring for category list retrievals
  - Until now, several methods got the list of categories from the validation code
  - Was awkward with a fake empty element that had to be removed
  - altered the validation code to read the categoryDefinitions array instead
 2015-10-16 23:49:04 +02:00
Iglocska 6fc3dbbc1f Fixed a faulty replace that causes an infinite loop during the uuid generation 2015-10-16 17:03:07 +02:00
Iglocska 8abe186661 Merge branch 'hotfix-2.3.143' into develop 2015-10-15 17:45:17 +02:00
Iglocska 1aedfebf33 Merge branch 'hotfix-2.3.143' 2015-10-15 17:45:03 +02:00
Iglocska 4a358c9fee Removed junk 2015-10-15 17:44:33 +02:00
Iglocska d3ef52d54c Merge branch 'hotfix-2.3.143' into develop 2015-10-15 17:41:07 +02:00
Iglocska 136daa1be1 Merge branch 'hotfix-2.3.143' 2015-10-15 17:40:53 +02:00
Iglocska 7fab2ce2be Added the attribute relations to the XML / JSON output, fixes #687 2015-10-15 17:39:17 +02:00
Iglocska 38d8bd0a77 Moved remaining UUID generation calls to the new uuid wrapper 2015-10-15 15:01:51 +02:00
Iglocska 1b291904d4 Fixed some more invalid org checks 2015-10-15 14:31:07 +02:00
Iglocska 025087bf5d Fixes to the first time initialisation script 2015-10-15 11:35:44 +02:00
Iglocska eeb1d8d117 Fixes to bugs with org usage from 2.3 2015-10-15 11:11:05 +02:00
Alexandre Dulaunoy d2e8cb8acb Copyright notices as a list. 2015-10-14 15:50:25 +02:00
Alexandre Dulaunoy eabd5c622a Update following recommendation #686 2015-10-14 15:45:17 +02:00
Alexandre Dulaunoy 1c3f98502f Merge branch 'master' of github.com:MISP/MISP 2015-10-14 15:39:09 +02:00
Alexandre Dulaunoy 56854c0a06 Updates following recommendation #686 2015-10-14 15:36:46 +02:00
Iglocska 9ed9052401 Merge branch 'hotfix-2.3.142' into develop 2015-10-14 15:10:32 +02:00
Iglocska abd9fbbd00 Merge branch 'master' of https://github.com/MISP/MISP 2015-10-14 15:09:49 +02:00
Iglocska 3a7b2dd120 Merge branch 'hotfix-2.3.142' 2015-10-14 15:08:58 +02:00
Iglocska 3dc83778c2 Fixed the current user check while removing dead workers, fixes #685 
- as pointed out by RichieB2B
 2015-10-14 15:07:29 +02:00
Iglocska 5007388c1d removed debug 2015-10-14 03:47:20 +02:00
Iglocska 888042dbd6 Added the first version of the correlation graphing 
Conflicts:
	VERSION.json
 2015-10-14 03:45:34 +02:00
Alexandre Dulaunoy 737578a112 Merge branch 'master' of github.com:MISP/MISP 2015-10-13 15:49:39 +02:00
Alexandre Dulaunoy abd9fc18d6 Licensed updated to AGPL 3.0 - #686 2015-10-13 15:48:59 +02:00
Iglocska 8c24e77912 Merge branch 'hotfix-2.3.141' into develop 2015-10-13 10:52:47 +02:00
Iglocska dbea871d5e Merge branch 'hotfix-2.3.141' 2015-10-13 10:52:11 +02:00
Iglocska c9bf8105e6 Replaced get_current_user for the process owner identification, fixes #685 
- As RichieB2B noted, get_current_user() gets the owner of the script in CentOS / RHEL not the user executing the script (as in Ubuntu)

- Current solution uses posix_getpwuid and posix_geteuid if the php-posix package is installed
- if not, it uses whoami
 2015-10-13 10:49:55 +02:00
Iglocska 79ff93a3a2 Merge branch 'hotfix-2.3.140' into develop 2015-10-12 16:52:02 +02:00
Iglocska ab6ae4be67 Merge branch 'master' of https://github.com/MISP/MISP 2015-10-12 16:50:50 +02:00
Iglocska 15a12985f7 Merge branch 'hotfix-2.3.140' 2015-10-12 16:50:13 +02:00
Iglocska f9f9eed6fd Issue fixed with open_basedir preventing the worker diagnostics from working, fixes #685 
- for some users the workers appeared to be dead even though the worker processes were functional and started by the correct user
- this was due to access to /proc being blocked by open_basedir directive settings
- added a check and the corresponding view changes to this being the case
 2015-10-12 16:48:43 +02:00
Alexandre Dulaunoy b802af0e34 Documentation location updated (misp-book) 2015-10-12 16:26:41 +02:00
Iglocska 328c666e3a Merge branch 'master' into feature/sg 
Merging all the new changes from master

Conflicts:
	VERSION.json
	app/Console/Command/AdminShell.php
	app/Controller/AttributesController.php
	app/Controller/EventsController.php
	app/Model/Attribute.php
	app/Model/Event.php
	app/Model/Log.php
	app/Model/Server.php
	app/Model/User.php
	app/View/Elements/side_menu.ctp
	app/View/Pages/administration.ctp
	app/View/Users/admin_index.ctp
 2015-10-12 09:41:20 +02:00
Iglocska e515516b5f Merge branch 'hotfix-2.3.139' into develop 2015-10-09 20:52:18 +02:00
Iglocska 08b14aeaaf Merge branch 'hotfix-2.3.139' 2015-10-09 20:51:33 +02:00
Iglocska 24eae46640 Fix to a previous invalid check on the cakephp version 2015-10-09 20:51:12 +02:00
Iglocska 08c87b7a39 Merge branch 'hotfix-2.3.138' into develop 2015-10-09 17:11:53 +02:00
Iglocska 832c6403aa Merge branch 'hotfix-2.3.138' 2015-10-09 17:11:39 +02:00
Iglocska f018c60c01 Fixed the worker diagnostics showing incorrect data under Red Hat / CentOS, fixes #685 
- Under these distros, php is blocked from seeing concurrently running php processes even under the same user
- instead of running ps, the diagnostic now checks the existance of the pid file in /proc/
 2015-10-09 17:09:33 +02:00
Iglocska 64d2c91a6d Merge branch 'hotfix-2.3.136' into develop 2015-10-09 16:39:25 +02:00
Iglocska 5d5305803d Merge branch 'hotfix-2.3.136' 2015-10-09 16:39:10 +02:00
Iglocska 9223240efd Further fixes that caused issues with old PHP versions 2015-10-09 16:38:48 +02:00
Iglocska 48d44ecce0 Merge branch 'hotfix-2.3.136' into develop 2015-10-09 16:26:00 +02:00
Iglocska 2f0f9f5812 Merge branch 'hotfix-2.3.136' 2015-10-09 16:25:28 +02:00