Commit Graph

2248 Commits

Author SHA1 Message Date
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