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

4462 Commits

Author SHA1 Message Date
artica 0dd12259c1 Auto-updated build strings. 2022-04-16 01:00:19 +02:00
artica 0c4aa6978f Auto-updated build strings. 2022-04-15 01:00:28 +02:00
artica 5fcd51eccb Auto-updated build strings. 2022-04-14 01:00:32 +02:00
Ramon Novoa 8bc84bf0b4 Add a watchdog for Tentacle Server to pandora_ha. 2022-04-13 13:14:54 +02:00
artica d3fafcfaa8 Auto-updated build strings. 2022-04-13 01:00:40 +02:00
artica acf31f9dfd Auto-updated build strings. 2022-04-12 01:00:51 +02:00
artica 773071946f Auto-updated build strings. 2022-04-11 01:00:21 +02:00
artica 2c87abc4f8 Auto-updated build strings. 2022-04-10 01:00:24 +02:00
artica fbfd97b113 Auto-updated build strings. 2022-04-09 01:00:12 +02:00
artica d2787675d2 Auto-updated build strings. 2022-04-08 01:00:51 +02:00
artica 63c63a2616 Auto-updated build strings. 2022-04-07 01:00:28 +02:00
artica b96b8b2a57 Updated version and build strings. 2022-04-06 13:12:18 +02:00
artica 7cb547dee4 Auto-updated build strings. 2022-04-06 01:00:46 +02:00
artica d0f1723789 Auto-updated build strings. 2022-04-05 01:00:47 +02:00
artica 8a5875f987 Auto-updated build strings. 2022-04-04 01:00:24 +02:00
artica 774d2a6777 Auto-updated build strings. 2022-04-03 01:00:26 +02:00
artica 8502bf3ae1 Auto-updated build strings. 2022-04-02 01:00:39 +02:00
artica 4218413b82 Auto-updated build strings. 2022-04-01 01:00:40 +02:00
Daniel Rodriguez 066ae12d43 Merge branch 'ent-8667-registros-duplicados-en-entornos-centralizados' into 'develop' 
Ensure there are no duplicates in pandora_ha execution

See merge request artica/pandorafms!4753
 2022-03-31 11:50:13 +00:00
artica 35bcec046a Auto-updated build strings. 2022-03-31 01:00:46 +02:00
Daniel Rodriguez 4b086448da Merge branch 'ent-8565-control-bloqueos-pandora_db-con-historico' into 'develop' 
Fix locking issues in pandora_db.

See merge request artica/pandorafms!4786
 2022-03-30 11:11:16 +00:00
Daniel Rodriguez d2779800e8 Merge branch 'ent-8702-no-se-actualiza-token-db_maintenance-en-la-db-de-historico-al-pasar-el-pandora_db' into 'develop' 
added missing timestamp to pandora_db process on historical database

See merge request artica/pandorafms!4780
 2022-03-30 07:43:53 +00:00
artica 01c2fd5da4 Auto-updated build strings. 2022-03-30 01:00:52 +02:00
artica a54344348c Auto-updated build strings. 2022-03-29 01:00:47 +02:00
Ramon Novoa ecd77dffba Fix locking issues in pandora_db. 
Implement a persistent lock using Pandora FMS's database. Ref.
pandora_enterprise#8565.
 2022-03-28 20:56:53 +02:00
artica 775942e0b6 Auto-updated build strings. 2022-03-28 01:00:39 +02:00
artica 859f689ade Auto-updated build strings. 2022-03-27 01:00:30 +01:00
artica 5f1b81b089 Auto-updated build strings. 2022-03-26 01:00:50 +01:00
Daniel Rodriguez c6b1fd858a Merge branch 'ent-8694-sorpresa-en-fenix-con-autoaplicacion-de-politicas-de-grupo-v760' into 'develop' 
Fix groups linked to non-existent policies

See merge request artica/pandorafms!4769
 2022-03-25 10:45:00 +00:00
artica 0bf8c75d2f Auto-updated build strings. 2022-03-25 01:00:41 +01:00
fbsanchez 1e7a73829a added missing timestamp to pandora_db process on historical database 2022-03-24 19:23:35 +01:00
Daniel Rodriguez 64947b75cd Merge branch 'ent-8338-POST-Dejar-de-codificar-los-custom-data-en-base64-eventos' into 'develop' 
change storage format of custom data field in DB

See merge request artica/pandorafms!4766
 2022-03-24 16:19:39 +00:00
artica f190a85560 Auto-updated build strings. 2022-03-24 01:00:42 +01:00
alejandro.campos@artica.es 5757d4a933 implement csv export of events in meta and minor fixes 2022-03-23 14:24:39 +01:00
artica 3dcdd13fe4 Auto-updated build strings. 2022-03-23 01:00:43 +01:00
artica 79162a787b Auto-updated build strings. 2022-03-22 01:00:46 +01:00
fbsanchez 71c73bc374 Fix groups linked to non-existent policies 2022-03-21 14:04:17 +01:00
artica c736fbe726 Auto-updated build strings. 2022-03-21 01:00:36 +01:00
artica 95057697d8 Auto-updated build strings. 2022-03-20 01:00:36 +01:00
artica db28f5fbbe Auto-updated build strings. 2022-03-19 01:00:42 +01:00
alejandro.campos@artica.es e1ec4ce40e change storage format of custom data field in DB 2022-03-18 11:23:29 +01:00
artica e088c0e564 Auto-updated build strings. 2022-03-18 01:00:41 +01:00
Daniel Rodriguez 8ff3b4f0ee Merge branch 'ent-8243-Netflow-nuevo-informe-top-n-connections' into 'develop' 
Ent 8243 netflow nuevo informe top n connections

See merge request artica/pandorafms!4709
 2022-03-17 08:56:07 +00:00
