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
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
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
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
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
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
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
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
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
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
2f0f9f5812
Merge branch 'hotfix-2.3.136'
2015-10-09 16:25:28 +02:00
Iglocska
a2f87faf1f
Version bump
2015-10-09 16:25:09 +02:00
Iglocska
00b74b43de
Fixed a possible issue with the previous commit on certain php versions
2015-10-09 16:24:36 +02:00
Iglocska
6a05c918f9
Merge branch 'hotfix-2.3.136'
2015-10-09 16:04:35 +02:00
Iglocska
dc638adac2
Upgrade to CakePHP 2.7, fixes #684
...
- cakephp submodule updated to 2.7
- make sure that you update your instance!
- not updating will not break compatibility
2015-10-09 15:59:25 +02:00
Iglocska
c198deee66
Merge branch 'hotfix-2.3.135'
2015-10-09 10:07:27 +02:00
Iglocska
3459661dc8
Left off view file
2015-10-09 10:07:12 +02:00
Iglocska
d25f37a8b5
Merge branch 'hotfix-2.3.135'
2015-10-08 10:03:44 +02:00
Iglocska
af767bcdee
version bump
2015-10-08 10:03:31 +02:00
Iglocska
f9d69393e8
Fix to an issue with the calendar and added view to help with gitbook page generation
...
- datepicker seems to bug out as of recently
- misplaced popup that overlaps with the top bar
- fixed by updating to a newer version of datepicker
- added a new view that generates a markdown version of the categories and types view, for easier gitbook generation
2015-10-08 10:00:42 +02:00
Iglocska
364cdd3a27
Merge branch 'hotfix-2.3.134' into develop
2015-09-24 11:27:33 +02:00
Iglocska
24ff042749
Merge branch 'hotfix-2.3.134'
2015-09-24 11:27:00 +02:00
Iglocska
5f1196eba5
Fix to an issue that blocked event blacklist entries from being added manually, fixes #676
2015-09-24 11:26:23 +02:00
Iglocska
065e6e6680
Merge branch 'hotfix-2.3.133' into develop
2015-09-24 10:38:11 +02:00
Iglocska
88fcf39194
Merge branch 'hotfix-2.3.133'
2015-09-24 10:37:51 +02:00
Iglocska
4a75b1d2b5
Fixed an issue where the recorrelation of all events would run into memory issues
...
- before the recorrelation admin tool would load all attributes into memory in one go
- now it loads them in chunks of 1k attributes at a time
2015-09-24 10:36:02 +02:00
Iglocska
a08fc06835
Merge branch 'hotfix-2.3.132' into develop
2015-09-23 12:32:30 +02:00
Iglocska
043fd84161
Merge branch 'hotfix-2.3.132'
2015-09-23 12:32:22 +02:00
Iglocska
a55e38ffda
Fix to the previous commit
2015-09-23 12:32:00 +02:00
Iglocska
b998394943
Merge branch 'hotfix-2.3.132'
2015-09-23 12:16:13 +02:00
Iglocska
6ef7772e0b
Fixed an issue with old upgraded instances that didn't use the db session handler
...
- diagnostic tool would throw exceptions because the db session tables are still missing in some older instances
- if a different session handler is used, the test is skipped
2015-09-23 12:14:32 +02:00
Iglocska
4a16fb3941
Changed behaviour where REST delete returns the index on success, fixes #673
...
- REST delete of events lacked an API specific response
- simply redirected to the index
- it now returns eitehr "Event deleted" or "Event was not deleted" depending on the outcome
2015-09-22 19:41:24 +02:00
Raphaël Vinot
0d032a618e
Merge pull request #673 from Rafiot/travis
...
Add some submodules to the travis run
2015-09-22 17:47:39 +02:00
Raphaël Vinot
b2876c6959
Update default version for cakephp, make sure PyMISP follows master
2015-09-22 17:36:41 +02:00
Raphaël Vinot
84b414e284
add codecov
2015-09-22 17:18:17 +02:00