3773 Commits

Author SHA1 Message Date
artica
a67a4288a1 Updated version and build strings. 2018-04-10 10:18:25 +02:00
fermin831
60f7a0ab79 Merge branch 'develop' into 2015-implementacion-de-grupos-secundarios
Conflicts:
	pandora_console/include/class/Tree.class.php
2018-04-10 09:29:14 +02:00
artica
e2b52a76f7 Auto-updated build strings. 2018-04-10 00:01:23 +02:00
enriquecd
11182e9989 Merge branch 'develop' into 2101-Comprobar-funciones-de-CLI-ceadas-el-de-integria-4261-fix-wiki
Conflicts:
	pandora_server/util/pandora_manage.pl
2018-04-09 11:48:56 +02:00
enriquecd
2c223f4d10 Add cli cluster functions - #2007 2018-04-09 11:43:41 +02:00
artica
6bf0371a85 Auto-updated build strings. 2018-04-09 00:01:22 +02:00
artica
77f26cf08f Auto-updated build strings. 2018-04-08 00:01:21 +02:00
artica
dcd57a421a Auto-updated build strings. 2018-04-07 00:01:33 +02:00
enriquecd
48c04fbaaa Fix create web module cli function - #2101 2018-04-06 15:54:48 +02:00
artica
f517edca1c Auto-updated build strings. 2018-04-06 00:01:25 +02:00
artica
4b36d86e48 Auto-updated build strings. 2018-04-05 00:01:24 +02:00
fermin831
d0c34e2ce7 [Secondary groups] Added secondary groups to linux agent and server 2018-04-04 16:05:18 +02:00
vgilc
c4aa6141e4 Merge branch '1801-migrado-cambios-jmx' into 'develop'
1801 migrado cambios jmx

See merge request artica/pandorafms!1408
2018-04-04 15:22:58 +02:00
fbsanchez
35357683cb Merge remote-tracking branch 'origin/develop' into 1801-migrado-cambios-jmx 2018-04-04 13:41:01 +02:00
fermin831
c024fec509 [Secondary groups] Fixed single secondary group update meta cache 2018-04-04 13:07:45 +02:00
enriquecd
47b611469d Fix create_web and create_policy_web CLI functions - #2101 2018-04-04 12:06:10 +02:00
artica
f863184454 Auto-updated build strings. 2018-04-04 00:01:24 +02:00
fbsanchez
8a4ee8f28d PluginTools pseudo control for as_agent/server_plugin 2018-04-03 18:22:38 +02:00
fbsanchez
7c202cbb81 PluginTools minor fix in log message 2018-04-03 17:14:11 +02:00
fbsanchez
63e644d88a Minor fix 2018-04-03 17:12:31 +02:00
fermin831
e2d61d5794 [Secondary groups] Added update cache on server 2018-04-03 15:36:33 +02:00
vgilc
c087ca8138 Merge branch '983-API-and-CLI-apply-template-components-help' into 'develop'
Add help to CLI - #983

See merge request artica/pandorafms!1404
2018-04-03 09:47:59 +02:00
fbsanchez
2380a18c6d Minor changes in PluginTools for 1801 2018-04-03 09:46:44 +02:00
artica
337822a608 Auto-updated build strings. 2018-04-03 00:01:22 +02:00
enriquecd
4f57461b71 Add help to CLI - #983 2018-04-02 15:29:59 +02:00
daniel
4086162705 fixed minor error hel manage.pl 2018-04-02 12:56:50 +02:00
artica
1ab18d6c2d Auto-updated build strings. 2018-04-02 00:01:21 +02:00
artica
4e5d2477ac Auto-updated build strings. 2018-04-01 00:01:22 +02:00
artica
727b69462a Auto-updated build strings. 2018-03-31 00:01:21 +02:00
artica
7976e0461f Auto-updated build strings. 2018-03-30 00:01:21 +02:00
artica
9ea7dc0dbb Auto-updated build strings. 2018-03-29 00:01:22 +02:00
artica
94936a46e9 Auto-updated build strings. 2018-03-28 00:01:22 +02:00
artica
ac2638ceea Auto-updated build strings. 2018-03-27 00:01:22 +02:00
artica
999edad737 Auto-updated build strings. 2018-03-26 00:01:20 +02:00
artica
b2ed2fbe45 Auto-updated build strings. 2018-03-25 00:01:20 +01:00
artica
c91e71569c Auto-updated build strings. 2018-03-24 00:01:24 +01:00
artica
dd59704729 Auto-updated build strings. 2018-03-23 00:01:21 +01:00
daniel
ad2746e6c3 fixed add help incli 2018-03-22 13:36:24 +01:00
daniel
0156bff9e6 fixed error 2018-03-22 13:33:23 +01:00
daniel
55d0ca122b fixed error 2018-03-22 13:28:18 +01:00
daniel
98355f985a merge develop 2018-03-22 13:21:48 +01:00
daniel
b61f8d5cdd add new functions cli 2018-03-22 13:18:48 +01:00
vgilc
f809a013e1 Merge branch '983-API-CLI-posibilidad-de-aplicar-templates-componentes-a-un-agente' into 'develop'
API and CLI apply template components - #983

See merge request artica/pandorafms!1319
2018-03-22 12:51:33 +01:00
enriquecd
dd02b6e2b8 Check create_web_modules CLI functions - #2101 2018-03-22 12:07:08 +01:00
enriquecd
dcb33e08b7 Merge branch 'develop' into 983-API-CLI-posibilidad-de-aplicar-templates-componentes-a-un-agente
Conflicts:
	pandora_server/util/pandora_manage.pl
2018-03-22 11:11:01 +01:00
artica
243e24e56e Auto-updated build strings. 2018-03-22 00:01:23 +01:00
fbsanchez
5e3cf3162a CLI example check/get server_address 2018-03-21 16:58:42 +01:00
artica
199b81a79c Auto-updated build strings. 2018-03-21 00:01:22 +01:00
artica
972e394a8e Auto-updated build strings. 2018-03-20 00:01:22 +01:00
artica
25efa085ce Auto-updated build strings. 2018-03-19 00:01:29 +01:00