Commit Graph

696 Commits (a005d0491f6e14bf6c649e80d335654c222ac8a5)

Author SHA1 Message Date
mokaddem 67dcaac7fa Merge branch 'develop' of github.com:cerebrate-project/cerebrate into develop 2021-06-29 16:16:52 +02:00
mokaddem 4e74da6163 fix: [controllers] Return data based on the CRUD component response 2021-06-29 16:15:05 +02:00
iglocska c5e6016251
Merge branch 'main' into develop 2021-06-29 13:14:28 +02:00
iglocska 96248bbd00
fix: [individual] fetching failed due to incorrect organisation model call 2021-06-29 13:13:41 +02:00
mokaddem c0514a045f Merge branch 'main' into develop 2021-06-29 12:07:35 +02:00
iglocska 65bd9306ba
Merge branch 'develop' into main 2021-06-29 11:52:07 +02:00
iglocska 54924709a7
Merge branch 'develop' of github.com:cerebrate-project/cerebrate into develop 2021-06-29 11:51:52 +02:00
iglocska bb70a58885
fix: [ACL] fixed checks for multiple values 2021-06-29 11:51:29 +02:00
mokaddem 45d34ee43f fix: [inbox:createEntry] Ignore user alignment with organisation when creating entry 2021-06-29 11:37:49 +02:00
mokaddem 39c848202a chg: [users:index] Allow quick filters 2021-06-29 11:26:06 +02:00
mokaddem 5d1f8bf71a Merge branch 'main' into develop 2021-06-29 10:57:21 +02:00
mokaddem b64d7890ca fix: [migrations:localTools] Make sure the table do not exists before creating it 2021-06-29 10:56:40 +02:00
iglocska 872946315d
Merge branch 'main' into develop 2021-06-29 09:17:26 +02:00
iglocska f0f49ecbc3
fix: [entities] added brood, fixed instance 2021-06-29 09:17:03 +02:00
iglocska 581d9140cd
Merge branch 'main' into develop 2021-06-29 09:14:27 +02:00
iglocska cb235232a2
fix: [instance] added entity file contents 2021-06-29 09:14:03 +02:00
iglocska 998a986f74
Merge branch 'develop' into main 2021-06-29 08:50:57 +02:00
mokaddem dc45df89d8 fix: [helpers:bootstrap] Correctly destructure passed array 2021-06-29 07:31:36 +02:00
iglocska 72b98acd23
Merge branch 'develop' into main 2021-06-28 23:55:49 +02:00
iglocska f22ad57575
fix: [ACL] added all new functionalities 2021-06-28 23:55:24 +02:00
iglocska 0472108cc3
fix: [authkeys] correctly filter the api keys on the user view 2021-06-28 23:43:42 +02:00
iglocska 17a230aee4
Merge branch 'main' into develop 2021-06-28 23:28:13 +02:00
iglocska 0e8a6cbe1c
chg: [view] templates added for new permission role
- also fixed an issue with the signature of the component import in CRUDcomponent
2021-06-28 23:27:21 +02:00
iglocska 611a0b4903
Merge branch 'develop' into main 2021-06-28 22:39:20 +02:00
iglocska baed9b2ee8
Merge branch 'main' of github.com:cerebrate-project/cerebrate into main 2021-06-28 22:39:06 +02:00
mokaddem 45de6f8bf5 fix: [command:importer] Fixed variable typo 2021-06-28 20:45:10 +02:00
mokaddem 96658779e2 chg: [metaFieldsTemplates:enisa-csirt-inventory] Added template 2021-06-28 20:41:36 +02:00
Andras Iklody ab5578d7de
Merge pull request #54 from wagner-certat/doc-upgrade
doc: add upgrade documentation
2021-06-28 16:45:58 +02:00
mokaddem c1e765c909 Merge branch 'fix-id-override' into develop 2021-06-28 15:18:40 +02:00
mokaddem 046c35851d chg: [appModel] Moved getAccessibleFieldForNew function into appModel 2021-06-28 15:04:02 +02:00
mokaddem cf3a8653e1 fix: [app] Prevent some ID overrides 2021-06-28 14:49:38 +02:00
mokaddem 15da5d067b fix: [brood:captureIndividual] Typos preventing calls to correct functions 2021-06-28 14:04:50 +02:00
mokaddem 31d04b8ff4 chg: [individuals:capture] Prevent ID override and usage of _accessible property 2021-06-28 14:04:01 +02:00
mokaddem 524dd10aae chg: [CRUD:add] Always allow UUID field to be set 2021-06-28 14:02:52 +02:00
mokaddem 7add89aa9e fix: [singleView:jsonField] Render only first value 2021-06-28 11:48:39 +02:00
mokaddem 39f44471e4 chg: [ACLComponent] Moved DB migration to administration tab 2021-06-28 11:35:31 +02:00
mokaddem 32c94e544d chg: [inboxProcessors] Typo 2021-06-28 11:30:23 +02:00
mokaddem 7ef67d3459 Merge branch 'inbox-misp-sync' into develop 2021-06-28 11:23:38 +02:00
mokaddem 8f1f56d060 Merge branch 'develop' into inbox-misp-sync 2021-06-28 10:59:28 +02:00
mokaddem 95299430b8 chg: [migrations:roles] Added perm_sync column 2021-06-28 10:50:29 +02:00
iglocska 6e2a541e4f
chg: [wip] local tool interconnector library created 2021-06-28 10:46:19 +02:00
iglocska 7ed72c5469
chg: [wip] local tool interconnector, user browsing/searching added for misp connector 2021-06-28 10:45:23 +02:00
mokaddem b90fbf3974 chg: [localtTools:MISP] Centralized methods to issue requests 2021-06-28 10:18:49 +02:00
mokaddem 63928e756a chg: [brood] Centralized methods to issue requests 2021-06-28 09:36:47 +02:00
mokaddem 1be4978f28 chg: [localTool:MISP] Indentation 2021-06-28 08:54:08 +02:00
mokaddem ab6d4eb8c6 chg: [localTool:MISP] Set a meaningfull default name for the server if none is provided 2021-06-28 08:53:53 +02:00
mokaddem 6b312ba65b fix: [localTool:MISP] Effectively enable user on connection request finalisation 2021-06-28 08:52:39 +02:00
mokaddem 014bfaf70a chg: [localTools:MISP] Include user_id and reflected it
- So that the initiator cerebrate knows which user has to be enabled
2021-06-28 08:50:33 +02:00
mokaddem 3b0c2d2dca chg: [localTolls:broods] Reload correct index instead of redirect 2021-06-28 08:47:20 +02:00
mokaddem bda5eef007 fix: [localTool:commonConnector] Call localtool's finalise connection function 2021-06-28 08:46:07 +02:00