MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity
18,587 Commits
42 Branches
370 Tags
181 MiB
Commit Graph

18587 Commits (9923e30c848d40e03d0b143b101345b5240103c1)

Author SHA1 Message Date
Raphaël Vinot 9923e30c84 chg: [PyMISP] Bump version 2021-03-03 10:41:50 +01:00
Raphaël Vinot 12dec25144 chg: [PyMISP] Fix tests 2021-03-03 10:23:57 +01:00
Jakub Onderka 94bba9baca
Merge pull request #7104 from JakubOnderka/authkeys-allowed-ips 
new: [authkeys] Allowed IPs
 2021-03-03 10:05:16 +01:00
Raphaël Vinot 27eb90f3d5 chg: [PyMISP] Bump before release 2021-03-03 09:46:40 +01:00
Jakub Onderka a646f03aae
Merge pull request #7111 from JakubOnderka/cookie-name 
chg: [internal] Set cookie name just when no name is set
 2021-03-03 09:25:09 +01:00
Jakub Onderka ab84aecc48 new: [authkeys] Copy key info when resetting key 2021-03-03 09:23:07 +01:00
Jakub Onderka 599819f7f9 new: [authkeys] Allowed IPs 2021-03-03 09:23:07 +01:00
Jakub Onderka 8c316b7245
Merge pull request #7060 from JakubOnderka/galaxy-cluster-tag-name-ci 
chg: [schema] Convert GalaxyCluster tag name to case insensitive
 2021-03-03 09:07:05 +01:00
Jakub Onderka 956a45c34b
Merge pull request #7112 from JakubOnderka/galaxy-cluster-md 
new: [UI] Render galaxy cluster description as markdown
 2021-03-03 08:19:54 +01:00
Jakub Onderka e3b2a0a40c chg: [schema] Add index for EventReport.event_id 2021-03-03 08:17:18 +01:00
Jakub Onderka 874ec66c9b chg: [schema] Convert GalaxyCluster tag name to case insensitive 2021-03-03 08:17:16 +01:00
Jakub Onderka cae7bef656
Merge pull request #7127 from JakubOnderka/server-setting-cleanup 
chg: [internal] Cleanup code that is resposible for fetching setting
 2021-03-03 08:10:33 +01:00
Jakub Onderka 26a286f4da
Merge pull request #7117 from JakubOnderka/keyboard-shortcuts 
chg: [UI] Simplify keyboard-shortcuts.js
 2021-03-03 08:09:58 +01:00
Jakub Onderka 4d5c7f7e03
Merge pull request #7116 from JakubOnderka/page-visibility-api 
chg: [UI] Use Page Visibility API
 2021-03-03 08:09:35 +01:00
Jakub Onderka f42c15480a
Merge pull request #7125 from JakubOnderka/fix-undefined-index 
fix: [internal] Undefined index when importing from module
 2021-03-03 08:09:19 +01:00
Jakub Onderka 273c81492a
Merge pull request #7113 from JakubOnderka/optimise-loading-clusters 
chg: [optimise] Faster loading galaxy cluster index
 2021-03-03 08:08:50 +01:00
Alexandre Dulaunoy 2e4ff38377
chg: [misp-objects] updated to the latest version 2021-03-03 07:45:06 +01:00
iglocska 6a83c8d8f5
Merge branch 'develop' into 2.4 2021-03-03 01:39:49 +01:00
iglocska e7f6c10256
Merge branch '2.4' into develop 2021-03-03 01:26:18 +01:00
iglocska 01a67a2b8c
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2021-03-03 01:26:07 +01:00
iglocska 98ecf68541
chg: [version] bump 2021-03-03 01:18:34 +01:00
iglocska 78a48ddc87
new: [server shell] list servers, fixes #7115 
- simple human readable listing
- kept the old weird JSON producing listServers intact
 2021-03-03 00:30:35 +01:00
iglocska 7f9afb84e7
fix: [Sharing groups] capturing a sharing group correctly ignores the incoming data's active flag when editing 
- based on PR #7101 by @lfortemps
 2021-03-03 00:19:46 +01:00
Andras Iklody 2fee084250
Merge pull request #6661 from cudeso/2.4 
Azure Active Directory Authentication
 2021-03-03 00:14:30 +01:00