artica 1bc96bb92d Auto-updated build strings. 2022-03-17 01:00:40 +01:00
artica f04a5be8e4 Auto-updated build strings. 2022-03-16 01:00:48 +01:00
alejandro.campos@artica.es 7d38617278 Merge remote-tracking branch 'origin/develop' into ent-8243-Netflow-nuevo-informe-top-n-connections 2022-03-15 17:09:19 +01:00
artica 1ee2387d6c Auto-updated build strings. 2022-03-15 01:00:17 +01:00
artica 72fce3b9a3 Auto-updated build strings. 2022-03-14 01:00:14 +01:00
artica e7637d2f07 Auto-updated build strings. 2022-03-13 01:00:15 +01:00
artica a232747e01 Auto-updated build strings. 2022-03-12 01:00:15 +01:00
artica 36aea89db6 Auto-updated build strings. 2022-03-11 01:00:18 +01:00
artica 047f40a3f0 Auto-updated build strings. 2022-03-10 01:00:17 +01:00
fbsanchez c0ff8b8294 Ensure there are no duplicates in pandora_ha execution 2022-03-09 13:46:40 +01:00
artica 18e6bd1c22 Auto-updated build strings. 2022-03-09 01:00:14 +01:00
Ramon Novoa 9f03db37c1 Fix module precedence for pandora_ha. 2022-03-08 12:10:39 +01:00
artica 223475d546 Auto-updated build strings. 2022-03-08 01:00:06 +01:00
artica d9f7ea4038 Auto-updated build strings. 2022-03-07 01:00:15 +01:00
artica 5f08afca26 Auto-updated build strings. 2022-03-06 01:00:16 +01:00
artica 69be7b1b55 Auto-updated build strings. 2022-03-05 01:00:19 +01:00
artica e3c80e015d Auto-updated build strings. 2022-03-04 01:00:14 +01:00
artica 4a7160ce39 Auto-updated build strings. 2022-03-03 01:00:15 +01:00
artica f34722841f Auto-updated build strings. 2022-03-02 01:00:07 +01:00
Daniel Rodriguez f5bf7bbd72 Merge branch 'ent-5620-nuevo-compilador-para-backend' into 'develop' 
Ent 5620 nuevo compilador para backend

See merge request artica/pandorafms!4653
 2022-03-01 18:13:27 +00:00
artica 6f23817373 Auto-updated build strings. 2022-03-01 01:00:20 +01:00
artica 2f3f82bf4c Auto-updated build strings. 2022-02-28 01:00:15 +01:00
artica 5ec4632216 Auto-updated build strings. 2022-02-27 01:00:14 +01:00
artica 8d6389c528 Auto-updated build strings. 2022-02-26 01:00:15 +01:00
artica 144f3f2a10 Auto-updated build strings. 2022-02-25 01:00:21 +01:00
Ramon Novoa 86db050753 Merge remote-tracking branch 'origin/develop' into ent-5620-nuevo-compilador-para-backend 2022-02-24 18:47:25 +01:00
Ramon Novoa 49512027e3 Fix pidof_pandora_ha to work with PAR::Packer binaries. 2022-02-24 18:03:33 +01:00
artica 2cac1fed32 Auto-updated build strings. 2022-02-24 01:00:19 +01:00
Daniel Rodriguez e2d6b30d51 Merge branch 'ent-7821-pandora-db-historico-solo-ejecute-funciones-historico' into 'develop' 
Run only a subset of maintenance tasks on the history DB.

See merge request artica/pandorafms!4675
 2022-02-23 08:38:31 +00:00
artica df94b6ce4a Auto-updated build strings. 2022-02-23 01:00:18 +01:00
artica 4eaee57c75 Auto-updated build strings. 2022-02-22 01:00:51 +01:00
alejandro.campos@artica.es 659408ee44 Implement new netflow item 2022-02-21 11:44:31 +01:00
artica 9ddc8768d4 Auto-updated build strings. 2022-02-21 01:00:18 +01:00
artica 2fe7227190 Auto-updated build strings. 2022-02-20 01:00:17 +01:00
artica db4540cdb5 Auto-updated build strings. 2022-02-19 01:00:22 +01:00
artica 5e69f1719e Auto-updated build strings. 2022-02-18 01:00:19 +01:00
artica d65eaed8ba Auto-updated build strings. 2022-02-17 01:00:08 +01:00
artica b27dd1c3ef Updated version and build strings. 2022-02-16 17:27:01 +01:00
artica a6583e7010 Auto-updated build strings. 2022-02-16 01:00:21 +01:00
artica bcde7814af Auto-updated build strings. 2022-02-15 01:00:20 +01:00
artica 06321f438b Auto-updated build strings. 2022-02-14 01:00:20 +01:00
artica 33f256e9b5 Auto-updated build strings. 2022-02-13 01:00:15 +01:00
artica c40b4bbe9b Auto-updated build strings. 2022-02-12 01:00:21 +01:00
artica a39232f227 Auto-updated build strings. 2022-02-11 01:00:23 +01:00
artica 1d86c1ea48 Auto-updated build strings. 2022-02-10 01:00:21 +01:00
artica 98fc41c385 Auto-updated build strings. 2022-02-09 01:00:22 +01:00
artica b47003a7b4 Auto-updated build strings. 2022-02-08 01:00:17 +01:00
artica 11dc01c0c8 Auto-updated build strings. 2022-02-07 01:00:13 +01:00
artica c092748d0a Auto-updated build strings. 2022-02-06 01:00:16 +01:00
artica 2fc9625741 Auto-updated build strings. 2022-02-05 01:00:21 +01:00
artica 887162322c Auto-updated build strings. 2022-02-04 01:00:21 +01:00
artica 7d405d8ded Auto-updated build strings. 2022-02-03 01:00:20 +01:00
Ramon Novoa f37e8bb504 Run only a subset of maintenance tasks on the history DB. 
Ref. pandora_enterprise#7821.
 2022-02-02 15:19:07 +01:00
