Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sync fork #1

Merged
merged 2,660 commits into from Oct 3, 2018
Merged

sync fork #1

merged 2,660 commits into from Oct 3, 2018

Conversation

0xmilkmix
Copy link
Owner

Generic requirements in order to contribute to MISP:

  • One Pull Request per fix/feature/change/...
  • Keep the amount of commits per PR as small as possible: if for any reason, you need to fix your commit after the pull request, please squash the changes in one single commit (or tell us why not)
  • Always make sure it is mergeable in the default branch (as of today 2016-06-03: branch 2.4)
  • Please make sure Travis CI works on this request, or update the test cases if needed
  • Any major changes adding a functionality should be disabled by default in the config

What does it do?

If it fixes an existing issue, please use github syntax: #<IssueID>

Questions

  • Does it require a DB change?
  • Are you using it in production?
  • Does it require a change in the API (PyMISP for example)?

Release Type:

  • Major
  • Minor
  • Patch

iglocska and others added 30 commits September 3, 2018 17:56
…queries causing double "/"s after the baseurl
fix: create temp folder if it doesn't exist in EventsController::expo…
 chg: [doc] Fixed permissions for logrotate
attribute can be None which causes the STIX conversion to crash
…le APIs for the REST client

- also, added API descriptions for the restsearch functionalities
lhirlimann and others added 29 commits September 28, 2018 17:39
Unify url for modules, make them usable behind proxies
- cache several objects that were loaded over and over before on bulk exports
- includeGranularCorrelations internal flag added to include/exclude correlations from the export for certain types
- some cleanup
Trim spaces from source_id in merge form
Only display "Show 2 more" and up
fix: Customauth Headers are case-sentitive, do not strtoupper
@0xmilkmix 0xmilkmix merged commit 7623709 into 0xmilkmix:2.4 Oct 3, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet