Jonathan
|
ca39b4a4ce
|
Conflict solution
|
2023-02-16 13:27:11 +01:00 |
|
Jonathan
|
ce45469f83
|
Fix setup visual bugs
|
2023-02-16 13:16:31 +01:00 |
Jose Gonzalez
|
29ed8be0d2
|
Minor fix
|
2023-02-16 12:59:23 +01:00 |
|
Jose Gonzalez
|
5dc8e19d6d
|
Include Api Token and QR code mockup
|
2023-02-16 12:44:11 +01:00 |
|
Jonathan
|
041ce5d5e8
|
Manage Agents delete and create required "primary group"
|
2023-02-16 10:59:45 +01:00 |
|
Jose Gonzalez
|
21a4a4ced8
|
Edit user fix
|
2023-02-16 07:44:41 +01:00 |
|
Jose Gonzalez
|
e42c4575d5
|
Double authentication active
|
2023-02-16 07:25:26 +01:00 |
|
Jose Gonzalez
|
8673ea57b1
|
Fix issues with view button in setup view
|
2023-02-15 16:28:40 +01:00 |
|
Jose Gonzalez
|
38dbec8618
|
Fix Firefox bug
|
2023-02-15 14:45:28 +01:00 |
|
Jose Gonzalez
|
1b174f9cd4
|
Ticket 10412 Reporting builder fix
|
2023-02-15 12:49:31 +01:00 |
|
Jose Gonzalez
|
36308b1be0
|
Minor visual fixes
|
2023-02-14 16:41:24 +01:00 |
|
Jose Gonzalez
|
be33b2f51a
|
Several visual fixes for fit with mockups
|
2023-02-14 14:06:51 +01:00 |
|
Jose Gonzalez
|
1d682521e9
|
Minor fixes in agent/module view
|
2023-02-14 10:41:40 +01:00 |
|
Jose Gonzalez
|
8f65ee4fb8
|
Minor fix: search submit in module list
|
2023-02-14 07:52:13 +01:00 |
|
Jose Gonzalez
|
31f6c9a9d9
|
Minor patches
|
2023-02-13 17:35:54 +01:00 |
|
Jose Gonzalez
|
3fdd0a08d1
|
Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones
|
2023-02-13 14:32:40 +01:00 |
Daniel Maya
|
98f82b4ce8
|
#9662 Fixed discovery menu
|
2023-02-13 14:32:02 +01:00 |
|
Jose Gonzalez
|
d33babd48a
|
Fix user modification-creation
|
2023-02-13 14:23:31 +01:00 |
|
Jose Gonzalez
|
d45a631ea5
|
Final merge with new menu
|
2023-02-13 10:37:37 +01:00 |
|
Jose Gonzalez
|
98736c1ab4
|
Merge
|
2023-02-13 10:24:07 +01:00 |
|
Jose Gonzalez
|
d6eedf07aa
|
Merge
|
2023-02-13 10:03:09 +01:00 |
|
Jose Gonzalez
|
6a46af495d
|
Fix issue with dev environment starting and added button fixed id parameter
|
2023-02-10 13:38:47 +01:00 |
|
Daniel Maya
|
be3c7bca6c
|
resolved conflict
|
2023-02-10 11:55:45 +01:00 |
|
Jose Gonzalez
|
175d4b7341
|
Fixes in Event view and other fixes
|
2023-02-09 16:13:30 +01:00 |
|
Jose Gonzalez
|
4b592b6610
|
Minor fixes
|
2023-02-08 17:20:52 +01:00 |
|
Jose Gonzalez
|
4d9c6ab33a
|
Minor fixes
|
2023-02-08 12:58:23 +01:00 |
|
Jose Gonzalez
|
f14d324490
|
Minor fixes and improves
|
2023-02-08 12:43:08 +01:00 |
|
Jose Gonzalez
|
3a741f8ed9
|
Update icons and improve tables
|
2023-02-07 16:22:52 +01:00 |
|
Jose Gonzalez
|
ab1d2f38f6
|
Changed function name
|
2023-02-07 15:39:53 +01:00 |
|
Jose Gonzalez
|
e99ad97e17
|
Fixes and improvements
|
2023-02-07 15:33:29 +01:00 |
|
Daniel Maya
|
758f906616
|
#9663 menu redesing 4
|
2023-02-07 15:22:51 +01:00 |
|
Jose Gonzalez
|
8f78f89aa3
|
Improve views and forms
|
2023-02-07 13:19:40 +01:00 |
|
Jose Gonzalez
|
dfdcb688d4
|
Improve code
|
2023-02-06 23:10:28 +01:00 |
|
Jose Gonzalez
|
ac144de6d6
|
WIP: Minor fixes
|
2023-02-06 10:17:51 +01:00 |
|
Jose Gonzalez
|
a9df7e2ec5
|
WIP: Improve somethings
|
2023-02-03 16:36:04 +01:00 |
|
Jose Gonzalez
|
e3b2ec529a
|
Merge remote-tracking branch 'origin' into ent-9662-Restyling-fuentes-colores-botones
|
2023-02-03 14:16:47 +01:00 |
|
Jose Gonzalez
|
0a61f6dcc7
|
WIP: User management View and BL
|
2023-02-03 14:10:26 +01:00 |
|
Jose Gonzalez
|
b9992c5a67
|
Minor fixes for solve visual issues
|
2023-02-03 12:37:09 +01:00 |
Pablo Aragon
|
54e4da7aad
|
Merge branch 'develop' into ent-9220-verificar-y-capar-en-su-caso-que-las-colecciones-no-funcionan-en-la-nms-2
|
2023-02-03 10:48:42 +01:00 |
Rafael Ameijeiras
|
30a0e2abe8
|
Merge branch 'ent-10076-anadir-un-acceso-mas-directo-a-attachments-plugins' into 'develop'
Ent 10076 anadir un acceso mas directo a attachments plugins
See merge request artica/pandorafms!5441
|
2023-02-03 09:36:53 +00:00 |
Daniel Rodriguez
|
67a4e2b04b
|
Merge branch 'ent-9600-Estado-erroneo-de-servidor-cuando-hay-un-TZ-distinto-entre-servidor-consola' into 'develop'
fix server status when distinct timezones
See merge request artica/pandorafms!5439
|
2023-02-02 16:07:02 +00:00 |
|
Rafael Ameijeiras
|
3bc593e58a
|
Merge branch 'ent-10219-stored-cross-site-scripting-in-syslog-section' into 'develop'
Ent 10219 stored cross site scripting in syslog section
See merge request artica/pandorafms!5464
|
2023-02-02 10:02:32 +00:00 |
|
Rafael Ameijeiras
|
ccb93c0918
|
Merge branch 'ent-10163-Remote-Code-Execution-via-Unrestricted-File-Upload' into 'develop'
fixed vulnerability
See merge request artica/pandorafms!5476
|
2023-02-02 10:02:15 +00:00 |
Diego Muñoz-Reja
|
acb7416148
|
Merge branch 'ent-10236-14934-module-bulk-operations-anade-dynamic-interval-a-los-modulos-a-pesar-de-estar-en-none' into 'develop'
Ent 10236 14934 module bulk operations anade dynamic interval a los modulos a pesar de estar en none
See merge request artica/pandorafms!5471
|
2023-02-01 14:17:15 +00:00 |
Jimmy Olano
|
c4659f0c58
|
Merge branch 'ent-10126-no-permite-editar-etiqueta-en-elemento-de-consola-visual' into 'develop'
Ent 10126 no permite editar etiqueta en elemento de consola visual
https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/10126
See merge request artica/pandorafms!5407
|
2023-02-01 10:56:25 +00:00 |
alejandro.campos@artica.es
|
a69f3eb0dc
|
minor change
|
2023-02-01 10:24:35 +01:00 |
|
Jose Gonzalez
|
0363a90e1f
|
Resolve merge issues
|
2023-01-31 17:35:44 +01:00 |
Daniel Cebrian
|
dcb69c2cf4
|
Merge branch 'develop' into 'ent-10236-14934-module-bulk-operations-anade-dynamic-interval-a-los-modulos-a-pesar-de-estar-en-none'
# Conflicts:
# pandora_console/godmode/massive/massive_edit_modules.php
|
2023-01-31 15:10:26 +00:00 |
|
Jose Gonzalez
|
fbdd91e4ff
|
Improve user profile list view
|
2023-01-31 12:59:49 +01:00 |
|
Daniel Cebrian
|
bbb249d031
|
#10126 clear log
|
2023-01-31 12:13:57 +01:00 |