artica 1185111e19 Auto-updated build strings. 2022-02-02 01:00:21 +01:00
artica 9e12abcfc6 Auto-updated build strings. 2022-02-01 01:00:17 +01:00
artica 73b754f52d Auto-updated build strings. 2022-01-31 01:00:10 +01:00
artica 8001f6b1f2 Auto-updated build strings. 2022-01-30 01:00:15 +01:00
artica 6ffef13b9a Auto-updated build strings. 2022-01-29 01:00:20 +01:00
artica b23f101812 Auto-updated build strings. 2022-01-28 01:00:20 +01:00
artica 4da16bedf8 Auto-updated build strings. 2022-01-27 01:00:23 +01:00
artica 11e0c99e74 Auto-updated build strings. 2022-01-26 01:00:23 +01:00
Ramon Novoa 74bfe39690 Merge remote-tracking branch 'origin/develop' into master-alt 2022-01-25 15:41:30 +01:00
artica bdae223944 Auto-updated build strings. 2022-01-25 01:00:20 +01:00
artica cc7b87344b Auto-updated build strings. 2022-01-24 01:00:16 +01:00
artica 0ca0123a27 Auto-updated build strings. 2022-01-23 01:00:17 +01:00
artica 4781c7f680 Auto-updated build strings. 2022-01-22 01:00:22 +01:00
artica 480d475a75 Auto-updated build strings. 2022-01-21 01:00:20 +01:00
artica 42d1ccbc13 Auto-updated build strings. 2022-01-20 01:00:18 +01:00
artica a8150e3cb5 Auto-updated build strings. 2022-01-19 01:00:19 +01:00
artica 49bf10f0f8 Auto-updated build strings. 2022-01-18 01:00:39 +01:00
artica 98660cd0e3 Auto-updated build strings. 2022-01-17 01:00:26 +01:00
artica 84c4b52d57 Auto-updated build strings. 2022-01-16 01:00:16 +01:00
artica e8b594a03b Auto-updated build strings. 2022-01-15 01:00:18 +01:00
artica 55f8f09894 Auto-updated build strings. 2022-01-14 01:00:19 +01:00
artica 22305d7221 Auto-updated build strings. 2022-01-13 01:00:20 +01:00
Daniel Rodriguez 172b34ee12 Merge branch 'ent-8407-parametro-erroneo-days_purge_ncm' into 'develop' 
errata fix

See merge request artica/pandorafms!4597
 2022-01-12 12:18:55 +00:00
artica f10c1d3017 Auto-updated build strings. 2022-01-12 01:00:57 +01:00
artica 1afcf787b0 Auto-updated build strings. 2022-01-11 01:00:19 +01:00
artica cc58138f11 Auto-updated build strings. 2022-01-10 01:00:15 +01:00
artica 9b48d43374 Auto-updated build strings. 2022-01-09 01:00:16 +01:00
artica 18909156dd Auto-updated build strings. 2022-01-08 01:00:19 +01:00
artica 2b560d8806 Auto-updated build strings. 2022-01-07 01:00:18 +01:00
artica f44803eec2 Auto-updated build strings. 2022-01-06 01:00:19 +01:00
artica 68e63bd5fb Auto-updated build strings. 2022-01-05 01:00:20 +01:00
artica 13c3a6f27d Auto-updated build strings. 2022-01-04 01:00:18 +01:00
artica 31885b1ca9 Auto-updated build strings. 2022-01-03 01:00:15 +01:00
artica 8e82247c45 Auto-updated build strings. 2022-01-02 01:00:14 +01:00
artica 1f3fb9dfea Auto-updated build strings. 2022-01-01 01:00:16 +01:00
artica 8908e5c1b3 Auto-updated build strings. 2021-12-31 01:00:16 +01:00
artica d16734cced Auto-updated build strings. 2021-12-30 01:00:15 +01:00
artica d46435a0ad Auto-updated build strings. 2021-12-29 01:00:16 +01:00
artica 6cfd091d0e Auto-updated build strings. 2021-12-28 01:00:17 +01:00
artica 60a4d1cfc0 Auto-updated build strings. 2021-12-27 01:00:14 +01:00
artica 78657f0e7e Auto-updated build strings. 2021-12-26 01:00:15 +01:00
artica 2d0531e0a6 Auto-updated build strings. 2021-12-25 01:00:19 +01:00
artica 3da9a8ab91 Auto-updated build strings. 2021-12-24 01:00:22 +01:00
artica e7949e3480 Auto-updated build strings. 2021-12-23 01:00:17 +01:00
artica f534f8357d Auto-updated build strings. 2021-12-22 01:00:19 +01:00
artica ed4e1e4be4 Auto-updated build strings. 2021-12-21 01:00:19 +01:00
fbsanchez b27966aa18 errata fix 2021-12-20 15:50:42 +01:00
artica 0c1829a555 Auto-updated build strings. 2021-12-20 01:00:16 +01:00
artica 0d3d666a52 Auto-updated build strings. 2021-12-19 01:00:17 +01:00
artica b808f6fa0b Auto-updated build strings. 2021-12-18 01:00:21 +01:00
Ramon Novoa ad0b8db4d0 Merge remote-tracking branch 'origin/master' into master-alt 2021-12-17 10:32:32 +01:00
artica 95b85284dd Auto-updated build strings. 2021-12-17 01:00:21 +01:00
artica 231221830b Auto-updated build strings. 2021-12-16 01:00:18 +01:00
artica 34204d4224 Auto-updated build strings. 2021-12-15 01:00:23 +01:00
artica 6d054051ea Updated version and build strings. 2021-12-14 15:32:04 +01:00
fbsanchez f852df2f1c Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2 
Conflicts:
	pandora_console/extras/mr/51.sql
 2021-12-14 11:03:04 +01:00
artica 859c632132 Auto-updated build strings. 2021-12-14 01:00:20 +01:00
artica 88fe0b69cc Auto-updated build strings. 2021-12-13 01:00:16 +01:00
artica 19b8730c07 Auto-updated build strings. 2021-12-12 01:00:17 +01:00
artica 8ba6a05d1f Auto-updated build strings. 2021-12-11 01:00:19 +01:00
artica 3dd92397f9 Auto-updated build strings. 2021-12-10 01:00:20 +01:00
artica e7b1bfd368 Auto-updated build strings. 2021-12-09 01:00:16 +01:00
artica 67c8a846b9 Auto-updated build strings. 2021-12-08 01:00:17 +01:00
fbsanchez 1ab02c4c0c cleanup old ncm data keeping 1 data per type and agent 2021-12-07 16:19:50 +01:00
artica 4925aaae18 Auto-updated build strings. 2021-12-07 01:00:17 +01:00
artica 3e0e41038f Auto-updated build strings. 2021-12-06 01:00:16 +01:00
artica f1482dc812 Auto-updated build strings. 2021-12-05 01:00:17 +01:00
artica fcff0eeafd Auto-updated build strings. 2021-12-04 01:00:20 +01:00
artica c2348fdc3e Auto-updated build strings. 2021-12-03 01:00:22 +01:00
artica e693f7c3a2 Auto-updated build strings. 2021-12-02 01:00:18 +01:00
artica b63a33026b Auto-updated build strings. 2021-12-01 01:00:20 +01:00
artica 622d125b36 Auto-updated build strings. 2021-11-30 01:00:24 +01:00
artica 1bbcf965a8 Auto-updated build strings. 2021-11-29 01:00:15 +01:00
artica 7631585546 Auto-updated build strings. 2021-11-28 01:00:16 +01:00
artica 800faaf504 Auto-updated build strings. 2021-11-27 01:00:46 +01:00
artica b1a55ad102 Auto-updated build strings. 2021-11-26 01:00:21 +01:00
Daniel Rodriguez 05e61492c0 Merge branch 'ent-8228-Se-puede-crear/editar/borrar-un-usuario-desde-CLI-en-nodo-centralizado' into 'develop' 
Ent 8228 se puede crear/editar/borrar un usuario desde cli en nodo centralizado

