tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-09-26 11:29:12 +02:00
Code Issues Packages Projects Releases Wiki Activity
28,694 Commits 34 Branches 30 Tags
Commit Graph

3214 Commits

Author SHA1 Message Date
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
artica
9c290d917e Auto-updated build strings. 2021-11-05 01:00:12 +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
Daniel Rodriguez
3883c99804 Merge branch 'ent-7595-12357-prototipo-event-server-paralelizado-y-con-recuperacion-de-alertas-bingo-card' into 'develop' 
CorrelationServer

See merge request artica/pandorafms!4377
 2021-10-29 10:07:25 +00: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
fbsanchez
2d09e5bfb7 Merge remote-tracking branch 'origin/develop' into ent-7595-12357-prototipo-event-server-paralelizado-y-con-recuperacion-de-alertas-bingo-card 2021-10-27 22:59:19 +02:00
artica
945392b615 Auto-updated build strings. 2021-10-27 01:00:56 +02:00
fbsanchez
a5bf72cca0 Merge remote-tracking branch 'origin/develop' into ent-7595-12357-prototipo-event-server-paralelizado-y-con-recuperacion-de-alertas-bingo-card 
Conflicts:
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	pandora_console/include/constants.php
	pandora_server/lib/PandoraFMS/Tools.pm
 2021-10-26 14:21:40 +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
fbsanchez
bb8dbc9332 NCM 2021-10-21 02:17:17 +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
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
fbsanchez
d2f5a04583 WIP NCM 2021-10-11 20:42:43 +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
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
artica
1d74155723 Auto-updated build strings. 2021-10-01 01:00:22 +02:00
fbsanchez
e237d7dd07 Merge remote-tracking branch 'origin/develop' into ent-7595-12357-prototipo-event-server-paralelizado-y-con-recuperacion-de-alertas-bingo-card 
Conflicts:
	pandora_console/extras/mr/50.sql
 2021-09-30 12:24:19 +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