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

2357 Commits

Author SHA1 Message Date
artica d7f59d4fd3 Auto-updated build strings. 2018-06-14 00:01:24 +02:00
artica 7a26aa3b38 Auto-updated build strings. 2018-06-13 00:01:26 +02:00
artica e4461273ab Updated version and build strings. 2018-06-12 17:28:15 +02:00
artica 5574ddd205 Auto-updated build strings. 2018-06-12 00:01:39 +02:00
artica 10e95bf447 Auto-updated build strings. 2018-06-10 00:01:23 +02:00
artica 14dd0e222b Auto-updated build strings. 2018-06-09 00:01:27 +02:00
artica 937cfb7d1e Auto-updated build strings. 2018-06-08 00:01:27 +02:00
artica 18e047d25e Auto-updated build strings. 2018-06-07 00:01:25 +02:00
artica 3fbdd3d026 Auto-updated build strings. 2018-06-06 00:01:25 +02:00
artica db4ce74311 Auto-updated build strings. 2018-06-05 00:01:23 +02:00
artica 77ccbe46a9 Auto-updated build strings. 2018-06-04 00:01:20 +02:00
artica 8138c2f8ae Auto-updated build strings. 2018-06-03 00:01:19 +02:00
artica 57ef534909 Auto-updated build strings. 2018-06-02 00:01:26 +02:00
artica ec050ba606 Auto-updated build strings. 2018-06-01 00:01:21 +02:00
artica e1cba85c6e Auto-updated build strings. 2018-05-31 00:01:21 +02:00
fermin831 5c6e22c9b6 [Rebranding] Remove delete environment vars and fixed pandora_db redefinitions 2018-05-30 11:08:48 +02:00
artica 7147667d8c Auto-updated build strings. 2018-05-30 00:01:21 +02:00
fermin831 0a2c744ef0 [Rebranding] Modified daemon to load environment vars 2018-05-29 17:32:24 +02:00
fermin831 53cbc4ebde [Rebranding] Fixed missing include in pandora_db 2018-05-29 16:50:30 +02:00
artica aa1e7ff4d2 Auto-updated build strings. 2018-05-29 00:01:28 +02:00
artica 01cce15955 Updated version and build strings. 2018-05-28 13:20:38 +02:00
fermin831 88e060893a Merge branch 'develop' into 2106-intracom-rebranding 
Conflicts resolved:
	pandora_console/operation/events/events_rss.php
 2018-05-28 12:12:16 +02:00
artica 2e4b320861 Auto-updated build strings. 2018-05-28 00:01:21 +02:00
artica 9ff98af9a5 Auto-updated build strings. 2018-05-27 00:01:26 +02:00
artica edd38ac9c8 Auto-updated build strings. 2018-05-26 00:01:24 +02:00
fermin831 7afc617e62 [Rebranding] Implemented server rebranding through environment vars 2018-05-25 12:39:30 +02:00
artica 643a07a163 Auto-updated build strings. 2018-05-25 00:01:22 +02:00
artica bd48fe4fe6 Auto-updated build strings. 2018-05-24 00:01:24 +02:00
artica e015354a99 Auto-updated build strings. 2018-05-23 00:01:24 +02:00
fermin831 e71fd399fb Merge branch 'develop' into 2106-intracom-rebranding 
Conflicts:
	pandora_console/godmode/admin_access_logs.php
	pandora_console/include/javascript/functions_pandora_networkmap.js
 2018-05-22 19:29:46 +02:00