See merge request artica/pandorafms!4544
 2021-11-25 10:52:58 +00:00
Daniel Rodriguez f66d6e7f9c Merge branch 'ent-8224-Se-puede-crear/editar/borrar-un-grupo-desde-el-CLI-en-nodo-centralizado' into 'develop' 
Ent 8224 se puede crear/editar/borrar un grupo desde el cli en nodo centralizado

See merge request artica/pandorafms!4542
 2021-11-25 10:52:08 +00:00
artica 1f428a25ad Auto-updated build strings. 2021-11-25 01:00:20 +01:00
Daniel Maya 922088c306 resolved conflict 2021-11-24 17:48:34 +01:00
Daniel Maya 4185e34984 Merge branch 'develop' into ent-8228-Se-puede-crear/editar/borrar-un-usuario-desde-CLI-en-nodo-centralizado 2021-11-24 17:47:33 +01:00
Daniel Maya 0d2e4a99a3 resolved conflict 2021-11-24 17:46:23 +01:00
Daniel Maya 3cc3cef7fa oMerge branch 'develop' into ent-8224-Se-puede-crear/editar/borrar-un-grupo-desde-el-CLI-en-nodo-centralizado 2021-11-24 17:36:48 +01:00
Daniel Maya 716e04a6b1 #8224 Fixed print_log 2021-11-24 16:11:32 +01:00
Daniel Maya f52dc0c319 #8228 Fixed print_log 2021-11-24 16:07:20 +01:00
Daniel Rodriguez 07ef0477af Merge branch 'ent-8301-Fallo-pandora-manage-pl' into 'develop' 
minor fix

See merge request artica/pandorafms!4548
 2021-11-24 10:23:48 +00:00
artica 98f4bfbcc1 Auto-updated build strings. 2021-11-24 01:00:10 +01:00
Daniel Barbero Martin e0fec6470d minor fix 2021-11-23 18:04:34 +01:00
Daniel Maya 90739088f4 #8228 Added centralised node check 2021-11-23 12:43:07 +01:00
Daniel Maya c5588197f2 #8224 centralised node check added 2021-11-23 12:23:27 +01:00
artica fee6b06a2a Updated version and build strings. 2021-11-23 11:28:02 +01:00
artica feedce5a61 Auto-updated build strings. 2021-11-23 01:00:18 +01:00
artica 9474dc9dbc Auto-updated build strings. 2021-11-22 01:00:09 +01:00
artica 956e1bd82b Auto-updated build strings. 2021-11-21 01:00:14 +01:00
artica 1751faac96 Auto-updated build strings. 2021-11-20 01:00:24 +01:00
Daniel Barbero Martin c52e11e91a Merge remote-tracking branch 'origin/develop' into ent-7503-Calendarios-para-dias-especiales 
Conflicts:
	pandora_console/extras/mr/51.sql
 2021-11-19 08:12:22 +01:00
artica f18a575b2a Auto-updated build strings. 2021-11-19 01:00:17 +01:00
artica a5cfe3869c Auto-updated build strings. 2021-11-18 01:00:18 +01:00
artica 7a290bfac6 Auto-updated build strings. 2021-11-17 01:00:19 +01:00
artica 7b717bcc6d Auto-updated build strings. 2021-11-16 01:00:20 +01:00
artica 203aa3ef8a Auto-updated build strings. 2021-11-15 01:00:15 +01:00
artica bb771ec140 Auto-updated build strings. 2021-11-14 01:00:16 +01:00
artica 94fadddc80 Auto-updated build strings. 2021-11-13 01:00:19 +01:00
artica bfa8dc4473 Auto-updated build strings. 2021-11-12 01:00:07 +01:00
artica bf0be017b6 Updated version and build strings. 2021-11-11 19:06:08 +01:00
Ramon Novoa 55532ab0ab Merge commit '6081384ef968a53b3c9cec84b984d378b85afde6' into master-alt 2021-11-11 18:42:27 +01:00
artica b5cc63c159 Auto-updated build strings. 2021-11-11 01:00:19 +01:00
artica 3069c89e6e Auto-updated build strings. 2021-11-10 01:00:15 +01:00
artica 707bee66c1 Auto-updated build strings. 2021-11-09 01:01:01 +01:00
Daniel Barbero Martin 900a37ad5d Merge remote-tracking branch 'origin/develop' into ent-7503-Calendarios-para-dias-especiales 2021-11-08 08:54:41 +01:00
artica df48e7f73d Auto-updated build strings. 2021-11-08 01:00:17 +01:00
artica b2db6064bf Auto-updated build strings. 2021-11-07 01:00:17 +01:00
artica 3e9bc55e68 Auto-updated build strings. 2021-11-06 01:00:21 +01:00
Daniel Barbero Martin c3e2b4361f Merge remote-tracking branch 'origin/develop' into ent-7503-Calendarios-para-dias-especiales 2021-11-05 10:00:15 +01:00
artica 9c290d917e Auto-updated build strings. 2021-11-05 01:00:12 +01:00
José González bdc4d0a8b1 Revert "Merge branch 'ent-7662-rebranding-meta' into 'develop'" 
This reverts merge request !4302
 2021-11-04 16:28:15 +01:00
Jose Gonzalez c0abe5edb9 Fix merge 2021-11-04 16:00:05 +01:00
Daniel Barbero Martin c3f4addb0e wip special days alerts 2021-11-04 12:33:40 +01:00
artica 4ebb817d90 Auto-updated build strings. 2021-11-04 01:00:54 +01:00
artica 0be9abcdca Auto-updated build strings. 2021-11-03 01:00:21 +01:00
artica 23566c9ef4 Auto-updated build strings. 2021-11-02 01:00:18 +01:00
artica f1734e56c3 Auto-updated build strings. 2021-11-01 01:00:17 +01:00
artica 7b9234f392 Auto-updated build strings. 2021-10-31 01:00:19 +02:00
artica 6c6c375702 Auto-updated build strings. 2021-10-30 01:00:24 +02:00
artica c903942c7b Auto-updated build strings. 2021-10-29 01:00:21 +02:00
artica 7cd429d9f8 Auto-updated build strings. 2021-10-28 01:00:22 +02:00
artica 945392b615 Auto-updated build strings. 2021-10-27 01:00:56 +02:00
Daniel Rodriguez e2ae42dd89 Merge branch 'ent-7060-gestion-basica-de-configuracion-de-equipos-de-red' into 'develop' 
NCM

