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

11781 Commits

Author SHA1 Message Date
marcos fe45afa662 Merge remote-tracking branch 'origin/develop' into ent-4226-mejoras-plugin-sap 2019-11-13 12:01:36 +01:00
artica c19d760bdb Auto-updated build strings. 2019-11-13 00:01:12 +01:00
Tatiana Llorente 484ec9ea60 Ent 4845 revision de skins 2019-11-12 18:10:58 +01:00
Daniel Rodriguez 073ca73b2a Merge branch 'ent-4670-Cambiar-tamaño-fuente-en-informes' into 'develop' 
Added token in visual styles to change the font size in items of reports - #4670

See merge request artica/pandorafms!2798
 2019-11-12 18:09:39 +01:00
fbsanchez 19d06dc061 Merge remote-tracking branch 'origin/ent-EDF' into ent-4226-mejoras-plugin-sap 2019-11-12 10:19:34 +01:00
artica 2ee4f9d88f Auto-updated build strings. 2019-11-12 00:01:09 +01:00
fbsanchez 1637b09b1e Merge branch 'ent-4774-welcome-to-pandorafms' into ent-EDF 2019-11-11 15:23:35 +01:00
fbsanchez 946ef2fae4 icon review tick badge 2019-11-11 15:23:23 +01:00
fbsanchez 53954ec853 Merge branch 'ent-4774-welcome-to-pandorafms' into ent-EDF 2019-11-11 14:26:23 +01:00
fbsanchez 65f5223698 validation alerts 2019-11-11 14:26:04 +01:00
fbsanchez 0c5af7ea24 minor fixes 2019-11-11 13:46:42 +01:00
fbsanchez 0b610cd8ba Merge branch 'ent-4774-welcome-to-pandorafms' into ent-EDF 2019-11-11 13:39:08 +01:00
fbsanchez 430af38fa6 minor fixes in flow control 2019-11-11 13:38:27 +01:00
Luis f57f87b50b Ent 4834 pandora custom logo text on conf 2019-11-11 13:33:37 +01:00
artica c390befc2a Auto-updated build strings. 2019-11-11 00:01:07 +01:00
artica 7e275febcd Auto-updated build strings. 2019-11-10 00:01:07 +01:00
artica cba38680bd Auto-updated build strings. 2019-11-09 00:01:09 +01:00
artica c8b39740a9 Auto-updated build strings. 2019-11-08 11:05:59 +01:00
fbsanchez cf0a06f216 Merge branch 'ent-4766-feedback-de-ayudas' into ent-EDF 2019-11-07 19:41:36 +01:00
fbsanchez 36ae77a33c minor fix 2019-11-07 19:41:23 +01:00
fbsanchez a8bdb68cac Merge branch 'ent-4766-feedback-de-ayudas' into ent-EDF 2019-11-07 19:40:23 +01:00
fbsanchez 4905b18888 Fulfill help path and mail check 2019-11-07 19:39:50 +01:00
fbsanchez 9387f59979 Merge branch 'ent-4766-feedback-de-ayudas' into ent-EDF 2019-11-07 18:39:06 +01:00
fbsanchez 424aa10555 style minor changes 2019-11-07 18:38:52 +01:00
fbsanchez c4779f6f91 Merge branch 'ent-4766-feedback-de-ayudas' into ent-EDF 2019-11-07 18:33:51 +01:00
fbsanchez 307eabc7b9 Merge remote-tracking branch 'origin/develop' into ent-EDF 2019-11-07 18:33:37 +01:00
fbsanchez cb131c7895 Some CDE and styling in help feedback 2019-11-07 18:33:03 +01:00
fbsanchez 763ec6772c Help feedback style improved 2019-11-07 17:26:32 +01:00
Alejandro Fraguas adc0f24f8e Merge branch 'ent-3178-integrar-terminal-web-en-la-consola-de-pandora-y-explorar-otras-utilidades-anyterm-replace' into 'develop' 
Ent 3178 integrar terminal web en la consola de pandora y explorar otras utilidades anyterm replace

See merge request artica/pandorafms!2825
 2019-11-07 15:48:12 +01:00
