tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
29,700 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

709 Commits

Author SHA1 Message Date
fbsanchez 6bb754d5d2 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 
Conflicts:
	pandora_console/pandoradb.sql
 2022-02-08 13:02:22 +01:00
Daniel Barbero Martin 0e0e737283 calendar not editable pandora_enterprise#3943 2022-02-07 13:07:48 +01:00
fbsanchez 1207463f16 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 
Conflicts:
	pandora_console/include/class/HTML.class.php
 2022-01-25 14:16:47 +01:00
vgilc b547278930 Merge branch 'ent-7988-no-se-puede-cambiar-la-skin-de-pandora-en-entorno-meta-nodo-sincronizados' into 'develop' 
Ent 7988 no se puede cambiar la skin de pandora en entorno meta nodo sincronizados

See merge request artica/pandorafms!4633
 2022-01-25 10:27:25 +00:00
fbsanchez 35184c4eb6 ws php8 2022-01-21 17:39:11 +01:00
Daniel Maya e8d3d93f7f Fixed pandora_black in metaconsole 2022-01-17 10:22:30 +01:00
fbsanchez fee3f4ab96 php8 review + mdpf update 2022-01-12 14:22:16 +01:00
Calvo daf0b4e6e9 Fix alert view with default actions node and meta 2021-12-27 19:01:53 +01:00
fbsanchez f852df2f1c Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2 
Conflicts:
	pandora_console/extras/mr/51.sql
 2021-12-14 11:03:04 +01:00
fbsanchez f8883151f3 allow datatable to export all columns but latest one 2021-12-10 13:43:05 +01:00
Daniel Barbero Martin 9b79fb826d wip reports alert actions 2021-12-02 13:34:28 +01:00
fbsanchez 582cb9a082 Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2 
Conflicts:
	pandora_console/extras/mr/51.sql
 2021-11-19 10:51:46 +01:00
fbsanchez 9ff3c8eee1 wip ncm2 2021-11-15 18:58:57 +01:00
José González bdc4d0a8b1 Revert "Merge branch 'ent-7662-rebranding-meta' into 'develop'" 
This reverts merge request !4302
 2021-11-04 16:28:15 +01:00
Jose Gonzalez c0abe5edb9 Fix merge 2021-11-04 16:00:05 +01:00
Daniel Barbero Martin 89680907fd wip special days 2021-10-29 13:45:18 +02:00
fbsanchez 96250dcfa0 WIP NCM 2021-10-13 22:47:31 +02:00
fbsanchez 2050c137ec errata fix 2021-10-07 12:25:41 +02:00
fbsanchez 35eb1d0790 Some ui_get_full_url improvements 2021-10-06 15:13:21 +02:00
fbsanchez 8764413597 Some ui_get_full_url improvements 2021-10-06 15:07:46 +02:00
fbsanchez e335bb6885 some fixes, please hard test 2021-10-05 17:03:06 +02:00
fbsanchez ec8d5b4fe4 Please check carefully this change 2021-10-05 15:09:30 +02:00
Jose Gonzalez 8696d21a42 Fixed any minor bugs 2021-09-29 17:03:13 +02:00
Calvo 4a9f523468 Added unlinked icon to alerts in unlinked module 2021-09-23 19:02:31 +02:00
Daniel Rodriguez f78d2e8a4b Merge branch 'ent-7697-varios-bugs-visuales-en-modal-de-configuracion-de-widget-metaconsola' into 'develop' 
Fix widgets style bugs

See merge request artica/pandorafms!4272
 2021-09-22 08:58:51 +00:00
Jose Gonzalez bb743cb87f Fixed forget metaconsole alerts 2021-09-06 14:08:24 +02:00
Daniel Rodriguez 4d5926e427 Merge branch 'ent-7612-implementar-sistema-de-mensajeria-en-la-meta' into 'develop' 
Ent 7612 implementar sistema de mensajeria en la meta

See merge request artica/pandorafms!4353
 2021-08-24 08:13:02 +00:00
fbsanchez 3109975e7d Notifications in MC 2021-08-12 12:01:24 +02:00
fbsanchez 034e921e35 Upgraded jquery to 3.6.0, without npm 2021-08-12 09:30:43 +02:00
Daniel Rodriguez 604ef4bc89 Merge branch 'ent-7442-Metaconsole-Dashboard-WUX-Transaction-Stats-no-encuentra-trans' into 'develop' 
Ent 7442 metaconsole dashboard wux transaction stats no encuentra trans

Closes pandora_enterprise#7442

See merge request artica/pandorafms!4295
 2021-08-06 12:53:06 +00:00
José González 3263ef8b9a Fix issue with WUX Trans Stats 2021-07-13 17:26:03 +02:00
José González d3e815ce43 Fixed WUX widgets in meta 2021-07-12 12:32:05 +02:00
Calvo cdf6c3972e Fix widgets style bugs 2021-07-07 12:09:47 +02:00
fbsanchez eec373e896 Added link to MC place where user must manage the stuff when in centralised environment and ui_get_meta_url 2021-06-24 19:48:07 +02:00
Daniel Barbero Martin 12e67380ee Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-28 14:37:20 +02:00
Jose Gonzalez cf358341fb Fixed issue with css file in meta 2021-05-28 13:47:14 +02:00
Daniel Barbero Martin 8c7654cd2d Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/godmode/setup/os.php
	pandora_console/include/styles/pandora.css
	pandora_console/operation/users/user_edit.php
 2021-05-28 08:26:19 +02:00
José González 76628117fa Merge branch 'develop' into 'ent-7002-Revision-cabeceras-tabs' 
# Conflicts:
#   pandora_console/operation/messages/message_edit.php
 2021-05-25 13:50:17 +00:00
Daniel Barbero Martin bc6a838ebb WIP command center, fix view synch queue 2021-05-17 12:35:29 +02:00
Daniel Rodriguez 4c768bc6cd Merge branch 'ent-7439-metaconsola-dashboard-fallo-link-publico' into 'develop' 
Reference to base public_dashboard url

See merge request artica/pandorafms!4081
 2021-05-10 09:14:58 +00:00
Daniel Rodriguez 3d8f0b58d6 Merge branch 'ent-7258-spinner-infinito-agentes-report-sla-items' into 'develop' 
Fix bugs with SLA item reports

Closes pandora_enterprise#7258

See merge request artica/pandorafms!4000
 2021-05-10 09:09:36 +00:00
José González 48e464542a Fixed missing spinner 2021-05-07 13:50:28 +02:00
José González 214535bdaa Revert functions_ui 2021-05-07 11:11:36 +00:00
José González c0e6bef136 Revert 2021-05-07 13:05:39 +02:00
José González 0a7c960630 Added control for autocomplete input icon 2021-05-07 12:40:38 +02:00
José González 856186ee59 Added function for control icon changes 2021-05-07 11:17:20 +02:00
fbsanchez fe932a0dd6 avoid some warnings 2021-05-07 10:50:25 +02:00
fbsanchez 2fb54dabf1 Avoid change path while adding resources in certain situations 2021-05-07 10:47:05 +02:00
José González 9ab027b286 WIP: Upload 2021-04-29 13:28:03 +02:00
marcos b6ea565118 add black theme to widget dashboard 2021-04-14 12:07:38 +02:00