daniel
|
ce0468b37e
|
Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
Conflicts:
pandora_console/include/functions_menu.php
|
2023-09-08 13:11:52 +02:00 |
Pablo Aragon
|
1c83137b72
|
11840-Fix satellite credential boxes
|
2023-08-30 11:50:37 +02:00 |
|
daniel
|
dca15b5637
|
Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
|
2023-08-23 18:54:01 +02:00 |
miguel angel rasteu
|
3a39670faf
|
#11547 fix profile admin
|
2023-08-23 10:08:45 +02:00 |
|
miguel angel rasteu
|
ba606fa47a
|
Merge branch 'develop' into ent-11547-diferenciar-about-para-usuarios-no-admin
|
2023-08-23 09:44:03 +02:00 |
|
daniel
|
7f82273dc4
|
Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
Conflicts:
pandora_console/extras/mr/65.sql
|
2023-08-09 08:59:01 +02:00 |
Daniel Maya
|
bee65bc575
|
#11739 Fixed deprecated functions
|
2023-07-26 14:18:20 +02:00 |
|
miguel angel rasteu
|
04a45e84a8
|
#11547 Show a different 'about' depending on whether the user is admin
|
2023-07-19 12:50:39 +02:00 |
|
daniel
|
a29497f659
|
Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
|
2023-07-17 10:52:15 +02:00 |
Rafael Ameijeiras
|
d860d613d6
|
Merge branch 'ent-10598-nuevo-wizard-de-bienvenida' into 'develop'
Ent 10598 nuevo wizard de bienvenida
See merge request artica/pandorafms!6043
|
2023-07-17 05:57:29 +00:00 |
|
daniel
|
524bb7fdbb
|
Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
|
2023-07-11 08:26:20 +02:00 |
Daniel Cebrian
|
d993674c12
|
Merge branch 'develop' into ent-11567-ventana-about
|
2023-07-06 11:30:45 +02:00 |
|
daniel
|
564f714112
|
Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
|
2023-06-29 09:46:08 +02:00 |
Matias Didier
|
6b9145eeca
|
Merge branch 'ent-11342-15659-bug-visual-en-configuartion-events' into 'develop'
Ent 11342 15659 bug visual en configuartion events
See merge request artica/pandorafms!6088
|
2023-06-27 08:01:10 +00:00 |
|
daniel
|
6e3eddff08
|
Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
|
2023-06-27 08:23:46 +02:00 |
|
Matias Didier
|
fde3857674
|
Merge branch 'ent-11476-cambiar-headers-de-copyright' into 'develop'
Ent 11476 cambiar headers de copyright
See merge request artica/pandorafms!6069
|
2023-06-22 13:24:47 +00:00 |
|
Daniel Cebrian
|
2b07b614fc
|
#11567 ignore about menu in acl
|
2023-06-19 15:30:08 +02:00 |
|
Daniel Cebrian
|
01d48c7ba4
|
#11567 new about window in operation
|
2023-06-19 15:09:30 +02:00 |
|
daniel
|
e82c1e6881
|
wip integration integriaIMS pandora_enterprise#11471
|
2023-06-16 13:47:25 +02:00 |
|
miguel angel rasteu
|
9ef5c0abbc
|
#11342 Fix conditional menu
|
2023-06-13 09:40:07 +02:00 |
|
miguel angel rasteu
|
db62a91cb6
|
#11476 Fix https url
|
2023-06-08 13:19:01 +02:00 |
|
miguel angel rasteu
|
1f8752ee63
|
#11476 Fix pandora url
|
2023-06-08 13:10:16 +02:00 |
|
miguel angel rasteu
|
64204b6ff7
|
#11476 Fix ascci art
|
2023-06-08 12:42:10 +02:00 |
|
miguel angel rasteu
|
933f69f2ab
|
#11476 Change copyright header
|
2023-06-08 11:53:13 +02:00 |
|
Pablo Aragon
|
812ad711fa
|
11512-LTS name about modal
|
2023-06-07 11:47:37 +02:00 |
Jonathan
|
ebdc735bd4
|
#10598 V2 wizard welcome
|
2023-06-02 13:32:47 +02:00 |
Jorge Rincon
|
b422bf75b2
|
Fixed scrolling of the database tab
|
2023-05-24 13:03:31 +02:00 |
|
Jorge Rincon
|
5a9fcbde95
|
#11302 Fixed bugs in modal UI about
|
2023-05-23 15:12:06 +02:00 |
|
Jorge Rincon
|
6fdff0600f
|
#11182 change the default Support expires date
|
2023-05-12 12:55:39 +02:00 |
Diego Muñoz-Reja
|
2a03861168
|
Merge branch 'ent-10653-14875-no-se-pueden-crear-eliminar-informes-con-acl-solo-custom-report' into 'develop'
Ent 10653 14875 no se pueden crear eliminar informes con acl solo custom report
See merge request artica/pandorafms!5650
|
2023-04-18 12:22:53 +00:00 |
|
Rafael Ameijeiras
|
cc2709c42c
|
Merge branch 'ent-10699-errores-en-los-mapas-varios' into 'develop'
Ent 10699 errores en los mapas varios
See merge request artica/pandorafms!5632
|
2023-04-05 06:47:31 +00:00 |
|
Pablo Aragon
|
f798149502
|
10653-ACL reporting
|
2023-04-03 14:09:37 +02:00 |
|
Jonathan
|
8b04d5981d
|
Agent view follow menu change
|
2023-03-30 14:17:33 +02:00 |
|
Jonathan
|
7a3e894bb0
|
Menu fix follow reports
|
2023-03-28 11:06:03 +02:00 |
|
Daniel Maya
|
712da9070f
|
#10699 Fixed maps
|
2023-03-28 10:45:41 +02:00 |
|
daniel
|
ebffb004e9
|
Merge remote-tracking branch 'origin/develop' into ent-9662-second-round
|
2023-03-27 21:22:06 +02:00 |
|
Jonathan
|
e06fc2f115
|
Collection visual fix
|
2023-03-27 16:26:12 +02:00 |
|
Jonathan
|
665976e011
|
Bulks masive visual action buttons
|
2023-03-27 11:10:51 +02:00 |
|
Matias Didier
|
2daea0e5c4
|
Merge branch 'ent-10764-favoritos-y-nuevos-menus' into 'develop'
Ent 10764 favoritos y nuevos menus
See merge request artica/pandorafms!5618
|
2023-03-27 09:01:48 +00:00 |
|
Jonathan
|
0ae7630714
|
Gis map fix view
|
2023-03-27 08:44:45 +02:00 |
|
Jonathan
|
f8aefa6e34
|
Merge conflict solution
|
2023-03-27 08:31:00 +02:00 |
|
Daniel Maya
|
94c843dac2
|
#9662 Fixed gis map menu
|
2023-03-23 10:41:08 +01:00 |
|
Jonathan
|
a063c7a0ac
|
Fix header and menu
|
2023-03-22 14:21:56 +01:00 |
|
Jonathan
|
e2615b9593
|
Visual changes header
|
2023-03-21 17:02:03 +01:00 |
|
Daniel Cebrian
|
a21e43a452
|
#10764 ignore selected action in fav menu
|
2023-03-21 15:40:46 +01:00 |
|
daniel
|
0643b4e0ba
|
fixed styles
|
2023-03-13 12:19:27 +01:00 |
|
Pablo Aragon
|
b18a689225
|
About meta and observer input password
|
2023-03-03 12:40:58 +01:00 |
|
Daniel Maya
|
586b6e5883
|
#9662 fixed menu
|
2023-02-27 09:39:34 +01:00 |
|
daniel
|
8230ae616b
|
Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones
Conflicts:
pandora_console/godmode/users/user_list.php
pandora_console/operation/events/events.php
|
2023-02-22 12:35:34 +01:00 |
|
Daniel Maya
|
a615d2d98f
|
#9662 minor fixed
|
2023-02-20 17:08:36 +01:00 |