Iglocska
8310d91a37
Merge branch 'hotfix-2.3.122' into develop
2015-09-02 16:38:38 +02:00
Iglocska
9f8e5049a6
Merge branch 'hotfix-2.3.122'
2015-09-02 16:37:16 +02:00
Iglocska
af0b2ffdce
Version bump
2015-09-02 16:37:02 +02:00
Iglocska
b83e615672
Fixed XSS in the footer
...
- reported by Roberto Suggi Liverani from NCIA
2015-09-02 16:34:43 +02:00
Iglocska
81e2659704
Merge branch 'hotfix-2.3.121' into develop
2015-09-02 10:22:34 +02:00
Iglocska
809ac8f88b
Merge branch 'master' of https://github.com/MISP/MISP
2015-09-02 10:21:46 +02:00
Iglocska
b401f56322
Merge branch 'hotfix-2.3.121'
2015-09-02 10:21:19 +02:00
Iglocska
20de4ba9cc
Version bump
2015-09-02 10:20:49 +02:00
Iglocska
62532260ef
Addition to the previous commit
2015-09-02 10:18:08 +02:00
Iglocska
77adf624d9
Fix to a reflected XSS in the event choice
2015-09-02 09:57:59 +02:00
Alexandre Dulaunoy
28e4798b67
Merge pull request #629 from RichieB2B/ncsc-nl/stix-tags
...
Export MISP tags as STIX journal entries
2015-08-31 14:05:03 +02:00
Richard van den Berg
2eddbb5dcc
Export MISP tags as STIX journal entries
2015-08-31 12:55:42 +02:00
David André
b7f3640e55
Corrected typo in word-wrapping for description in event display
2015-08-30 22:57:53 +02:00
Alexandre Dulaunoy
cbfcd0b883
Merge pull request #626 from MISP/wrap-description
...
Word-wrap for event description
2015-08-28 15:00:17 +02:00
David André
3b75f6e793
Word-wrap for event description
...
Request: https://groups.google.com/forum/#!topic/misp-users/6FbZp0jd8_g
2015-08-28 14:47:01 +02:00
Iglocska
ffef691aa6
Merge branch 'hotfix-2.3.120' into develop
2015-08-27 13:48:57 +02:00
Iglocska
a320e9f34b
Merge branch 'hotfix-2.3.120'
2015-08-27 13:48:45 +02:00
Iglocska
0ded8805c0
Cleanup of some mistakes
2015-08-27 13:47:54 +02:00
Iglocska
d8ff77907c
Merge branch 'hotfix-2.3.118' into develop
2015-08-27 12:39:48 +02:00
Iglocska
21decf0ecf
Merge branch 'hotfix-2.3.118'
2015-08-27 12:39:32 +02:00
Iglocska
01398b3ade
Add / Remove tags from events via a new API
2015-08-27 12:38:50 +02:00
Iglocska
9e83304356
Merge branch 'hotfix-2.3.117' into develop
2015-08-27 09:48:05 +02:00
Iglocska
b1026ea9f3
Merge branch 'master' of https://github.com/MISP/MISP
2015-08-27 09:47:50 +02:00
Iglocska
7c9cd3041f
Merge branch 'hotfix-2.3.117'
2015-08-27 09:47:16 +02:00
Iglocska
597e40fc0f
Collection of fixes
...
- CSV export ignored the tag parameters
- tagging events didn't work as expected in some cases
- timing out and clicking on an admin action results in being redirected to a non-existing admin login page
- distribution setting ignored when uploading attachments
2015-08-27 09:44:58 +02:00
Alexandre Dulaunoy
5fec91bfb6
Merge pull request #618 from nullprobe/patch-1
...
Update MYSQL.sql
2015-08-26 15:07:07 +02:00
nullprobe
305a1dbe70
Update MYSQL.sql
...
Unnecessary comma makes the import fail.
2015-08-26 14:57:06 +02:00
Raphaël Vinot
ed475a8271
Merge pull request #577 from bemre/patch-1
...
Update INSTALL.ubuntu1404.txt
2015-08-26 11:29:14 +02:00
Iglocska
c4d3967fbd
Merge branch 'hotfix-2.3.116' into develop
2015-08-25 11:59:01 +02:00
Iglocska
d94a8d04c7
Merge branch 'hotfix-2.3.116'
2015-08-25 11:57:35 +02:00
Iglocska
bc4bc46fca
Fix to the previous hotfix
...
- indexes were not created if they already existed
- this was an issue if a non unique index was present
- also made the process more verbose and added a generic method that deals with index removal
2015-08-25 11:56:29 +02:00
Iglocska
ac38b3cac7
Merge branch 'hotfix-2.3.115' into develop
2015-08-25 10:36:38 +02:00
Iglocska
087d68e165
Merge branch 'master' of https://github.com/MISP/MISP
2015-08-25 10:36:12 +02:00
Iglocska
8ab674e1df
Merge branch 'hotfix-2.3.115'
2015-08-25 10:35:29 +02:00
Iglocska
556688069a
Resolved an issue that can lead to duplicate events showing up in MISP
...
- UUID uniqueness was previously not enforced
- changed the MYSQL.sql file to reflect the changes
- Added upgrade admin tool to remove duplicate events and make the database changes required
- Tweaked the tool for the attribute uuid fix so that it cannot created duplicate keys
- some minor fixes, such as automatically removing eventTag objects on event deletion
2015-08-25 10:32:26 +02:00
David André
be81eb9583
Removed git pull (x2) since we are already doing checkout
2015-08-25 00:17:19 +02:00
Iglocska
3b33e1ab10
Merge branch 'hotfix-2.3.114' into develop
2015-08-24 13:32:23 +02:00
Iglocska
b7480586ed
Merge branch 'hotfix-2.3.114'
2015-08-24 13:31:09 +02:00
Iglocska
8d24f9a7ff
version bump
2015-08-24 13:30:45 +02:00
Iglocska
64485ad4a6
Fixed a bug with downloadSample that returns all accessible samples instead of the requested one, fixes #610
...
- fixed incorrect branch order causing this issue
2015-08-24 13:29:25 +02:00
Iglocska
2b13ea8078
Merge branch 'hotfix-2.3.113' into develop
2015-08-19 13:23:32 +02:00
Iglocska
6ba92be513
Merge branch 'hotfix-2.3.113'
2015-08-19 13:23:01 +02:00
Iglocska
bd7555b185
Various fixes to the OpenIOC import and the password reset, fixes #600 , fixes #599 , fixes #565
...
- OpenIOC import now correctly sets IDS flags based on type
- OpenIOC import specifies the source file in the comments
- Fixed a blackhole issue with the password reset popups
2015-08-19 13:20:14 +02:00
Iglocska
cd158ea87b
Merge branch 'hotfix-2.3.112' into develop
2015-08-18 19:54:49 +02:00
Iglocska
8a89b33d69
Merge branch 'hotfix-2.3.112'
2015-08-18 19:54:05 +02:00
Iglocska
ebbc7390d1
Added event ID field to restSearch APIs, to assist #456
...
- eventid a new parameter for both event and attribute restsearch
- these APIs now accept arrays in both json and xml format (you can send "eventid": ["15", "16"] instead of "eventid": "15&&16" in addition to the old functionality
2015-08-18 19:51:41 +02:00
Iglocska
9967656195
Merge branch 'hotfix-2.3.111' into develop
2015-08-18 17:22:24 +02:00
Iglocska
3aebe484a1
Merge branch 'hotfix-2.3.111'
2015-08-18 17:19:02 +02:00
Iglocska
ce2e6a769d
Some fixes to the OpenIOC import tool
...
- added support for SHA types
- fixed an issue that caused the import to fail with duplicate attributes (the list gets pruned now)
- fixed an issue where no supplied contextual fields would lead to empty attributes being created
- removed the requirement for the files to have the .ioc extension
2015-08-18 17:16:58 +02:00
Iglocska
3fc4757bd5
Merge branch 'hotfix-2.3.110' into develop
2015-08-18 16:27:07 +02:00