See merge request artica/pandorafms!4434
 2021-10-26 08:21:01 +00:00
artica 24404d5078 Auto-updated build strings. 2021-10-26 01:01:06 +02:00
fbsanchez 5ae3bbc4fe Merge remote-tracking branch 'origin/develop' into ent-7060-gestion-basica-de-configuracion-de-equipos-de-red 2021-10-25 10:28:31 +02:00
artica 56ca01112d Auto-updated build strings. 2021-10-25 01:00:48 +02:00
artica ef41522899 Auto-updated build strings. 2021-10-24 01:00:45 +02:00
artica 134f6ea2a5 Auto-updated build strings. 2021-10-23 01:00:54 +02:00
artica 1218932b05 Auto-updated build strings. 2021-10-22 01:00:20 +02:00
artica 80c7f106ad Auto-updated build strings. 2021-10-21 01:00:55 +02:00
artica 6ccf3a9ee9 Updated version and build strings. 2021-10-20 15:31:02 +02:00
artica b70ca89af2 Auto-updated build strings. 2021-10-20 01:01:06 +02:00
artica 65b0d839f9 Auto-updated build strings. 2021-10-19 01:00:50 +02:00
artica c043c3d023 Auto-updated build strings. 2021-10-18 01:00:18 +02:00
artica 6da17b11aa Auto-updated build strings. 2021-10-17 01:00:18 +02:00
artica 0e9f37a090 Auto-updated build strings. 2021-10-16 01:00:22 +02:00
artica af9711ec3d Auto-updated build strings. 2021-10-15 01:00:20 +02:00
artica 20448faa35 Auto-updated build strings. 2021-10-14 01:00:21 +02:00
fbsanchez 96250dcfa0 WIP NCM 2021-10-13 22:47:31 +02:00
artica 9d813b729e Auto-updated build strings. 2021-10-13 01:00:13 +02:00
artica 4fd071cf60 Auto-updated build strings. 2021-10-12 01:00:19 +02:00
artica a8937abb65 Auto-updated build strings. 2021-10-11 01:00:15 +02:00
artica 2b419b826d Auto-updated build strings. 2021-10-10 01:00:16 +02:00
artica 9867024d2e Auto-updated build strings. 2021-10-09 01:00:19 +02:00
artica eb5b34b99e Auto-updated build strings. 2021-10-08 01:00:19 +02:00
artica c7face04e1 Auto-updated build strings. 2021-10-07 01:00:20 +02:00
Jose Gonzalez a70d48514e Fix Barivion name in license and readme 2021-10-06 13:33:25 +02:00
artica 1ebc2ed082 Auto-updated build strings. 2021-10-06 01:00:22 +02:00
artica d1b9dc4ef8 Auto-updated build strings. 2021-10-05 01:00:20 +02:00
artica 0e02cb314c Auto-updated build strings. 2021-10-04 01:00:16 +02:00
artica 7b369d4fed Auto-updated build strings. 2021-10-03 01:00:15 +02:00
artica fd51190b07 Auto-updated build strings. 2021-10-02 01:00:19 +02:00
Daniel Rodriguez 1cdef62ceb Merge branch 'ent-5693-9848-actualizar-campos-personalizados-agente-mediante-cli' into 'develop' 
add agent_update_custom_fields on cli

See merge request artica/pandorafms!4281
 2021-10-01 12:36:17 +00:00
artica 1d74155723 Auto-updated build strings. 2021-10-01 01:00:22 +02:00
marcos d0f08be953 update agent custom fields 2021-09-30 14:34:58 +02:00
marcos d54af52baf update agent custom fields 2021-09-30 12:50:59 +02:00
artica 036da5ea3a Auto-updated build strings. 2021-09-30 01:00:18 +02:00
Daniel Rodriguez f756cec3be Merge branch 'ent-7869-solucion-automatica-splitbrain-pandora-ha' into 'develop' 
PandoraHA Splitbrain autorecovery

See merge request artica/pandorafms!4413
 2021-09-29 09:58:29 +00:00