fbsanchez ef14de075e Merge branch 'ent-4774-welcome-to-pandorafms' into ent-EDF 2019-11-07 14:06:07 +01:00
fbsanchez 5fe515a3ed Fixed welcome flow 2019-11-07 14:05:42 +01:00
Daniel Rodriguez a550f2d9d3 Merge branch 'ent-4403-8401-acanovas-ipam-creacion-de-superredes' into 'develop' 
added function to convert cidr prefixes to mask

See merge request artica/pandorafms!2832
 2019-11-07 11:47:24 +01:00
fbsanchez 7c68595241 Merge remote-tracking branch 'origin/ent-4774-welcome-to-pandorafms' into ent-EDF 2019-11-07 10:43:24 +01:00
fbsanchez 6e637954b8 Merge remote-tracking branch 'origin/develop' into ent-EDF 2019-11-07 10:43:15 +01:00
fbsanchez d080f1d6a7 Welcome pack 2019-11-07 10:42:46 +01:00
Daniel Rodriguez 1006c54687 Merge branch 'ent-4928-Bug-generacion-PDF-con-set-initial-date' into 'develop' 
Ent 4928 bug generacion pdf con set initial date

See merge request artica/pandorafms!2866
 2019-11-07 09:48:42 +01:00
fbsanchez 79d165b164 Merge remote-tracking branch 'origin/develop' into ent-EDF 2019-11-06 20:01:28 +01:00
Daniel Rodriguez 76d9ca9db5 Merge branch 'ent-4853-set-module-data-no-funciona-API' into 'develop' 
Ent 4853 set module data no funciona api

See merge request artica/pandorafms!2841
 2019-11-06 17:19:51 +01:00
Daniel Rodriguez e81932cf0d Merge branch 'ent-4809-Seleccion-de-tamaño-de-fuente-en-Agent-detail' into 'develop' 
Fixed visual styles ticket 4809

See merge request artica/pandorafms!2867
 2019-11-06 16:23:51 +01:00
fbsanchez 98237a8d34 Merge remote-tracking branch 'origin/develop' into ent-EDF 
Conflicts:
	pandora_console/general/header.php
 2019-11-06 15:36:53 +01:00
Daniel Rodriguez 34bfb762fd Merge branch 'ent-4857-Bug-color-pagina-eventos' into 'develop' 
Ent 4857 bug color pagina eventos

See merge request artica/pandorafms!2834
 2019-11-06 15:27:48 +01:00
Alejandro Fraguas 37ffff12eb Merge branch '4727-macros-grupos-secundarios' into 'develop' 
4727 macros grupos secundarios

See merge request artica/pandorafms!2811
 2019-11-06 12:20:39 +01:00
Daniel Rodriguez 5a34ec51d2 Merge branch 'ent-4687-api-get-all-agents-recursion' into 'develop' 
Added recursion to api_get_all_agents

See merge request artica/pandorafms!2753
 2019-11-06 10:38:17 +01:00
Tatiana Llorente 1a34e488b6 Fixed bug in report date in pdf reports 2019-11-06 10:34:08 +01:00
manuel a486738920 Fixed visual styles ticket 4809 2019-11-06 10:31:26 +01:00
Tatiana Llorente 05e424a24e Merge remote-tracking branch 'origin/develop' into ent-4623-Exportar-a-CSV-los-eventos-separador-erroneo 
Conflicts:
	pandora_console/include/functions_ui.php
 2019-11-05 17:25:56 +01:00
Tatiana Llorente 87c5d0025b Merge remote-tracking branch 'origin/develop' into ent-4623-Exportar-a-CSV-los-eventos-separador-erroneo 2019-11-05 17:24:10 +01:00
Daniel Rodriguez 35d87400fd Merge branch 'ent-4892-HTML-custom-report-date-vacio' into 'develop' 
Ent 4892 html custom report date vacio

See merge request artica/pandorafms!2847
 2019-11-05 17:19:40 +01:00
Luis b707ebd4a4 Added docs and support urls in console. Fixed bugs 2019-11-05 17:09:29 +01:00
Daniel Rodriguez b7d8323583 Merge branch 'ent-3687-get-agents-id-name-by-alias-api-cli' into 'develop' 
Added API and cli function get_agents_id_by_alias

See merge request artica/pandorafms!2802
 2019-11-05 17:08:32 +01:00