daniel
|
dcfaaea016
|
Merge remote-tracking branch 'origin/develop' into ent-9662-second-round
|
2023-03-10 14:50:31 +01:00 |
|
daniel
|
8778fcea93
|
fixed styles
|
2023-03-10 14:49:38 +01:00 |
Jose Gonzalez
|
f875fe674e
|
Fix main_menu_icons
|
2023-03-10 12:52:18 +01:00 |
|
Jose Gonzalez
|
a065833117
|
Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round
|
2023-03-10 12:48:50 +01:00 |
|
Jose Gonzalez
|
dc216ff788
|
Tree view black
|
2023-03-10 12:47:44 +01:00 |
|
daniel
|
3be507ca7e
|
fixed styles
|
2023-03-10 12:40:21 +01:00 |
Pablo Aragon
|
b785696acd
|
Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round
|
2023-03-10 12:29:24 +01:00 |
|
Pablo Aragon
|
000874ea6e
|
CSV button datatable. IPAM fix
|
2023-03-10 12:29:13 +01:00 |
Daniel Cebrian
|
841478a86c
|
Merge branch 'develop' into 'ent-9073-nuevo-sistema-de-tips-de-bienvenida'
# Conflicts:
# pandora_console/pandoradb.sql
|
2023-03-10 10:41:08 +00:00 |
|
Jose Gonzalez
|
3f884d9aff
|
Tree View fixed
|
2023-03-10 11:09:36 +01:00 |
|
Pablo Aragon
|
92e5c4efa0
|
Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round
|
2023-03-10 08:40:48 +01:00 |
|
Pablo Aragon
|
ae6159c7a1
|
Events
|
2023-03-10 08:40:38 +01:00 |
|
daniel
|
8736629954
|
fixed styles
|
2023-03-10 08:38:44 +01:00 |
|
daniel
|
9aa5d76963
|
Merge remote-tracking branch 'origin/develop' into ent-9662-second-round
|
2023-03-09 20:00:32 +01:00 |
|
daniel
|
89b3be06f9
|
fixed styles
|
2023-03-09 19:57:37 +01:00 |
|
daniel
|
6d0b0039c5
|
fixed styles
|
2023-03-09 19:25:14 +01:00 |
|
Pablo Aragon
|
188ad07be0
|
Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round
|
2023-03-09 17:21:29 +01:00 |
|
Pablo Aragon
|
d3ed5a93fc
|
Admin tools
|
2023-03-09 17:21:18 +01:00 |
|
Jose Gonzalez
|
a41811ee58
|
Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round
|
2023-03-09 16:37:49 +01:00 |
|
Jose Gonzalez
|
a9abda1fd4
|
Network maps adjust
|
2023-03-09 16:37:43 +01:00 |
Rafael Ameijeiras
|
bcc1775b1b
|
Merge branch 'ent-10350-GISS-Pierden-acceso-a-Metaconsola-mientras-dura-la-ejecucion-de-pandoradb' into 'develop'
handling synchronizer instantiation when metaconsole is merging
See merge request artica/pandorafms!5580
|
2023-03-09 15:28:20 +00:00 |
|
Pablo Aragon
|
cbc05f7ea0
|
Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round
|
2023-03-09 15:15:06 +01:00 |
|
Pablo Aragon
|
2a97b26cfe
|
Admin tools
|
2023-03-09 15:14:47 +01:00 |
|
daniel
|
63d83b3f97
|
fixed styles
|
2023-03-09 11:25:43 +01:00 |
|
daniel
|
e21d9968e8
|
fixed styles
|
2023-03-08 19:25:25 +01:00 |
|
Pablo Aragon
|
d0c8794361
|
Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round
|
2023-03-08 17:12:22 +01:00 |
|
Pablo Aragon
|
bb1d9c323d
|
Admin tools
|
2023-03-08 17:12:15 +01:00 |
Jonathan
|
08c2803970
|
Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round
|
2023-03-08 17:09:47 +01:00 |
|
Jonathan
|
54e6a99cc3
|
Dashboard pagination visual position
|
2023-03-08 17:09:42 +01:00 |
Daniel Maya
|
72990ab177
|
#9662 Fixed pandora black
|
2023-03-08 16:41:26 +01:00 |
|
Jonathan
|
434aa1dbc3
|
z-index fix on buttons and mesage
|
2023-03-08 15:57:55 +01:00 |
|
Jose Gonzalez
|
a8c177a248
|
Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round
|
2023-03-08 15:57:19 +01:00 |
|
Pablo Aragon
|
2934ff25ff
|
Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round
|
2023-03-08 15:31:05 +01:00 |
|
Pablo Aragon
|
87e82c0410
|
10457-Audit log, save/load filters
|
2023-03-08 15:30:48 +01:00 |
|
Jose Gonzalez
|
0304c1f18e
|
Calendar CSS styles
|
2023-03-08 15:23:42 +01:00 |
|
Jose Gonzalez
|
c51c00f974
|
Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round
|
2023-03-08 15:05:35 +01:00 |
|
Jose Gonzalez
|
1d3d2fc5fd
|
Minor fixes
|
2023-03-08 15:01:41 +01:00 |
|
Pablo Aragon
|
78eccfd73b
|
Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round
|
2023-03-08 13:36:49 +01:00 |
|
Pablo Aragon
|
1a7e063c60
|
Alerts
|
2023-03-08 13:36:36 +01:00 |
|
Daniel Cebrian
|
11250bd59b
|
Merge branch 'develop' into ent-9073-nuevo-sistema-de-tips-de-bienvenida
|
2023-03-08 13:00:18 +01:00 |
|
daniel
|
bc501ec552
|
fixed styles
|
2023-03-08 08:28:48 +01:00 |
|
Daniel Cebrian
|
27005158ba
|
#9073 resolve conflics and bugs
|
2023-03-07 17:57:09 +01:00 |
|
Jose Gonzalez
|
5925cb0b2c
|
Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round
|
2023-03-07 17:50:57 +01:00 |
|
Jose Gonzalez
|
2dbc2e801f
|
Minor icon fixes
|
2023-03-07 17:24:36 +01:00 |
|
Pablo Aragon
|
3ecbf1e4fa
|
Alerts
|
2023-03-07 16:17:01 +01:00 |
|
Pablo Aragon
|
d529e6f384
|
Alerts
|
2023-03-07 15:59:36 +01:00 |
|
Daniel Maya
|
6b9175ea0d
|
Merge branch 'develop' into ent-9662-second-round
|
2023-03-07 15:05:28 +01:00 |
|
Jose Gonzalez
|
4ea1d697dc
|
Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round
|
2023-03-07 15:00:40 +01:00 |
|
Jose Gonzalez
|
d4125be1b6
|
Fix visual issue with radios
|
2023-03-07 15:00:34 +01:00 |
Matias Didier
|
d206471673
|
Merge branch 'ent-10347-vista-tactica-de-grupo' into 'develop'
Ent 10347 vista tactica de grupo
See merge request artica/pandorafms!5572
|
2023-03-07 13:55:57 +00:00 |