artica 06c42a051d Auto-updated build strings. 2021-09-29 01:00:20 +02:00
marcos 4e25442813 update agent custom fields 2021-09-28 11:20:26 +02:00
marcos a8a5289652 update agent custom fields 2021-09-28 09:31:06 +02:00
artica 201fea9378 Auto-updated build strings. 2021-09-28 01:00:21 +02:00
marcos a7e97f0493 refactor update agent custom fields 2021-09-27 17:56:41 +02:00
marcos 87eb16ef32 Merge remote-tracking branch 'origin/master' into ent-5693-9848-actualizar-campos-personalizados-agente-mediante-cli 2021-09-27 17:08:03 +02:00
artica b09febeee0 Auto-updated build strings. 2021-09-27 01:00:15 +02:00
artica 17ba73ad36 Auto-updated build strings. 2021-09-26 01:00:11 +02:00
artica 2cbe307a6f Auto-updated build strings. 2021-09-25 01:00:21 +02:00
artica bc516889bf Auto-updated build strings. 2021-09-24 01:00:21 +02:00
artica 0e34c1275a Auto-updated build strings. 2021-09-23 01:00:21 +02:00
artica 61e2a3f21b Auto-updated build strings. 2021-09-22 01:00:21 +02:00
fbsanchez e9c5d89fdc Added level to log_message (pandora_ha) 2021-09-21 12:48:57 +02:00
artica d50cf7431b Auto-updated build strings. 2021-09-21 01:00:17 +02:00
artica 6153237481 Auto-updated build strings. 2021-09-20 01:00:17 +02:00
artica 43c22e9ec7 Auto-updated build strings. 2021-09-19 01:00:12 +02:00
artica 8d2d7f16de Auto-updated build strings. 2021-09-18 01:00:19 +02:00
artica 33788c9238 Auto-updated build strings. 2021-09-17 01:00:18 +02:00
artica d7452d19e8 Auto-updated build strings. 2021-09-16 01:00:22 +02:00
fbsanchez 2e764afac7 PandoraHA Splitbrain autorecovery 2021-09-15 21:38:10 +02:00
Ramon Novoa 165dea9fe7 Merge remote-tracking branch 'origin/master' into master-alt 2021-09-15 17:21:33 +02:00
artica 4cd17dca40 Auto-updated build strings. 2021-09-15 01:00:20 +02:00
artica cf3c328d18 Auto-updated build strings. 2021-09-14 01:00:17 +02:00
artica c231c82e93 Updated version and build strings. 2021-09-13 12:08:23 +02:00
artica 4ec67b51b7 Auto-updated build strings. 2021-09-13 01:00:16 +02:00
artica 4d2a52fcce Auto-updated build strings. 2021-09-12 01:00:13 +02:00
artica 48ee2d3fcd Auto-updated build strings. 2021-09-11 01:00:20 +02:00
artica 12b7cd0c63 Auto-updated build strings. 2021-09-10 01:00:21 +02:00
artica f2875b5a86 Auto-updated build strings. 2021-09-09 01:00:24 +02:00
artica 7e5dc6a9c4 Auto-updated build strings. 2021-09-08 01:00:19 +02:00
artica ecd818bbb7 Auto-updated build strings. 2021-09-07 01:00:19 +02:00
artica 6bb994f4b7 Auto-updated build strings. 2021-09-06 01:00:37 +02:00
artica 42a999b207 Auto-updated build strings. 2021-09-05 01:00:13 +02:00
artica 22a0709953 Auto-updated build strings. 2021-09-04 01:00:22 +02:00
artica 30c6a78b35 Auto-updated build strings. 2021-09-03 01:00:40 +02:00
artica 737943fee2 Auto-updated build strings. 2021-09-02 01:00:55 +02:00
artica 10dd28246c Auto-updated build strings. 2021-09-01 01:00:24 +02:00
artica 966a5df96a Auto-updated build strings. 2021-08-31 01:00:50 +02:00
artica b4c52f92f7 Auto-updated build strings. 2021-08-30 01:00:38 +02:00
artica bffc6c52ce Auto-updated build strings. 2021-08-29 01:00:17 +02:00
artica dd538c48bb Auto-updated build strings. 2021-08-28 01:00:24 +02:00
artica 72e46df88b Auto-updated build strings. 2021-08-27 01:00:23 +02:00
Daniel Rodriguez 25c6a3eef4 Merge branch 'ent-7805-devolver-informacion-del-pandora-server-al-hacer-un-status' into 'develop' 
Update the description for pandora_ha.

See merge request artica/pandorafms!4371
 2021-08-26 10:12:23 +00:00
Ramon Novoa 7e27731ce2 Change more references to Pandora FMS HA Database tool. 2021-08-26 10:47:52 +02:00
artica a8fcec1f6a Auto-updated build strings. 2021-08-26 01:00:50 +02:00
Ramon Novoa 3056874b52 Update the description for pandora_ha. 
Ref. pandora_enterprise#7805.
 2021-08-25 11:47:50 +02:00
artica f63fa5ab96 Auto-updated build strings. 2021-08-25 01:00:39 +02:00
artica 5163f2831d Auto-updated build strings. 2021-08-24 01:00:38 +02:00
artica e3619915cc Auto-updated build strings. 2021-08-23 01:00:21 +02:00
artica a8ae80f8a6 Auto-updated build strings. 2021-08-22 01:00:15 +02:00
artica 0f34554ba6 Auto-updated build strings. 2021-08-21 01:00:32 +02:00
artica 7e71b6537f Auto-updated build strings. 2021-08-20 01:00:19 +02:00
artica 38c044f2ae Auto-updated build strings. 2021-08-19 01:00:34 +02:00
artica a1942147e4 Auto-updated build strings. 2021-08-18 01:00:49 +02:00
artica 9f65e8deb0 Auto-updated build strings. 2021-08-17 01:00:44 +02:00
artica 18698827a6 Auto-updated build strings. 2021-08-16 01:00:21 +02:00
artica 4e17c0ecf4 Auto-updated build strings. 2021-08-15 01:00:22 +02:00
artica ce2c4afbb5 Auto-updated build strings. 2021-08-14 01:00:24 +02:00
artica 6a471546d5 Auto-updated build strings. 2021-08-13 01:00:30 +02:00
artica 3bb4c2ac09 Auto-updated build strings. 2021-08-12 01:00:45 +02:00
artica 568bdfb5c0 Auto-updated build strings. 2021-08-11 01:00:19 +02:00
artica 2951bf2871 Auto-updated build strings. 2021-08-10 01:00:12 +02:00
artica 8b36a96867 Auto-updated build strings. 2021-08-09 01:00:08 +02:00
artica 7a36b18fc0 Auto-updated build strings. 2021-08-08 01:00:11 +02:00
artica 9ea746991b Auto-updated build strings. 2021-08-07 01:00:19 +02:00
artica 14688908e2 Auto-updated build strings. 2021-08-06 01:00:21 +02:00
Daniel Rodriguez 0f8a22feb3 Merge branch 'ent-7860-excluir-mfserver-en-chequeo-pandora_ha' into 'develop' 
Excluded MFSERVER from component checks

See merge request artica/pandorafms!4332
 2021-08-05 12:24:32 +00:00
artica 747d39a066 Auto-updated build strings. 2021-08-05 01:00:50 +02:00
artica c4e1243f18 Auto-updated build strings. 2021-08-04 01:00:42 +02:00
artica 69c4139cc1 Auto-updated build strings. 2021-08-03 01:00:44 +02:00
artica b837adaf00 Auto-updated build strings. 2021-08-02 01:00:34 +02:00
artica 6e66675f7f Auto-updated build strings. 2021-08-01 01:00:36 +02:00
artica 170f0d9045 Auto-updated build strings. 2021-07-31 01:00:44 +02:00
artica 5e2c4349b3 Auto-updated build strings. 2021-07-30 01:00:38 +02:00
artica f9b69c289c Auto-updated build strings. 2021-07-29 01:00:43 +02:00
fbsanchez 403b901e8e Excluded MFSERVER from component checks 2021-07-28 15:06:00 +02:00
artica 5aef20ee31 Auto-updated build strings. 2021-07-28 01:00:37 +02:00
artica ee4868d433 Auto-updated build strings. 2021-07-27 01:00:18 +02:00
artica 1c6508947a Auto-updated build strings. 2021-07-26 01:00:35 +02:00
artica 29013e7dd6 Auto-updated build strings. 2021-07-25 01:00:36 +02:00
artica 8fa664c0c5 Auto-updated build strings. 2021-07-24 01:00:36 +02:00
artica 5654de748a Auto-updated build strings. 2021-07-23 01:00:43 +02:00
artica 32210ee7a3 Auto-updated build strings. 2021-07-22 01:00:34 +02:00
Daniel Rodriguez 62be3f5830 Merge branch 'ent-improved-freebsd-support' into 'develop' 
Improved daemon launcher and installer for FreeBSD.

