Commit Graph

17813 Commits

Author SHA1 Message Date
fbsanchez 4968ff3878 Included library from enterprise 2018-08-02 10:07:47 +02:00
fbsanchez a51851cc79 Moved vconsole templates to enterprise 2018-08-02 09:35:16 +02:00
fbsanchez 9924c7877a Weird fix agentmodule retrieval proc. 2018-08-01 15:17:58 +02:00
fbsanchez 1b962ad53e Merge branch '2415-Plantillas_de_Consola_visual' of brutus.artica.lan:artica/pandorafms into 2415-Plantillas_de_Consola_visual 2018-08-01 14:54:21 +02:00
fbsanchez a709d0af9f Minor fix vconsole templates 2018-08-01 14:54:14 +02:00
fbsanchez e4e97fc8af Minor fix vconsole templates 2018-08-01 14:52:56 +02:00
fbsanchez 1369333ab8 Minor fix vconsole template 2018-08-01 13:52:34 +02:00
daniel 2a7e710b9e fixed errors in template wizar visual console 2018-08-01 13:51:45 +02:00
daniel 62d2b509ad fixed minor error 2018-08-01 13:21:04 +02:00
daniel dc56e0712c delete template visual console 2018-08-01 13:20:20 +02:00
fbsanchez 11372e5b94 Delete vconsole template method 2018-08-01 13:12:10 +02:00
daniel e14f1580a1 Merge branch '2415-Plantillas_de_Consola_visual' of brutus.artica.lan:artica/pandorafms into 2415-Plantillas_de_Consola_visual 2018-08-01 13:10:20 +02:00
daniel 49aeb349eb create form templates visual console 2018-08-01 13:10:10 +02:00
fbsanchez 8e52d9e184 added visual_map_instanciate_template 2018-08-01 13:05:27 +02:00
fbsanchez e2e07f2724 Added visual_map_get_user_layout_templates 2018-08-01 12:54:08 +02:00
fbsanchez dd0d9e4fa5 Fixed vconsole template name & group_id 2018-08-01 12:28:17 +02:00
daniel 92911e8fb8 fixed js wizard template visual console 2018-08-01 12:24:27 +02:00
fbsanchez b694eded15 Merge branch '2415-Plantillas_de_Consola_visual' of brutus.artica.lan:artica/pandorafms into 2415-Plantillas_de_Consola_visual 2018-08-01 12:22:34 +02:00
fbsanchez f10058428f Added backend functions to create vconsole template 2018-08-01 12:22:13 +02:00
daniel 333e5c874c create template visual console 2018-08-01 11:52:20 +02:00
daniel cb77a299bb add templates console visual 2018-08-01 09:58:48 +02:00
artica 1088c5390d Auto-updated build strings. 2018-08-01 00:01:22 +02:00
artica 2dc5bc1139 Auto-updated build strings. 2018-07-31 00:01:23 +02:00
artica 42ad2cc924 Auto-updated build strings. 2018-07-30 00:01:22 +02:00
artica 258f6b915e Auto-updated build strings. 2018-07-29 00:01:20 +02:00
artica 329bcdbc8b Auto-updated build strings. 2018-07-28 00:02:05 +02:00
artica 284f992819 Auto-updated build strings. 2018-07-27 00:01:29 +02:00
vgilc 6bd1768335 Merge branch '2248-5730-Añadir-elementos-a-la-vista-de-eventos3' into 'develop'
fix bug in metaconsole view events

See merge request artica/pandorafms!1638
2018-07-26 17:15:30 +02:00
vgilc 9e8481537b Merge branch 'develop' into '2248-5730-Añadir-elementos-a-la-vista-de-eventos3'
# Conflicts:
#   pandora_console/godmode/events/custom_events.php
2018-07-26 17:08:15 +02:00
vgilc 33cee703e3 Merge branch '2248-5730-Añadir-elementos-a-la-vista-de-eventos2' into 'develop'
fix bug in metaconsole view events

See merge request artica/pandorafms!1636
2018-07-26 16:59:35 +02:00
manuel.montes 4b23824eb4 fix bug in metaconsole view events 2018-07-26 15:41:52 +02:00
manuel.montes a476d008ac fix bug in metaconsole view events 2018-07-26 15:30:49 +02:00
vgilc ab900f1e54 Merge branch '2076-Mejoras_en_gestion_de_politicas_desde_Metaconsola_3' into 'develop'
fixed errors in policies metaconsole

See merge request artica/pandorafms!1635
2018-07-26 15:09:28 +02:00
daniel 3985316a9b fixed errors in policies metaconsole 2018-07-26 12:41:09 +02:00
artica fb73a0b8b2 Auto-updated build strings. 2018-07-26 00:01:30 +02:00
vgilc 5bfeac1b87 Merge branch '1885-ue-configurador-automatico-de-agentes' into 'develop'
Added DB changes to support ProvisioningServer 2

See merge request artica/pandorafms!1587
2018-07-25 11:21:51 +02:00
artica b0434e7f1d Auto-updated build strings. 2018-07-25 00:01:26 +02:00
fbsanchez 05bee8c856 Merge remote-tracking branch 'origin/develop' into 1885-ue-configurador-automatico-de-agentes 2018-07-24 18:43:45 +02:00
fbsanchez ae6d7139b4 is_management_allowed fix 2018-07-24 18:24:03 +02:00
fbsanchez 581cf7c5a0 Added management_allowed 2018-07-24 17:55:33 +02:00
artica 7748fcf5ce Updated version and build strings. 2018-07-24 17:45:16 +02:00
vgilc bb655488a5 Merge branch '2076-Mejoras_en_gestion_de_politicas_desde_Metaconsola' into 'develop'
fixed error pandoradb metapolicies

See merge request artica/pandorafms!1630
2018-07-24 16:03:12 +02:00
daniel 65ff6b260c fixed error pandoradb metapolicies 2018-07-24 13:12:46 +02:00
artica 33dd9d5886 Auto-updated build strings. 2018-07-24 00:01:28 +02:00
fbsanchez ba676e13e3 Added autoconfiguration menu 2018-07-23 20:11:35 +02:00
fbsanchez 079b2437b6 Merge remote-tracking branch 'origin/develop' into 1885-ue-configurador-automatico-de-agentes 2018-07-23 18:06:02 +02:00
vgilc a5c1caab1f Merge branch '2229-Gestion_de_politicas_desde_API' into 'develop'
add functions api for policies node

See merge request artica/pandorafms!1626
2018-07-23 17:31:09 +02:00
daniel 9236285a98 remove functions api to api enterprise because policies is enterprise 2018-07-23 17:04:07 +02:00
vgilc 44ad0c31d5 Merge branch '2248-5730-Añadir-elementos-a-la-vista-de-eventos' into 'develop'
Add items to the view events

See merge request artica/pandorafms!1623
2018-07-23 11:22:23 +02:00
daniel f05ba656e1 add functions api for policies node 2018-07-23 08:59:08 +02:00