artica 4b197ab61a Auto-updated build strings. 2018-05-22 00:01:31 +02:00
artica dff20a609b Auto-updated build strings. 2018-05-21 00:01:23 +02:00
artica 4a6859aeae Auto-updated build strings. 2018-05-20 00:01:22 +02:00
artica b7ce2f2dc8 Auto-updated build strings. 2018-05-19 00:01:38 +02:00
artica f3509d285a Auto-updated build strings. 2018-05-18 00:01:28 +02:00
fermin831 477fc9d22a [Rebranding] pandora_db 2018-05-17 18:38:26 +02:00
artica a79f3b2d05 Auto-updated build strings. 2018-05-17 00:01:23 +02:00
artica 5f8e010d01 Auto-updated build strings. 2018-05-16 00:01:21 +02:00
artica 007715fb93 Auto-updated build strings. 2018-05-15 00:01:26 +02:00
artica 3e8f9cbb34 Auto-updated build strings. 2018-05-14 00:01:23 +02:00
artica d63f316042 Auto-updated build strings. 2018-05-13 00:02:13 +02:00
artica 65f9fe1cb7 Auto-updated build strings. 2018-05-11 00:01:26 +02:00
artica e9d8af152d Auto-updated build strings. 2018-05-10 00:01:25 +02:00
vgilc 30417cd2fe Merge branch 'ent-2146-Configuracion-Tentacle' into 'develop' 
Ent 2146 configuracion tentacle

See merge request artica/pandorafms!1455
 2018-05-09 10:11:58 +02:00
artica 04e3d3071d Auto-updated build strings. 2018-05-09 00:01:23 +02:00
artica 3377ecfd64 Auto-updated build strings. 2018-05-08 00:01:23 +02:00
artica e0cf024990 Auto-updated build strings. 2018-05-07 00:01:21 +02:00
artica 6dd28d2d75 Auto-updated build strings. 2018-05-06 00:01:21 +02:00
artica b92d9c9560 Auto-updated build strings. 2018-05-05 00:01:23 +02:00
artica 770267d72e Auto-updated build strings. 2018-05-04 00:01:21 +02:00
artica ab1ca78340 Auto-updated build strings. 2018-05-02 00:01:34 +02:00
artica d6a7ca198d Auto-updated build strings. 2018-05-01 00:01:23 +02:00
fermin831 b6bc835e41 Tentacle config file is readable to all users in all packages 2018-04-30 16:22:52 +02:00
fermin831 4bc10e503b Modified launch daemon Tentacle script to use configuration file 2018-04-30 15:53:09 +02:00
artica 235f20ef86 Auto-updated build strings. 2018-04-30 00:01:56 +02:00
artica 9b1d62f999 Auto-updated build strings. 2018-04-29 00:02:00 +02:00
artica a1fa3a4ee8 Auto-updated build strings. 2018-04-28 00:01:34 +02:00
artica 7252b8f172 Auto-updated build strings. 2018-04-27 00:01:31 +02:00
artica edacc90226 Auto-updated build strings. 2018-04-26 00:01:26 +02:00
artica ec61441587 Auto-updated build strings. 2018-04-25 00:01:32 +02:00
artica de2b583583 Auto-updated build strings. 2018-04-24 00:01:30 +02:00
enriquecd b4b6852e27 Change id_os number refence and add get_cluster status function in api and CLI - #2007 2018-04-23 13:52:16 +02:00
artica d90c78ad9d Auto-updated build strings. 2018-04-23 00:01:25 +02:00
artica 1dc4b4554a Auto-updated build strings. 2018-04-22 00:01:25 +02:00
artica 1cf7efb86b Auto-updated build strings. 2018-04-21 00:01:35 +02:00
enriquecd d78c8daf5b Merge branch 'develop' into 2007-Monitorizacion-de-cluster-fase-2-cli-2 
Conflicts:
	pandora_server/util/pandora_manage.pl
 2018-04-20 10:19:16 +02:00