See merge request artica/pandorafms!4306
 2021-07-21 09:00:33 +00:00
artica 53ad5e1cd9 Updated version and build strings. 2021-07-21 10:57:56 +02:00
Junichi Satoh 4784cab29d Fixed a typo. 2021-07-21 09:08:01 +09:00
artica 89ebe2ea2e Auto-updated build strings. 2021-07-21 01:00:44 +02:00
artica 63a8ff3f53 Auto-updated build strings. 2021-07-20 01:00:43 +02:00
Junichi Satoh b1ce3acd2f Improved daemon launcher and installer for FreeBSD. 2021-07-19 13:47:24 +09:00
artica 9183110028 Auto-updated build strings. 2021-07-19 01:00:37 +02:00
artica ac28fb7b58 Auto-updated build strings. 2021-07-18 01:00:36 +02:00
artica c5b8f647fe Auto-updated build strings. 2021-07-17 01:00:41 +02:00
fbsanchez 9643e3ade9 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-07-16 10:36:06 +02:00
artica 0508c0fa88 Auto-updated build strings. 2021-07-16 01:00:32 +02:00
artica bf890c0d11 Auto-updated build strings. 2021-07-15 01:00:40 +02:00
fbsanchez 18948ea9c2 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-07-14 10:04:13 +02:00
artica 31b99ecbfb Auto-updated build strings. 2021-07-14 01:00:39 +02:00
fbsanchez 9b31906bdf Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/extras/mr/48.sql
 2021-07-13 10:01:59 +02:00
artica 925c9fce4f Auto-updated build strings. 2021-07-13 01:00:34 +02:00
artica 922fb81a58 Auto-updated build strings. 2021-07-12 01:00:31 +02:00
artica f3ea9fedf9 Auto-updated build strings. 2021-07-11 01:00:30 +02:00
artica faf154e69c Auto-updated build strings. 2021-07-10 01:00:35 +02:00
fbsanchez 554a32b567 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-07-09 14:40:44 +02:00
marcos 4c82ade184 add agent_update_custom_fields on cli 2021-07-09 13:58:01 +02:00
artica d6cd48fdde Auto-updated build strings. 2021-07-09 01:00:35 +02:00
artica 239e149b3c Auto-updated build strings. 2021-07-08 01:00:36 +02:00
artica a06989dc11 Auto-updated build strings. 2021-07-07 01:00:38 +02:00
artica dec62ffca4 Auto-updated build strings. 2021-07-06 01:00:32 +02:00
fbsanchez f52d389327 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/extras/mr/48.sql
 2021-07-05 09:55:14 +02:00
artica 3baae4147a Auto-updated build strings. 2021-07-05 01:00:29 +02:00
artica b6477e5526 Auto-updated build strings. 2021-07-04 01:00:26 +02:00
artica 8a4e51bf1b Auto-updated build strings. 2021-07-03 01:00:31 +02:00
artica 1328b2055c Auto-updated build strings. 2021-07-02 01:00:32 +02:00
artica 911d9fe8fe Auto-updated build strings. 2021-07-01 01:00:09 +02:00
Daniel Rodriguez b67e6a3f85 Merge branch 'ent-7480-dejar-fino-rpm-de-servidor-enterprise' into 'develop' 
Add a base pandora_ha.service.

See merge request artica/pandorafms!4252
 2021-06-30 08:04:44 +00:00
artica 7dc2245f2e Auto-updated build strings. 2021-06-30 01:00:32 +02:00
fbsanchez 074fbf916c Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-29 20:03:07 +02:00
Daniel Rodriguez 35e889be15 Merge branch 'ent-4759-compatibilidad-ssl-y-certificados-conexiones-mysql' into 'develop' 
Add SSL support for database connections.

See merge request artica/pandorafms!4134
 2021-06-29 14:50:25 +00:00
fbsanchez c64b972564 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-29 10:51:55 +02:00
artica 7f58a93bfd Auto-updated build strings. 2021-06-29 01:00:15 +02:00
Ramon Novoa e073e634b9 Add a base pandora_ha.service. 2021-06-28 17:15:50 +02:00
fbsanchez 771c51ef5d Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-28 10:13:51 +02:00
artica 6fc94f3fad Auto-updated build strings. 2021-06-28 01:00:29 +02:00
artica 69c1a5fdad Auto-updated build strings. 2021-06-27 01:00:26 +02:00
artica b7d956041d Auto-updated build strings. 2021-06-26 01:01:41 +02:00
fbsanchez c0d56f8563 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-25 09:48:52 +02:00
artica 4438dad309 Auto-updated build strings. 2021-06-25 01:00:39 +02:00
fbsanchez 4c2ac234b8 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/extras/mr/48.sql
	pandora_console/godmode/servers/plugin.php
 2021-06-24 14:37:30 +02:00
Luis 497ecb329d Changed new wiki url on helps 2021-06-24 12:31:15 +00:00
artica f18e8141fe Updated version and build strings. 2021-06-24 13:06:06 +02:00
Ramon Novoa f9b090d857 Merge branch 'ent-5620-nuevo-compilador-para-backend' into master-alt 2021-06-24 12:58:44 +02:00
artica 86abd75206 Auto-updated build strings. 2021-06-24 01:00:51 +02:00
fbsanchez 2fe6092d37 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-23 20:08:59 +02:00
artica e99183e1f0 Auto-updated build strings. 2021-06-23 01:00:51 +02:00
artica 17bae49b21 Auto-updated build strings. 2021-06-22 01:00:56 +02:00
fbsanchez faa9fee273 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_agents/unix/Darwin/dmg/resources/text/conclusion.html
	pandora_agents/unix/Darwin/dmg/resources/text/license.html
	pandora_console/extras/delete_files/delete_files.txt
	pandora_console/extras/mr/48.sql
 2021-06-21 17:33:45 +02:00
