Pablo Aragon
|
886bde919b
|
11135-Move js code from ui_print_datatable
|
2023-05-08 14:25:57 +02:00 |
daniel
|
c0172afc3d
|
update composer
|
2023-04-10 16:38:37 +02:00 |
Jonathan
|
93966788eb
|
Slides require mesage
|
2023-03-31 09:51:48 +02:00 |
|
Jonathan
|
9635b4b721
|
Dashboard slides fix
|
2023-03-30 16:45:27 +02:00 |
|
Pablo Aragon
|
e03e1e45ed
|
Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round
|
2023-03-30 12:26:06 +02:00 |
|
Pablo Aragon
|
5e24706f71
|
Style fix
|
2023-03-30 12:25:45 +02:00 |
|
Jonathan
|
ae58add6a9
|
Dashboard pure fix options
|
2023-03-30 12:18:16 +02:00 |
|
daniel
|
1262fee2e8
|
fixed styles
|
2023-03-30 08:43:23 +02:00 |
|
daniel
|
e7d08fe6d3
|
fixed styles
|
2023-03-29 14:48:47 +02:00 |
Diego Muñoz-Reja
|
35a1c2332d
|
Merge branch 'ent-4289-8282-RWORKS-Poder-escoger-el-servidor-que-ejecute-una-CronJob' into 'develop'
implemented consoles management
See merge request artica/pandorafms!5558
|
2023-03-28 15:33:37 +00:00 |
Alejandro Campos
|
e909686ddc
|
Merge branch 'develop' into 'ent-4289-8282-RWORKS-Poder-escoger-el-servidor-que-ejecute-una-CronJob'
# Conflicts:
# pandora_console/extras/mr/62.sql
|
2023-03-28 14:09:33 +00:00 |
|
daniel
|
19ddbdc30a
|
fixed styles
|
2023-03-28 08:34:05 +02:00 |
|
Jonathan
|
f8aefa6e34
|
Merge conflict solution
|
2023-03-27 08:31:00 +02:00 |
|
daniel
|
56e4770b93
|
fixed styles
|
2023-03-23 14:20:54 +01:00 |
|
daniel
|
95834b2de7
|
fixed styles
|
2023-03-23 12:41:39 +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
|
0934b75cbd
|
fixed styles
|
2023-03-17 08:10:19 +01:00 |
Daniel Cebrian
|
20b177d121
|
changed in welcome tips forms
|
2023-03-16 17:23:48 +01:00 |
|
Jonathan
|
758d04333d
|
clusterview margin title on view
|
2023-03-16 14:10:48 +01:00 |
|
Jonathan
|
7704e4a1da
|
clusterview margin title on view
|
2023-03-16 14:07:12 +01:00 |
|
Jonathan
|
f417772642
|
TipsWindow blacktheme
|
2023-03-16 13:31:16 +01:00 |
|
Jonathan
|
30538265e8
|
Cluster wizzard visual fix
|
2023-03-15 16:06:42 +01:00 |
|
Jonathan
|
19b295060b
|
Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round
|
2023-03-15 13:53:34 +01:00 |
|
Jonathan
|
17ba51d2bf
|
cluster view
|
2023-03-15 13:53:23 +01:00 |
|
Daniel Cebrian
|
c346aefeaa
|
#10685 changed in system fav, tips and Tactical group view
|
2023-03-15 12:46:09 +01:00 |
|
Daniel Cebrian
|
e36bb1d065
|
Merge branch 'develop' into ent-10324-sistema-de-favoritos
|
2023-03-14 08:36:12 +01:00 |
|
daniel
|
c96ac79726
|
fixed styles
|
2023-03-13 19:30:51 +01:00 |
|
Daniel Cebrian
|
dfa2ab818e
|
Merge branch 'develop' into ent-10324-sistema-de-favoritos
|
2023-03-13 08:53:35 +01:00 |
|
alejandro.campos@artica.es
|
cd85c60620
|
visual fix after pandora style refactorization
|
2023-03-10 15:17:21 +01:00 |
|
daniel
|
dcfaaea016
|
Merge remote-tracking branch 'origin/develop' into ent-9662-second-round
|
2023-03-10 14:50:31 +01:00 |
|
alejandro.campos@artica.es
|
39a119d150
|
Merge remote-tracking branch 'origin/develop' into ent-4289-8282-RWORKS-Poder-escoger-el-servidor-que-ejecute-una-CronJob
|
2023-03-10 13:29:20 +01:00 |
|
daniel
|
3be507ca7e
|
fixed styles
|
2023-03-10 12:40:21 +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
|
edbc9d8f6b
|
Icons review
|
2023-03-09 23:31:40 +01:00 |
|
Jonathan
|
54e6a99cc3
|
Dashboard pagination visual position
|
2023-03-08 17:09:42 +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 Cebrian
|
3ec11f4c9d
|
Merge branch 'develop' into ent-10324-sistema-de-favoritos
|
2023-03-08 12:55:53 +01:00 |
|
Daniel Cebrian
|
27005158ba
|
#9073 resolve conflics and bugs
|
2023-03-07 17:57:09 +01:00 |
|
Pablo Aragon
|
d529e6f384
|
Alerts
|
2023-03-07 15:59:36 +01:00 |
|
Daniel Cebrian
|
a4634717d8
|
Merge branch 'develop' into ent-9073-nuevo-sistema-de-tips-de-bienvenida
|
2023-03-07 13:49:39 +01:00 |
|
Jose Gonzalez
|
a10e79f663
|
Dashboard minor fixes and icons
|
2023-03-07 00:15:26 +01:00 |
|
daniel
|
310ad88707
|
fixed styles
|
2023-03-02 19:25:31 +01:00 |
|
daniel
|
6545bdbaf1
|
fixed styles
|
2023-03-02 14:25:52 +01:00 |
|
daniel
|
ad33accfda
|
fixed styles
|
2023-03-02 11:10:09 +01:00 |
|
daniel
|
69d1bdd908
|
fixed styles
|
2023-03-01 13:44:01 +01:00 |
|
Daniel Cebrian
|
c0dcc03388
|
#10324 added system fav in visual console and modules
|
2023-02-23 11:00:46 +01:00 |
|
Jonathan
|
05c2232daa
|
Modals dashboard view fix
|
2023-02-21 17:07:03 +01:00 |
|
alejandro.campos@artica.es
|
6c64ccd6d6
|
implemented consoles management
|
2023-02-21 15:32:45 +01:00 |
|
Daniel Cebrian
|
864d54ee88
|
#9073 fixed filter title
|
2023-02-17 14:15:16 +01:00 |
|
Daniel Cebrian
|
35a1a67006
|
#9073 refactoring
|
2023-02-17 12:53:35 +01:00 |
|
Daniel Cebrian
|
9a0dc247c0
|
#9073 added preview tip
|
2023-02-17 11:07:28 +01:00 |
|
Daniel Cebrian
|
0cee40e40a
|
#9073 create button for preview tip
|
2023-02-16 18:13:34 +01:00 |
|
Daniel Cebrian
|
dce5b07109
|
#9073 added control image and fixed bug with language filter
|
2023-02-16 16:14:50 +01:00 |
|
Daniel Cebrian
|
e0b75f9829
|
#9073 added system profiles in tips
|
2023-02-16 13:14:59 +01:00 |
|
Jose Gonzalez
|
be33b2f51a
|
Several visual fixes for fit with mockups
|
2023-02-14 14:06:51 +01:00 |
|
Daniel Cebrian
|
9f01a302c5
|
#9073 finished front
|
2023-02-14 11:32:43 +01:00 |
|
Daniel Cebrian
|
ad4750c409
|
#9073 fixed bug in firts tips
|
2023-02-14 10:55:01 +01:00 |
|
Daniel Cebrian
|
dfb93d2cf5
|
#9073 added token for tips in user profile configuration
|
2023-02-14 10:34:08 +01:00 |
|
Daniel Cebrian
|
887d2f8f18
|
#9073 added counter round un footer
|
2023-02-13 16:21:37 +01:00 |
|
Daniel Cebrian
|
6619cf059d
|
#9073 added design v1
|
2023-02-13 13:26:49 +01:00 |
|
Daniel Cebrian
|
e62dee1c62
|
#9073 create files structure
|
2023-02-13 10:06:14 +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 |
|
Daniel Cebrian
|
8475e5fbf6
|
#10162 fixed entities in special days
|
2023-01-30 17:21:20 +01:00 |
|
Jose Gonzalez
|
a9c4dd625c
|
Merge develop branch
|
2023-01-11 13:46:15 +01:00 |
|
Jose Gonzalez
|
8421fb49ca
|
Merge remote-tracking branch 'origin' into ent-9662-Restyling-fuentes-colores-botones
|
2023-01-04 15:54:16 +01:00 |
Calvo
|
6d9149e11b
|
Merge remote-tracking branch 'origin/develop' into ent-7386-Ocultar-credenciales-de-acceso-a-la-API
|
2022-12-29 17:39:12 +01:00 |
|
Alejandro Campos
|
960d8be258
|
Merge branch 'develop' into 'ent-8535-Monitorizacion-de-clusters-Pasar-de-Enterprise-a-Open'
# Conflicts:
# pandora_console/extras/delete_files/delete_files.txt
|
2022-12-15 14:05:27 +00:00 |
|
Calvo
|
c5c36dab8b
|
Fix dashboard dialog tranlations and search bar size
|
2022-12-05 17:20:08 +01:00 |
|
jose.gonzalez@pandorafms.com
|
dccd950e9e
|
Changes
|
2022-11-30 10:14:42 +01:00 |
|
alejandro.campos@artica.es
|
17d7261173
|
implement cluster in open project
|
2022-10-20 13:17:26 +02:00 |
|
Daniel Barbero
|
527daccd1d
|
fixed visual errors slides dashboards#9342
|
2022-09-12 09:46:37 +02:00 |
Jimmy Olano
|
2220125250
|
Merge branch 'ent-9213-widget-de-reports-en-dashboards' into 'develop'
delete item into widget pandora_enterprise#9213
See merge request artica/pandorafms!4987
|
2022-06-29 16:32:49 +00:00 |
|
Jimmy Olano
|
aeb40bacc9
|
Merge branch 'ent-9101-13724-Fallo-operator-read-en-dashboard' into 'develop'
Ent 9101 13724 fallo operator read en dashboard
See merge request artica/pandorafms!4945
|
2022-06-29 01:11:44 +00:00 |
|
Diego Muñoz-Reja
|
3fe66d9a9b
|
Merge branch 'ent-9085-13692-Fallo-permisos-en-creacion-edicion-de-List-of-Special-Days' into 'develop'
fixed permissions
See merge request artica/pandorafms!4934
|
2022-06-28 14:32:31 +00:00 |
|
Daniel Barbero Martin
|
6d1121602a
|
delete item into widget pandora_enterprise#9213
|
2022-06-28 11:09:47 +02:00 |
|
Daniel Barbero Martin
|
3cdde5054a
|
size form widgets dashboards pandora_enterprise#8827
|
2022-06-27 15:43:42 +02:00 |
Daniel Maya
|
4dd3b63052
|
#9101 Fixed write permissions
|
2022-06-08 09:43:36 +02:00 |
|
alejandro.campos@artica.es
|
bf2ef75552
|
fixed permissions
|
2022-06-03 11:39:58 +02:00 |
Daniel Maya
|
e8d3d93f7f
|
Fixed pandora_black in metaconsole
|
2022-01-17 10:22:30 +01:00 |
Daniel Rodriguez
|
688ec5f7f9
|
Merge branch 'ent-8144-no-se-muestra-completo-el-nombre-de-dashboard-consola-visual-favorito-en-el-menu' into 'develop'
Ent 8144 no se muestra completo el nombre de dashboard consola visual favorito en el menu
See merge request artica/pandorafms!4505
|
2021-11-22 15:54:05 +00:00 |
|
Daniel Barbero Martin
|
c52e11e91a
|
Merge remote-tracking branch 'origin/develop' into ent-7503-Calendarios-para-dias-especiales
Conflicts:
pandora_console/extras/mr/51.sql
|
2021-11-19 08:12:22 +01:00 |
|
Daniel Barbero Martin
|
2d4c949113
|
add metaconsole calendars special days alerts
|
2021-11-08 13:07:31 +01:00 |
|
Daniel Barbero Martin
|
cd163a96ef
|
wip special days alerts
|
2021-11-04 13:07:17 +01:00 |
|
Daniel Barbero Martin
|
f521dec4e2
|
wip special days alerts
|
2021-11-04 10:10:11 +01:00 |
|
Daniel Barbero Martin
|
bd75912a0d
|
wip special days alerts
|
2021-11-04 09:55:37 +01:00 |
|
Daniel Barbero Martin
|
fdca5e4a78
|
wip special days alerts
|
2021-11-03 17:30:54 +01:00 |
|
Daniel Barbero Martin
|
1e976a8605
|
alerts special days wip
|
2021-11-03 10:59:00 +01:00 |
|
Daniel Barbero Martin
|
25268ec9b4
|
color
|
2021-11-02 17:49:45 +01:00 |
Calvo
|
1e51197afb
|
Fix menu favourite GIS maps. services and dashboards large title
|
2021-10-27 19:39:18 +02:00 |
|
Daniel Maya
|
59c1a10056
|
#8053 Fixed refresh in public dashboard
|
2021-10-06 11:56:19 +02:00 |
|
Daniel Maya
|
588e06d357
|
#7344 fixed select
|
2021-04-29 12:45:35 +02:00 |
|
Daniel Barbero Martin
|
eb5704a660
|
Fixed errors widgets background black-theme and required group
|
2021-04-21 08:57:12 +02:00 |
marcos
|
e506523fff
|
fixed minnor error
|
2021-04-15 13:55:14 +02:00 |
|
marcos
|
b6ea565118
|
add black theme to widget dashboard
|
2021-04-14 12:07:38 +02:00 |
fbsanchez
|
700817acaf
|
Merge branch 'develop' into 'ent-2685-7938-aadcm-dashboards-en-metaconsola'
Conflicts:
pandora_console/include/functions_html.php
|
2021-03-31 10:12:36 +00:00 |
|
Daniel Rodriguez
|
ce2f4ec7cc
|
Merge branch 'ent-7112-bugs-consola-visual-y-dashboards' into 'develop'
Command center
See merge request artica/pandorafms!3887
|
2021-03-24 11:43:52 +00:00 |
|
daniel
|
774fc9ebe5
|
Command center
|
2021-03-24 11:43:51 +00:00 |
|
fbsanchez
|
c3232b0f2a
|
Merge remote-tracking branch 'origin/develop' into ent-7010-nexcon-mejoras-widget-de-eventos
Conflicts:
pandora_console/include/class/ConsoleSupervisor.php
|
2021-03-24 09:55:31 +01:00 |
|
fbsanchez
|
a3069fdf76
|
Merge remote-tracking branch 'origin/develop' into ent-6753-consistencia-en-el-selector-de-grupos
|
2021-03-18 10:04:18 +01:00 |