iglocska
15d738aa77
fix: [forms] dropdowns overriding values from request
2021-11-26 10:51:58 +01:00
iglocska
312229751b
fix: [keycloak] enrollment org_id issues fixed
2021-11-25 11:55:51 +01:00
iglocska
a8e03aa996
Merge branch 'develop' into main
2021-11-25 00:58:17 +01:00
iglocska
cc5c750de8
chg: [audit log] change field renamed to changed
...
- change is a reserved keyword
- this way quoting of field names is no longer needed in the cakePHP settings
2021-11-25 00:57:31 +01:00
iglocska
a4f6e06e7a
fix: [roles index] correctly allow site admins to modify / remove roles
2021-11-25 00:55:36 +01:00
iglocska
b981b3f942
fix: [conflict] resolved in user_org update script
2021-11-25 00:43:22 +01:00
iglocska
35464623e1
Merge branch 'develop' into main
2021-11-25 00:36:43 +01:00
iglocska
1ee895cedf
Merge branch 'main' into develop
2021-11-25 00:36:25 +01:00
iglocska
033f6d7f97
fix: [typo] organisations != oganisations
2021-11-25 00:02:16 +01:00
iglocska
c2cefb4311
fix: [user init] generation fixed
2021-11-24 23:59:34 +01:00
iglocska
b009191aa6
fix: [migrations] user org further fixes
2021-11-24 23:39:27 +01:00
iglocska
94457d3b97
fix: [migration] userorg migration fixed
2021-11-24 23:36:24 +01:00
iglocska
c7768921fb
fix: [user init] explicit uuid creation removed
...
- added behavior wherever it was missing
2021-11-24 23:32:17 +01:00
iglocska
716f6b1147
fix: [default user creation] explicitly create UUIDs
2021-11-24 23:24:04 +01:00
Sami Mokaddem
999f4c8539
fix: [migration:user_org] Fixed if org_id column does not exist
2021-11-24 22:49:40 +01:00
Sami Mokaddem
e8e1a16673
chg: [search_all] Added drafty support of meta-fields
2021-11-24 22:39:22 +01:00
iglocska
7d576bcd67
Merge branch 'main' of github.com:cerebrate-project/cerebrate into main
2021-11-24 15:08:33 +01:00
iglocska
eb0a67327a
fix: [initial user] generation fixed
...
- requires a default organisation + org link now
2021-11-24 14:46:34 +01:00
Andras Iklody
2ac32911bb
fix: [mysql] action field renamed without renaming the index
2021-11-24 13:50:20 +01:00
Andras Iklody
19b98a0df4
fix: [mysql] renamed field without renaming the associated index
2021-11-24 13:48:20 +01:00
Andras Iklody
8ca22760e0
fix: [mysql] create if exists rather than drop + create
...
- made sense early in development, however, it no longer does
2021-11-24 13:47:10 +01:00
Andras Iklody
c647ae95eb
fix: typo in mysql.sql
2021-11-24 13:44:12 +01:00
Sami Mokaddem
aa42e6763a
chg: [metaTemplate] Started implementing new update system - WiP
2021-11-24 09:14:09 +01:00
Sami Mokaddem
94c0b171a1
chg: [component:CRUD] Added comment to be fixed later on - WiP
2021-11-24 09:12:39 +01:00
iglocska
8c8aba3fbc
Merge branch 'develop' into main
2021-11-24 01:53:10 +01:00
iglocska
4bcdf9534a
chg: [cakephp] version bump
2021-11-24 01:52:03 +01:00
iglocska
bacb3dc85e
fix: [API] fixed broken API
...
- don't call functions specifically meant for the UI when in an ACL context
- also fixed breaking issues with the logging
2021-11-24 01:50:55 +01:00
iglocska
92fee87a7f
fix: [keycloak] when enrolling users in keycloak, use the user organisation_id instead of the individual's first alias
2021-11-24 01:34:15 +01:00
iglocska
3cc857c42f
fix: [auditlog] use insert() rather than save() as that is not available in the behavior
...
- fixes exception on logging deletes, blocking any actual deletions
2021-11-24 01:33:26 +01:00
iglocska
22e4a90af0
chg: [ACL] tightened ACL for several controllers
...
- org admins now have access to new functionalities, added ACL for them
- Affected controllers:
- Authkeys, encryptionkeys, users, sharinggroups
- sets defaults/restricts access accordingly
2021-11-24 01:32:05 +01:00
iglocska
0fe7f4f931
new: [CRUD] added additional features to the CRUD component
...
- conditions passable to add/edit/index/delete
- refactored get() requests internally to finds to accomodate for additional parameters
- delete() now takes a params[] array as a second argument
2021-11-24 01:30:28 +01:00
iglocska
5483357e1c
chg: [ACL] fix permissions for org admins
...
- also, fix a bug with the simple permissions being ignored
2021-11-24 01:29:39 +01:00
iglocska
dad310f434
chg: [appcontroller] include user org in loaded user object during authentication
...
- also log username as username rather than name
2021-11-24 01:28:52 +01:00
iglocska
6d7a555368
chg: [index views] slight changes
...
- hide inaccessible action buttons on org index
- add owner to sharing group index
2021-11-24 01:28:01 +01:00
iglocska
e708730e97
chg: [roles] hide action buttons on the role index when they wouldn't be available anyway
2021-11-24 01:27:14 +01:00
iglocska
ed848e9cee
chg: [sharing groups] show owner org on the index
2021-11-24 01:26:55 +01:00
iglocska
061f3fc468
chg: [profile] added org to profile menu
2021-11-24 01:26:29 +01:00
iglocska
81ab202917
chg: [templates] org fields added to user templates
2021-11-24 01:25:57 +01:00
iglocska
e5e4e74cae
chg: [users] associated with orgs
2021-11-24 01:25:32 +01:00
iglocska
9619989a94
new: [migration] organisation_id added to users
...
- also, grab the first org for a default
2021-11-24 01:24:25 +01:00
Sami Mokaddem
d136955160
chg: [elements:widgets] Slightly refactored highlight panel and removed useless code
2021-11-23 22:07:31 +01:00
Sami Mokaddem
bfd3a0c1e0
chg: [genericElements:index_table] Immediately save index setting when dropdown menu gets closed
2021-11-23 21:55:01 +01:00
Sami Mokaddem
ef41d71c8b
chg: [helper:bootstrap] Improved dropdown menu badge UI
2021-11-23 16:27:01 +01:00
Sami Mokaddem
7c92c12de9
chg: [element:index_table] Slight UI adjustement
2021-11-23 15:53:05 +01:00
Sami Mokaddem
f3c4eee197
fix: [meta_template:enisa-csirt-inventory] Typo in regex
2021-11-23 15:43:49 +01:00
Sami Mokaddem
47f069611a
chg: updated .gitignore
2021-11-23 15:33:33 +01:00
Sami Mokaddem
9f9089f050
new: [meta_templates:it_infra_and_services] Added new template for org infra and services
2021-11-23 15:33:03 +01:00
Sami Mokaddem
0ccea3d7f0
chg: [meta_templates:enisa-csirt-inventory] Simplified regexes
2021-11-23 15:32:27 +01:00
Sami Mokaddem
b7e5204a11
chg: [meta_templates:individual_extended] Added support of phone number
2021-11-23 15:31:51 +01:00
Sami Mokaddem
4acf5209c8
chg: [metaFields] Clean-up and improved regex matching
2021-11-23 15:30:37 +01:00