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

6096 Commits

Author SHA1 Message Date
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 Rodriguez fff8f910f8 Merge branch 'ent-8015-palabras-conflictivas' into 'develop' 
Removed some cheerful words in the project

Closes pandora_enterprise#8015

See merge request artica/pandorafms!4460
 2021-11-24 17:18:38 +00: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
artica 3ec3e5e0a2 Updated version and build strings. 2021-11-24 17:45:09 +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
Jose Gonzalez 98f519958c Fix merge 2021-11-23 12:25:58 +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
Daniel Rodriguez 69a7af2131 Merge branch 'ent-7799-jerarquia-fiels-alertas-snmp-accion-comando-de-alerta' into 'develop' 
Ent 7799 jerarquia fiels alertas snmp accion comando de alerta

See merge request artica/pandorafms!4322
 2021-11-18 16:31:50 +00:00
Calvo 37dacfa499 g,k kjjMerge remote-tracking branch 'origin/develop' into ent-7799-jerarquia-fiels-alertas-snmp-accion-comando-de-alerta 2021-11-18 09:37:31 +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
Daniel Rodriguez a940396b0d Merge branch 'ent-7379-macro-de-direcciones-en-network-y-pluginserver' into 'develop' 
Rename the _address_n_ macro and add it to more servers.

Closes pandora_enterprise#7379

See merge request artica/pandorafms!4462
 2021-11-16 12:07:54 +00: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 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