Daniel Rodriguez 7b7265baa5 Merge branch 'ent-7179-cli-update-agent-duplica-referencias-ip' into 'develop' 
Fixed CLI update_agent adding duplicate agent address references

See merge request artica/pandorafms!4010
 2021-06-21 09:30:17 +00:00
artica 447d463518 Auto-updated build strings. 2021-06-21 01:00:36 +02:00
artica dd5e7e550d Auto-updated build strings. 2021-06-20 01:00:37 +02:00
artica 682a977ef1 Auto-updated build strings. 2021-06-19 01:00:49 +02:00
Daniel Barbero Martin 1e183c2b60 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-18 08:49:57 +02:00
artica 0c1918eb3c Auto-updated build strings. 2021-06-18 01:00:44 +02:00
Daniel Barbero Martin 50c7394e7d Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-17 08:23:46 +02:00
artica e5cbcd070b Auto-updated build strings. 2021-06-17 01:00:42 +02:00
Daniel Barbero Martin 841842da59 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	pandora_console/pandoradb_data.sql
 2021-06-16 08:46:21 +02:00
artica 90905d72f5 Auto-updated build strings. 2021-06-16 01:00:23 +02:00
Daniel Rodriguez 9fcde88ebf Merge branch 'ent-7698-revision-pandora-ha-open-caracteristicas-enterprise' into 'develop' 
pandora_ha enterprise components fixed

See merge request artica/pandorafms!4202
 2021-06-15 13:11:21 +00:00
Daniel Barbero Martin 9e6f3f7b46 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-15 10:35:50 +02:00
artica 2f0cebe979 Auto-updated build strings. 2021-06-15 01:00:51 +02:00
fbsanchez 7e5a082e22 pandora_ha enterprise components fixed 2021-06-14 19:29:24 +02:00
fbsanchez 04a9b10904 Pandora HA verified 2021-06-14 19:18:45 +02:00
fbsanchez 94cd4c96dd Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/extras/delete_files/delete_files.txt
	pandora_console/include/javascript/pandora_ui.js
 2021-06-14 17:37:01 +02:00
Daniel Rodriguez 08011d60b2 Merge branch 'ent-7122-nuevo-update-manager' into 'develop' 
Embebed UMC in Pandora FMS

See merge request artica/pandorafms!3894
 2021-06-14 11:56:43 +00:00
fbsanchez cdad04f9cd Update the DB schema when upgrading from RPMs. 
Call updateMR.php to update the database schema when manually upgrading
from RPM packages.
 2021-06-14 11:56:42 +00:00
Daniel Barbero Martin a7c1c49636 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-14 08:42:31 +02:00
artica 595fabb232 Auto-updated build strings. 2021-06-14 01:00:18 +02:00
artica e7a204d6d8 Auto-updated build strings. 2021-06-13 01:00:16 +02:00
artica 8272eb4f5b Auto-updated build strings. 2021-06-12 01:00:21 +02:00
Daniel Barbero Martin 75b889875e Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-11 08:41:23 +02:00
artica 876e776d29 Auto-updated build strings. 2021-06-11 01:00:09 +02:00
fbsanchez ae34209f52 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-10 21:45:50 +02:00
artica ace916bc8e Updated version and build strings. 2021-06-10 17:12:11 +02:00
Marcos Alconada 665efa4fb7 Ent 7519 cambio de fuentes en la consola a nivel global 2021-06-10 08:19:11 +00:00
Daniel Barbero Martin 9e27843b19 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-10 08:51:48 +02:00
artica 5ad364cc4a Auto-updated build strings. 2021-06-10 01:00:20 +02:00
Daniel Rodriguez 4b819360ff Revert "Merge branch 'ent-7519-cambio-de-fuentes-en-la-consola-a-nivel-global' into 'develop'" 
This reverts merge request !4132
 2021-06-09 18:09:43 +02:00
Marcos Alconada 2334eccd01 Ent 7519 cambio de fuentes en la consola a nivel global 2021-06-09 13:59:28 +00:00
Daniel Barbero Martin e54fde338d Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-09 08:22:04 +02:00
artica 2953870e4f Auto-updated build strings. 2021-06-09 01:00:20 +02:00
Daniel Barbero Martin df2f72cce3 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-08 08:22:16 +02:00
artica a63a4efb71 Auto-updated build strings. 2021-06-08 01:00:20 +02:00
Daniel Barbero Martin 8b7c5c08c6 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-07 08:32:15 +02:00
artica bc6b4acd8b Auto-updated build strings. 2021-06-07 01:00:19 +02:00
artica 656105cdf0 Auto-updated build strings. 2021-06-06 01:00:14 +02:00
artica 2513693ada Auto-updated build strings. 2021-06-05 01:00:19 +02:00
Daniel Barbero Martin ca59034cf3 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-04 08:13:20 +02:00
artica 8976ec4b6e Auto-updated build strings. 2021-06-04 01:00:19 +02:00
Daniel Barbero Martin 030a4fed6a Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-03 08:15:30 +02:00
artica e1ae9d7908 Auto-updated build strings. 2021-06-03 01:00:17 +02:00
Daniel Barbero Martin 18f414ce5b Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-02 08:09:32 +02:00
artica 2a5b5591a3 Auto-updated build strings. 2021-06-02 01:00:45 +02:00
Daniel Barbero Martin ddc4b47d0b Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-01 08:34:32 +02:00
artica b0e3b0aa24 Auto-updated build strings. 2021-06-01 01:00:09 +02:00
Daniel Barbero Martin 33618af381 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-31 08:40:09 +02:00
artica ff3eb72420 Auto-updated build strings. 2021-05-31 01:00:34 +02:00
artica 20d3399d39 Auto-updated build strings. 2021-05-30 01:00:20 +02:00
artica ec8ffea249 Auto-updated build strings. 2021-05-29 01:00:10 +02:00
Daniel Barbero Martin 8c7654cd2d Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/godmode/setup/os.php
	pandora_console/include/styles/pandora.css
	pandora_console/operation/users/user_edit.php
 2021-05-28 08:26:19 +02:00
artica 059b14dbf6 Auto-updated build strings. 2021-05-28 01:00:43 +02:00
Daniel Barbero Martin a1ca4abe8f Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-27 08:22:43 +02:00
artica 9103f671e2 Auto-updated build strings. 2021-05-27 01:00:43 +02:00