artica 235c1cee6c Auto-updated build strings. 2018-04-20 00:01:27 +02:00
artica 418d8b12b7 Updated version and build strings. 2018-04-19 16:05:39 +02:00
artica ee0d890361 Auto-updated build strings. 2018-04-19 00:01:25 +02:00
artica 3c8914a331 Auto-updated build strings. 2018-04-18 00:01:29 +02:00
artica bc251e58df Auto-updated build strings. 2018-04-17 00:01:28 +02:00
artica cb5c3016dc Auto-updated build strings. 2018-04-16 00:01:23 +02:00
artica 2ab79ce5e4 Auto-updated build strings. 2018-04-15 00:01:24 +02:00
artica 738b1fdd68 Auto-updated build strings. 2018-04-14 00:01:27 +02:00
artica 9f2aa451fb Auto-updated build strings. 2018-04-13 00:01:25 +02:00
artica 92fb527ff8 Auto-updated build strings. 2018-04-12 00:01:23 +02:00
artica 1ecfd4669e Auto-updated build strings. 2018-04-11 00:01:26 +02:00
artica a67a4288a1 Updated version and build strings. 2018-04-10 10:18:25 +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
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
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
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
artica c4ddcc9332 Auto-updated build strings. 2018-03-18 00:01:21 +01:00
artica ea5ef0bc42 Auto-updated build strings. 2018-03-17 00:01:23 +01:00
artica a17c7c3e34 Auto-updated build strings. 2018-03-16 00:01:21 +01:00
artica 270a43fbeb Auto-updated build strings. 2018-03-15 00:01:23 +01:00
artica fb56ebfbff Auto-updated build strings. 2018-03-14 00:01:25 +01:00
artica af5d70bd7d Updated version and build strings. 2018-03-13 11:06:33 +01:00
artica 24ff4014ff Auto-updated build strings. 2018-03-13 00:01:27 +01:00
artica a66a7fde49 Auto-updated build strings. 2018-03-12 00:01:29 +01:00
artica 6235fc381a Auto-updated build strings. 2018-03-11 00:01:29 +01:00
artica 4af8841c29 Auto-updated build strings. 2018-03-10 00:01:37 +01:00
artica 5a13db5a18 Auto-updated build strings. 2018-03-09 00:01:42 +01:00
artica f3f0d7771c Updated version and build strings. 2018-03-08 12:26:57 +01:00
artica 05fab2100d Updated version and build strings. 2018-03-08 09:47:20 +01:00
artica 89da7843ee Auto-updated build strings. 2018-03-08 00:01:34 +01:00
artica a0eff331c5 Auto-updated build strings. 2018-03-07 00:01:39 +01:00
artica 98b2aa2c8e Auto-updated build strings. 2018-03-06 00:01:36 +01:00
artica a01d65fb89 Auto-updated build strings. 2018-03-05 00:01:32 +01:00
artica 5db4a03117 Auto-updated build strings. 2018-03-04 00:01:30 +01:00
artica a3c3b1c699 Auto-updated build strings. 2018-03-03 00:01:43 +01:00
artica 6f04665c72 Auto-updated build strings. 2018-03-02 00:01:32 +01:00
artica ddbe016266 Auto-updated build strings. 2018-03-01 00:01:47 +01:00
artica 789f908b08 Auto-updated build strings. 2018-02-28 00:01:39 +01:00
artica 892d17f65c Auto-updated build strings. 2018-02-27 00:02:10 +01:00
enriquecd 3ee2f8615f API and CLI apply template components - #983 2018-02-26 19:10:53 +01:00
artica 4b9dd69a0f Auto-updated build strings. 2018-02-26 00:01:52 +01:00
artica 6eb5f20d17 Auto-updated build strings. 2018-02-25 00:02:06 +01:00
artica 4dae0c97c0 Auto-updated build strings. 2018-02-24 00:01:59 +01:00
artica effe16a275 Auto-updated build strings. 2018-02-23 00:01:27 +01:00
artica e752e26ee3 Auto-updated build strings. 2018-02-22 00:01:52 +01:00
artica cc088314b8 Auto-updated build strings. 2018-02-20 00:01:14 +01:00
artica 87ffae2d88 Auto-updated build strings. 2018-02-19 00:01:12 +01:00
artica fe1b911f02 Auto-updated build strings. 2018-02-18 00:01:12 +01:00
artica 5e6bcd34d8 Auto-updated build strings. 2018-02-17 00:01:14 +01:00