Andras Iklody 3904f7f85e
Merge pull request #7100 from lfortemps/local-tags-fix 
Prevent pulling local tags
 2021-03-03 00:08:00 +01:00
iglocska bf1621c650
Merge branch 'develop' of github.com:MISP/MISP into develop 2021-03-03 00:07:08 +01:00
iglocska b08befbf26
Merge branch '2.4' into develop 2021-03-03 00:07:02 +01:00
iglocska ef261ecd47
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2021-03-03 00:06:52 +01:00
Andras Iklody 18346e078d
Merge pull request #7059 from adammchugh/patch-1 
Inclusion of full-name under person
 2021-03-03 00:04:54 +01:00
Andras Iklody d519374f7d
Merge pull request #7130 from Wachizungu/fix-shortcut-manager-triangle-popup 
chg: [UI] fix keyboard shortcut manager popup triangle
 2021-03-02 23:59:30 +01:00
Andras Iklody e45949dd0b
Merge pull request #7114 from Wachizungu/add-short-event-block-rule-explanation 
chg: [UI] Add small description of what event block rules do
 2021-03-02 23:53:22 +01:00
Andras Iklody 9cef95f756
Merge pull request #6736 from JakubOnderka/sighting-deletion 
chg: [sighting] Simplified sighting deletion
 2021-03-02 23:50:03 +01:00
Andras Iklody 53642be804
Merge pull request #7080 from StefanKelm/2.4 
Update resolved_misp_format.ctp
 2021-03-02 23:47:59 +01:00
Andras Iklody ef21065e33
Merge pull request #7092 from lfortemps/patch-2 
fix: [email_otp] Trim value for increased UX
 2021-03-02 23:46:23 +01:00
iglocska f83fc6ca24
fix: [sharing groups] fixed regression with updating local sharing groups 2021-03-02 23:42:54 +01:00
Jeroen Pinoy 7431beefa1
chg: [UI] fix keyboard shortcut manager popup triangle 2021-03-02 22:03:05 +00:00
Jakub Onderka c8533ead78 chg: [internal] Cleanup code that is resposible for fetching server setting 2021-03-02 18:04:49 +01:00
Jakub Onderka 62537961f0 fix: [internal] Undefined index when importing from module 2021-03-02 14:44:41 +01:00
iglocska 71e2ac514c
Merge branch 'develop' of github.com:MISP/MISP into develop 2021-03-02 13:04:38 +01:00
iglocska 66e371a19c
fix: [comments] updated for two recent changes in the code 2021-03-02 13:03:54 +01:00
Raphaël Vinot d16172ca61 chg: Bump PyMISP 2021-03-02 12:42:37 +01:00
Jakub Onderka 4bcf270233 chg: [UI] Simplify keyboard-shortcuts.js 2021-03-02 11:36:23 +01:00
Jakub Onderka 55d695bd10 chg: [UI] Use Page Visibility API 2021-03-02 10:04:49 +01:00
iglocska 76a2727583
fix: [sharing groups] Allow users to see events they own, even if their organisation is not explicitly mentioned in the SG 
- however, show a clear message that this is the case
- in-line with the rest of the ACL
 2021-03-02 00:09:37 +01:00
iglocska ca13fee271
fix: [security] sharing group all org flag too lax 
- the all org flag was used as a trigger to make the sharing group obejct itself viewable to all local organisations
- even if the all org flag was set for an instance other than the local one

- as reported by Jeroen Pinoy
 2021-03-01 23:47:01 +01:00
iglocska 11c89e5c0a
fix: [tag index] remove sorting on count fields 
- doesn't work anyway
 2021-03-01 23:41:33 +01:00
iglocska b07d76070c
Merge branch 'develop' of github.com:MISP/MISP into develop 2021-03-01 23:33:55 +01:00
iglocska 7bb9466e9c
Merge branch '2.4' into develop 2021-03-01 23:33:42 +01:00
iglocska 498d6215e3
chg: [genericForm] added description field to the explanation 2021-03-01 23:33:04 +01:00
iglocska 1727a748eb
fix: [pull] invalid internal vs external server lookup when deciding whether to pull local tags 2021-03-01 23:32:25 +01:00