tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-08-18 00:08:48 +02:00
Code Issues Packages Projects Releases Wiki Activity
38,031 Commits 34 Branches 30 Tags
Commit Graph

5042 Commits

Author SHA1 Message Date
Daniel Rodriguez
96d5555ed2 Merge branch 'ent-6464-Discovery-id_recon_server-no-cambia-si-no-existe' into 'develop' 
Ent 6464 discovery id recon server no cambia si no existe

Closes pandora_enterprise#6464

See merge request artica/pandorafms!3788
 2021-03-10 15:53:28 +00:00
alejandro.campos@artica.es
71e9452988 Merge branch 'ent-6898-Integracion-de-Integria-en-Pandora' of brutus.artica.es:artica/pandorafms into ent-6898-Integracion-de-Integria-en-Pandora 2021-03-10 10:28:45 +01:00
alejandro.campos@artica.es
5913313bae Increased number of possible custom fields for Integria action 2021-03-10 10:28:27 +01:00
artica
e34a1c47c8 Auto-updated build strings. 2021-03-10 01:01:06 +01:00
artica
f9d5767027 Auto-updated build strings. 2021-03-09 01:00:17 +01:00
artica
2bd9515152 Auto-updated build strings. 2021-03-08 01:00:14 +01:00
artica
438c388423 Auto-updated build strings. 2021-03-07 01:00:17 +01:00
artica
80c568bbdd Auto-updated build strings. 2021-03-06 01:00:19 +01:00
artica
eb912405a6 Auto-updated build strings. 2021-03-05 01:00:53 +01:00
Alejandro Campos
d4054f15d0 Merge branch 'develop' into 'ent-6898-Integracion-de-Integria-en-Pandora' 
# Conflicts:
#   pandora_console/extras/mr/45.sql
#   pandora_console/godmode/alerts/configure_alert_action.php
#   pandora_server/util/pandora_db.pl
 2021-03-04 10:27:07 +00:00
artica
4d1cab6b67 Auto-updated build strings. 2021-03-04 01:00:19 +01:00
artica
442d0d440a Auto-updated build strings. 2021-03-03 01:00:23 +01:00
fbsanchez
c5b2b90476 Merge remote-tracking branch 'origin/develop' into ent-6232-nt-incluir-ifspeed-como-custom-macro-en-ifoperstatus 
Conflicts:
	pandora_console/extras/mr/45.sql
 2021-03-02 09:48:33 +01:00
fbsanchez
d96590aea5 Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 
Conflicts:
	pandora_console/include/functions_ui.php
	pandora_console/include/styles/pandora.css
 2021-03-02 09:40:15 +01:00
artica
19ab53cfb8 Auto-updated build strings. 2021-03-02 01:00:21 +01:00
artica
0587500074 Auto-updated build strings. 2021-03-01 01:00:09 +01:00
artica
0cf47e4b00 Auto-updated build strings. 2021-02-28 01:00:06 +01:00
artica
814a39235e Auto-updated build strings. 2021-02-27 01:00:19 +01:00
artica
dc04a2b2b5 Auto-updated build strings. 2021-02-26 01:00:19 +01:00
alejandro.campos@artica.es
901d12fec0 Integration with Integria 2021-02-25 13:18:04 +01:00
artica
078ab1657f Auto-updated build strings. 2021-02-25 01:00:25 +01:00
artica
508b953496 Auto-updated build strings. 2021-02-24 01:00:21 +01:00
artica
a5b1128014 Auto-updated build strings. 2021-02-23 01:00:16 +01:00
fbsanchez
85f37a91de Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 
Conflicts:
	pandora_console/include/functions_ui.php
 2021-02-22 12:01:29 +01:00
artica
cd9694f034 Auto-updated build strings. 2021-02-22 01:00:09 +01:00
artica
c70643203f Auto-updated build strings. 2021-02-21 01:00:14 +01:00
artica
396f67d57b Auto-updated build strings. 2021-02-20 01:00:21 +01:00
artica
0f4f9cd461 Auto-updated build strings. 2021-02-19 01:00:21 +01:00
artica
4c1eaf929b Auto-updated build strings. 2021-02-18 01:00:24 +01:00
artica
a33a94eb89 Auto-updated build strings. 2021-02-17 01:00:18 +01:00
fbsanchez
74ee4971d0 Added inUsage and outUsage, added units 2021-02-16 12:14:56 +01:00
artica
c2ec312e72 Auto-updated build strings. 2021-02-16 01:00:18 +01:00
fbsanchez
aca9814e0f uniqid pandora_snmp_bandwidth 2021-02-15 19:10:49 +01:00
fbsanchez
09b5400023 MR info + bandwidth analysis in wizards 2021-02-15 18:56:42 +01:00
artica
2a7ba5fbe0 Auto-updated build strings. 2021-02-15 01:00:15 +01:00
artica
2ef0a1b395 Auto-updated build strings. 2021-02-14 01:00:15 +01:00
artica
3c29314dc7 Auto-updated build strings. 2021-02-13 01:00:18 +01:00
fbsanchez
24ed77b5a1 Pandora bandwidth server plugin 2021-02-12 15:25:41 +01:00
artica
768494e796 Auto-updated build strings. 2021-02-12 01:00:20 +01:00
artica
16f2a60490 Auto-updated build strings. 2021-02-11 01:00:22 +01:00
artica
40852de906 Auto-updated build strings. 2021-02-10 01:00:22 +01:00
artica
e0d1cdd667 Auto-updated build strings. 2021-02-09 01:00:25 +01:00
artica
c828ca2061 Auto-updated build strings. 2021-02-08 01:00:16 +01:00
artica
fe8a54aa48 Auto-updated build strings. 2021-02-07 01:00:17 +01:00
artica
0362e4a1a0 Auto-updated build strings. 2021-02-06 01:00:17 +01:00
artica
fffea9fd99 Auto-updated build strings. 2021-02-05 01:00:20 +01:00
artica
778b3762a2 Auto-updated build strings. 2021-02-04 01:00:25 +01:00
artica
7ed515afd1 Auto-updated build strings. 2021-02-03 01:00:20 +01:00
artica
ff7516cd23 Auto-updated build strings. 2021-02-02 01:00:19 +01:00
fbsanchez
f4768b44fc Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 2021-02-01 15:38:19 +01:00