e6abb61a13
Auto-updated build strings.
...
Former-commit-id: 0f011fb8fe35e16e311b4cd0f946fec051170c32
2019-02-08 00:01:29 +01:00
8054809dda
Merge branch '2931-Fallos_en_el_conteo_de_modulos_en_la_tabla_tagente' into 'develop'
...
Added new functionality in CLI and API to update module counts and alert counts
See merge request artica/pandorafms!2133
Former-commit-id: e5ee2c87fc7281ece82ace2d8b5654a1c278f60a
2019-02-07 13:10:56 +01:00
92e2262440
Merge remote-tracking branch 'origin/develop' into ent-3305-pandora-db-esta-reseteando-alertas-incorrectamente
...
Former-commit-id: 1e778938d7fc1ac575e110503803d8f3ac6b6e83
2019-02-07 11:18:15 +01:00
1f3fe51f69
Auto-updated build strings.
...
Former-commit-id: 984f5cc8c4bf0b5adb68d7bfe86e171f7b748f77
2019-02-07 00:01:40 +01:00
fcb9275d11
Fixed conflict
...
Former-commit-id: 7aeb505d4d2b8e11f72e5b841eec557d4afc1b6d
2019-02-06 19:09:09 +01:00
c0a23889ab
Auto-updated build strings.
...
Former-commit-id: ad456bf0e4cb361694afa246a9348e5b87b85a94
2019-02-06 00:01:29 +01:00
97259bc285
Auto-updated build strings.
...
Former-commit-id: e3473dde27b1cc8aaa1ae555158171d25941710f
2019-02-05 00:01:28 +01:00
af1f081e5c
Auto-updated build strings.
...
Former-commit-id: e75f41146e01ab55222c3b4176a50aee7e9246df
2019-02-04 00:01:33 +01:00
934533141e
Auto-updated build strings.
...
Former-commit-id: ac84c1e47dd82d12c0b83a0a79b044ca26fc8d8e
2019-02-03 00:01:26 +01:00
24e799f18e
Auto-updated build strings.
...
Former-commit-id: 0e390ddd2b2294dbd043bc7c94dd9a82c228c80f
2019-02-02 00:01:29 +01:00
62461525e8
Auto-updated build strings.
...
Former-commit-id: 899c65040831974e16b76b37348dea7d428a7af3
2019-02-01 00:01:36 +01:00
d6667354fc
Auto-updated build strings.
...
Former-commit-id: 166da74dd65e72a242b58cf10f4c564496b76fe9
2019-01-31 00:01:24 +01:00
2995c86a70
Added network matrix purge
...
Former-commit-id: a2b5f8b5662685924835a592ba04e750e4650fd9
2019-01-30 13:03:16 +01:00
2626605030
Validate alerts at the time agents/modules are modified.
...
Former-commit-id: de1f4d5bbf7abda60a99b3a9718727f73657be75
2019-01-30 12:58:31 +01:00
6485de04fd
Auto-updated build strings.
...
Former-commit-id: b5071a47e475e0aa13a62e9e76066cfd10d99ec1
2019-01-30 00:01:26 +01:00
11456bcfbb
Merge branch '2519_Listart_y_crear_comandos_de_alerta' into 'develop'
...
Add commands alert
See merge request artica/pandorafms!2025
Former-commit-id: 340201221d0219a0c67e1e34eb6421b7c6d1782d
2019-01-29 18:26:56 +01:00
3eeaf83ee3
Update pandora_manage.pl
...
Former-commit-id: 4bc758a4284e96658137fb9580f36163a2031944
2019-01-29 17:40:25 +01:00
eb0b9bd05b
Update pandora_manage.pl
...
Former-commit-id: 4064310d63eb101eb1a13825357aa5c425eae502
2019-01-29 17:16:47 +01:00
ae190ef058
Merge branch 'ent-2523-APIListar,-crear,-borrar-y-modificar-Usuarios-desde-la-API-#6167-EUComm' into 'develop'
...
Ent 2523 api listar, crear, borrar y modificar usuarios desde la api #6167 eu comm
See merge request artica/pandorafms!2149
Former-commit-id: a5a1e6aadf4efe43160eebe883a27ce58ac09bc2
2019-01-29 16:23:35 +01:00
c05e99f37e
Update pandora_manage.pl
...
Former-commit-id: 451b04e91078b99c8b9f41a35271797c343f357c
2019-01-29 16:07:39 +01:00
902e8589f3
Apply a policy into an agent with CLI
...
Former-commit-id: 87037688b1dd3a551c0585319ec545c855484a97
2019-01-29 15:30:04 +01:00
a3c71f4bca
Merge remote-tracking branch 'origin/2523-APIListar,-crear,-borrar-y-modificar-Usuarios-desde-la-API-#6167-EUComm' into ent-2523-APIListar,-crear,-borrar-y-modificar-Usuarios-desde-la-API-#6167-EUComm
...
Former-commit-id: b8eba6ae5a4efa338199efbc35b50b1b6bea8824
2019-01-29 11:57:19 +01:00
cec6aedaf5
Updated version and build strings.
...
Former-commit-id: 3ba62782db1b3eac4caafb21b5491d249f5a9b44
2019-01-29 11:08:54 +01:00
354834a872
Auto-updated build strings.
...
Former-commit-id: b59b540696e6f36d82e154a9aefea75519e9adac
2019-01-29 00:01:27 +01:00
cf2b9c5798
Fixed conflicts
...
Former-commit-id: 1be548acda51690c59d03e7270810ad03bb16822
2019-01-28 15:35:37 +01:00
042bf1c6e7
Merge branch '2526_Listar_acciones_de_alerta_desde_la_API' into 'develop'
...
List alert actions in nodes with CLI and API
See merge request artica/pandorafms!2085
Former-commit-id: 9732161ea417a1518e508cb9e2d20438d34ec3b2
2019-01-28 12:56:28 +01:00
550abc6634
Auto-updated build strings.
...
Former-commit-id: b2b65befe5f01bb047fe48f25c4f33eacc277d41
2019-01-28 00:01:23 +01:00
dd9f6e5f21
Auto-updated build strings.
...
Former-commit-id: 92bbfc8b4c06e1873fe92c9f3b31ddc43d070a1d
2019-01-27 00:01:29 +01:00
50036f2120
Auto-updated build strings.
...
Former-commit-id: 18dc882c6097c97f606ffc45e592f2118b4890cc
2019-01-26 00:01:25 +01:00
d191cdef17
Auto-updated build strings.
...
Former-commit-id: 0c056fa59423bd4342f513f80bd0a49a9df0dddd
2019-01-25 00:01:33 +01:00
f9113fa2e5
Auto-updated build strings.
...
Former-commit-id: 4593b36762b46a3b621d39318cb7a9e5b437db52
2019-01-24 00:01:27 +01:00
25d4239ef9
Merge branch '2521_Crear_grupos_de_modulo_desde_la_API' into 'develop'
...
Create module group API
See merge request artica/pandorafms!2053
Former-commit-id: 55819d89a59549ebec28d32840667e37d34a1f79
2019-01-23 17:02:34 +01:00
1e4a288f53
Auto-updated build strings.
...
Former-commit-id: d02bc496b37ddd35ad1a75174daa0b3ca6d24f24
2019-01-23 00:01:23 +01:00
c586b68cb3
Auto-updated build strings.
...
Former-commit-id: 84dcfe707e9a70754b4ee72365bd549c8d1c09ef
2019-01-22 00:01:24 +01:00
da7e8e5487
Fixed conflict
...
Former-commit-id: 9ca611335700b59f58edf02fa1ab393fcfb8c567
2019-01-21 19:03:32 +01:00
75dc82f42f
Merged two branches into one
...
Former-commit-id: 1e15cd80a5ef0a03834c4d835c7ff0fe77b4c7e0
2019-01-21 18:41:46 +01:00
367c9fc6fc
Merge remote-tracking branch 'origin/2521_Crear_grupos_de_modulos_desde_la_API_2' into 2521_Crear_grupos_de_modulo_desde_la_API
...
Former-commit-id: 7d604cb6777734f43dc5d64f38b5cca651cce25d
2019-01-21 11:41:57 +01:00
e2471b376c
Auto-updated build strings.
...
Former-commit-id: 6c89b359049f06338695df7e9cabd3293885df10
2019-01-21 00:01:23 +01:00
14c5e9d48b
Auto-updated build strings.
...
Former-commit-id: 1eb9179a088600ca4e68930cf9e903997d8f20c7
2019-01-20 00:01:23 +01:00
5a75662b99
Auto-updated build strings.
...
Former-commit-id: 8eff24974e5b3cfbeb57d408c2d4817fe0cb7156
2019-01-19 00:01:25 +01:00
0c9446fceb
Added new functionality in CLI and API to update module counts and alert counts
...
Former-commit-id: aca543eb33de0dc231d18a4776676a4700b37120
2019-01-18 17:24:32 +01:00
979a87762e
Auto-updated build strings.
...
Former-commit-id: 56c567b92e7aad5a2aabd6551b3aa2f07517fb0b
2019-01-18 00:01:26 +01:00
6bf6fd19d6
Auto-updated build strings.
...
Former-commit-id: f9fe79ec45febec900d21f62269f4352cc1a97a2
2019-01-17 00:01:26 +01:00
fe13a117aa
Auto-updated build strings.
...
Former-commit-id: 04682af4f07a1cb2bae17db88c4a4f4e17ad5600
2019-01-16 00:01:27 +01:00
6ba8b9ab9a
Merge branch '2299_Añadir_nueva_funcionalidad_en_el_CLI_remove_agent_from_policy' into 'develop'
...
2299 añadir nueva funcionalidad en el cli remove agent from policy
See merge request artica/pandorafms!2092
Former-commit-id: d9ef39c8571ab3558e76883e1afc9cbb00225c79
2019-01-15 14:37:08 +01:00
6894623429
Auto-updated build strings.
...
Former-commit-id: 582bbf87e0972212cf48dc220871981f80974321
2019-01-15 00:01:25 +01:00
ad9a316a47
Auto-updated build strings.
...
Former-commit-id: 3426e636c31a7a9dcea09e442811310a4956d6ce
2019-01-14 00:01:23 +01:00
20a0aefe84
Auto-updated build strings.
...
Former-commit-id: aab4a872f690f104fe10dbdf7ef8ba86e02daef8
2019-01-13 00:01:23 +01:00
5abf8e14ff
Auto-updated build strings.
...
Former-commit-id: f78ab7f528f841aeda3dd7e28b1a2fcb34c9a05e
2019-01-12 00:01:24 +01:00
ea34cc3b16
Auto-updated build strings.
...
Former-commit-id: 0d164597ba66950d16573ad8b618164c24b578d1
2019-01-11 00:01:25 +01:00
00523128cf
Auto-updated build strings.
...
Former-commit-id: ea896e01eeba9faf882c98c4dbaa788b58d46f7b
2019-01-10 00:01:25 +01:00
344e5f1a6f
Auto-updated build strings.
...
Former-commit-id: a2919ff8afe0b64b756cc60b01a3145a02c8606a
2019-01-09 00:01:23 +01:00
02b497c250
Auto-updated build strings.
...
Former-commit-id: 32c035216be628177ecd430d3c875e3dd504dccc
2019-01-08 00:01:27 +01:00
dd922c41fc
Auto-updated build strings.
...
Former-commit-id: bb71b724086140b69a1314f914508cdbd2fc7776
2019-01-07 00:01:28 +01:00
48f1196400
Auto-updated build strings.
...
Former-commit-id: 17e276d76c3ee7afa9866f8268d6dcb120485a0b
2019-01-06 00:02:00 +01:00
cf1d28cf8b
Auto-updated build strings.
...
Former-commit-id: ed5de54f4a19cf94fad2d6978c0229928edcec6e
2019-01-05 00:01:24 +01:00
cfdde23d96
Auto-updated build strings.
...
Former-commit-id: 051d9c9f6f96c740c40cf8afc900125ab5ec80e9
2019-01-04 00:01:27 +01:00
d114a77151
Auto-updated build strings.
...
Former-commit-id: c0c7f09435de019d1dc0057f48f4e5fd964fb3da
2019-01-03 00:01:25 +01:00
5c16c08d59
Auto-updated build strings.
...
Former-commit-id: 1ce399660dc1fddf4ac163fdd4b7657cef8b6594
2019-01-02 00:01:25 +01:00
ff9f6549d4
Auto-updated build strings.
...
Former-commit-id: 9cd8d22d6cab6e4edaad7c4b184ec4bb4995b54f
2019-01-01 00:01:24 +01:00
5139308723
Auto-updated build strings.
...
Former-commit-id: c78a0fd88b9100d3865413eb017d4dc0d8816b4c
2018-12-31 11:24:46 +01:00
4356a8ce8e
Auto-updated build strings.
...
Former-commit-id: 2971785cc199543f9d8e0e7fed646ec7aabd29d9
2018-12-31 00:01:23 +01:00
5e8b4b4500
Auto-updated build strings.
...
Former-commit-id: f8005483f902558687e92a128c3c138d1323b141
2018-12-30 00:01:22 +01:00
60617def24
Auto-updated build strings.
...
Former-commit-id: 5f0ff76fb4c03a0177dd9bb4b66609229cfec0b6
2018-12-29 00:01:35 +01:00
fcfd68f102
Auto-updated build strings.
...
Former-commit-id: 9885d1113e1e998bdb8c1d93d636c33f3dcc43c1
2018-12-28 00:01:26 +01:00
2043546c52
Auto-updated build strings.
...
Former-commit-id: 58052cc9973e0315e5a3b470d0514a2fcff3d418
2018-12-27 00:01:25 +01:00
5377cf6039
Auto-updated build strings.
...
Former-commit-id: fec5c338a7ebb5e8c86ba8cab22102dde9945978
2018-12-26 00:01:25 +01:00
34502da313
Auto-updated build strings.
...
Former-commit-id: 4bd0f17766d00bdbc9761346e7f13d1959df61e8
2018-12-25 00:01:28 +01:00
86b1a3e424
Auto-updated build strings.
...
Former-commit-id: ea35f14b67818e50e90f81c0f4daea2c77fdaeae
2018-12-24 00:01:23 +01:00
c5d4f395f2
Auto-updated build strings.
...
Former-commit-id: ab48062df957894db4ac37d0bc209c75eb12512a
2018-12-23 00:01:25 +01:00
cba18381bd
Auto-updated build strings.
...
Former-commit-id: 32fc309340e7c464585f9ab5a459e40938176ce5
2018-12-22 00:01:28 +01:00
2d08c75bae
Auto-updated build strings.
...
Former-commit-id: c0f17d266dcf7dc801aa210e5a90cd16b6090145
2018-12-21 00:01:27 +01:00
8c20c93806
Auto-updated build strings.
...
Former-commit-id: e8875f49f492708eca311bb984fe05fc9e766ea7
2018-12-20 00:01:29 +01:00
8a6033e002
Auto-updated build strings.
...
Former-commit-id: deb6afebc4c6aa5a75442e984da3f173283f21e1
2018-12-19 00:02:06 +01:00
58289e73bc
Added new functionality for CLI to delete policy agents.
...
Former-commit-id: 753f9c47d2a4ffe8e5eb599dbd41d5b851500164
2018-12-17 17:51:30 +01:00
7f9ee21b4b
Auto-updated build strings.
...
Former-commit-id: 95dbb73cfdfe00b7123c380c2ce5803bdd2aa754
2018-12-17 00:01:27 +01:00
e1bce89923
Auto-updated build strings.
...
Former-commit-id: a06da6638acbded07658431115057953bdcf417c
2018-12-16 00:01:25 +01:00
7af8f01b59
Auto-updated build strings.
...
Former-commit-id: 67927d3968e9d40047b1a55468ea138c768abc3d
2018-12-15 00:01:28 +01:00
632d67095b
List alert actions in nodes with CLI and API
...
Former-commit-id: 11e9a8137a2a37b081fcbac2ee50cac27c2c208b
2018-12-14 17:20:46 +01:00
b26d13db54
Auto-updated build strings.
...
Former-commit-id: d07fdc3ff61ce6a947f38d250f6714124fe127d1
2018-12-14 00:01:32 +01:00
3d24bc264e
Updated version and build strings.
...
Former-commit-id: 2b99b30300329eb7f0a172f811fcfda8df1ab799
2018-12-13 11:14:24 +01:00
0648bf169c
Auto-updated build strings.
...
Former-commit-id: 77ac42e4d60650cc3fad6bc95333ac37f011aec3
2018-12-13 00:01:36 +01:00
266b12f40a
Auto-updated build strings.
...
Former-commit-id: 7fa7204ba6df07db86506062742d09fb14fe3b22
2018-12-12 00:01:31 +01:00
7f99a8f9f4
List and synchronize group of modules of the meta console with CLI
...
Former-commit-id: 2fc699ee17ac08fe2d60746c0a3d8859a5083f7a
2018-12-11 14:43:27 +01:00
d922b7084c
moved pwrd to enterprise as it is an enterprise feature
...
Former-commit-id: bcb73644fb6d068ac44b1c8c6523467988db441e
2018-12-11 11:19:39 +01:00
663c140b2b
Auto-updated build strings.
...
Former-commit-id: 19c220a8e630e3f5f50e04862cc696be6f278f02
2018-12-11 00:01:27 +01:00
e2bf9b37ba
Updated help on create_agent
...
Former-commit-id: 7dc4db7bf40be74d93692f8eab7effa299a3ac60
2018-12-10 12:21:32 +01:00
44f9a73a81
Added agent as name parameter in create_agent CLI function
...
Former-commit-id: 1395aed8a79b8e26836ca523d457f939a006f5a1
2018-12-10 12:17:12 +01:00
7e40392740
Auto-updated build strings.
...
Former-commit-id: b0e915bad1ff00a9c5c75276dd1234c97ea3319f
2018-12-10 00:01:25 +01:00
52520f151d
Auto-updated build strings.
...
Former-commit-id: 77fc145ae77c789a925853444723f45c6f43136a
2018-12-09 00:01:27 +01:00
9d65e6b27e
Auto-updated build strings.
...
Former-commit-id: 880eb1f55439b6ab5c4f0f86329377ff80bc2822
2018-12-08 00:01:28 +01:00
e472612597
Auto-updated build strings.
...
Former-commit-id: 8c3920b9c6a9f85574a5a3ad243b0a459c2a81ab
2018-12-07 00:01:28 +01:00
7d3b5664df
Auto-updated build strings.
...
Former-commit-id: 9536a5de43f0a3c635f058aa493d8bec3bf5d073
2018-12-06 00:01:34 +01:00
e6bac9a195
Merge branch 'lab/selenium-docker' into 'develop'
...
updates on pwrd, simplified
See merge request artica/pandorafms!2045
Former-commit-id: cfae76c639904ce34f2512ca1e4661826912c8eb
2018-12-05 08:33:47 +01:00
fe47a9c07e
Auto-updated build strings.
2018-12-05 00:01:38 +01:00
60ac4e75df
Fix PID path not absolute message on certain systems
...
Former-commit-id: 91e9063535633dfd9d8e2fd5d309cfeb13d13131
2018-12-04 21:37:25 +01:00
cff621338f
Fixed file permissions pwrd
...
Former-commit-id: d50a2df513e0ee567ba79e2d3a4873a0b92b0a21
2018-12-04 21:28:43 +01:00
b542cb868b
updated pwrd, installer now allows user/directory locations
...
Former-commit-id: cb5c74a260dfcfadec820c0fbbd589e602ac6249
2018-12-04 21:27:46 +01:00
b2758e6738
updates on pwrd, simplified
2018-12-04 18:22:11 +01:00
500601c67f
Auto-updated build strings.
2018-12-04 00:01:28 +01:00
517cb85547
Added new features in CLI to create and view alert commands
2018-12-03 17:38:57 +01:00
76db57a8b6
Auto-updated build strings.
2018-12-03 00:01:26 +01:00
b5ac333dd4
Auto-updated build strings.
2018-12-02 00:01:27 +01:00
f18c7cfc08
Auto-updated build strings.
2018-12-01 00:01:45 +01:00
2249ac4d8e
Auto-updated build strings.
2018-11-30 00:01:26 +01:00
4b1649d5f8
Auto-updated build strings.
2018-11-29 00:01:26 +01:00
c48a0ffc49
Auto-updated build strings.
2018-11-28 00:01:25 +01:00
ad743d332e
Auto-updated build strings.
2018-11-27 00:01:24 +01:00
b7546a5019
Auto-updated build strings.
2018-11-26 00:01:25 +01:00
6bfe880dc8
Auto-updated build strings.
2018-11-25 00:01:24 +01:00
53401e1f4d
Auto-updated build strings.
2018-11-24 00:01:28 +01:00
c8969582a0
Auto-updated build strings.
2018-11-23 00:01:28 +01:00
de77e52297
Auto-updated build strings.
2018-11-22 00:01:28 +01:00
8735adc252
Merge branch 'feature/offline-license' into 'develop'
...
Add support for offline licenses.
See merge request artica/pandorafms!2001
2018-11-21 12:10:13 +01:00
054546fd0f
Add support for offline licenses.
...
Ref pandora_enterprise#3098.
2018-11-21 12:05:20 +01:00
fd6d830de3
Auto-updated build strings.
2018-11-21 00:01:25 +01:00
01ba290a68
Auto-updated build strings.
2018-11-20 00:01:29 +01:00
ce5c679ad6
Auto-updated build strings.
2018-11-19 00:01:29 +01:00
f2bf27d367
Auto-updated build strings.
2018-11-18 00:01:28 +01:00
4021af48f9
Auto-updated build strings.
2018-11-17 00:01:31 +01:00
a0fde9503f
Auto-updated build strings.
2018-11-16 00:01:29 +01:00
e9e132589c
Auto-updated build strings.
2018-11-15 00:01:29 +01:00
633d6987eb
Auto-updated build strings.
2018-11-14 00:01:29 +01:00
f308e1f590
Updated version and build strings.
2018-11-13 15:59:16 +01:00
72691ffe8d
Merge branch '2677-no-se-elimina-parent-id-entre-modulos-del-mismo-agente' into 'develop'
...
Fixed bug in modules deletion: parent id set to 0 in case parent has been deleted
See merge request artica/pandorafms!1961
2018-11-13 08:37:45 +01:00
e29160f34d
Auto-updated build strings.
2018-11-13 00:01:29 +01:00
e45dc3a981
Fixed bug in modules deletion: parent id set to 0 in case parent has been deleted
2018-11-12 18:39:14 +01:00
0dd6c54651
Auto-updated build strings.
2018-11-12 00:01:25 +01:00
4f928c8c22
Auto-updated build strings.
2018-11-11 00:01:25 +01:00
76b24c3214
Auto-updated build strings.
2018-11-10 00:01:28 +01:00
2ed98eac77
Auto-updated build strings.
2018-11-09 00:01:27 +01:00
d28b229423
Auto-updated build strings.
2018-11-08 00:01:29 +01:00
c7a54182a3
Merge branch '6219_Comprobacion_Paradas_planificadas_CLI_2' into 'develop'
...
Added check for the creation of planned downtimes by pandora manage
See merge request artica/pandorafms!1936
2018-11-07 08:48:48 +01:00
a01f79d294
Auto-updated build strings.
2018-11-07 00:01:31 +01:00
a80c7e493e
Added check for the creation of planned downtimes by pandora manage
2018-11-06 16:42:03 +01:00
919a800a0a
Revert "Merge branch '2677-No-se-elimina-parent-id-entre-modulos-del-mismo-agente' into 'develop'"
...
This reverts merge request !1727
2018-11-06 16:41:15 +01:00
3ffad9fda8
Auto-updated build strings.
2018-11-06 00:01:27 +01:00
50b8886916
Auto-updated build strings.
2018-11-05 00:01:25 +01:00
f9e2936df5
Auto-updated build strings.
2018-11-04 00:01:25 +01:00
afd922426e
Auto-updated build strings.
2018-11-03 00:01:27 +01:00
fc82a9d172
Auto-updated build strings.
2018-11-02 00:01:26 +01:00
f47918b4cc
Auto-updated build strings.
2018-11-01 00:01:31 +01:00
d9f8616b2c
Auto-updated build strings.
2018-10-31 00:01:26 +01:00
5a057490ad
Auto-updated build strings.
2018-10-30 00:01:29 +01:00
696abbdead
Auto-updated build strings.
2018-10-29 00:01:25 +01:00
507bbcff56
Auto-updated build strings.
2018-10-28 00:01:22 +02:00
01e9251a88
Auto-updated build strings.
2018-10-27 00:01:26 +02:00
7a4b7d4289
Merge branch '2221-Actualizacion_de_Pandora_a_version_7_de_PHP' into 'develop'
...
2221 actualizacion de pandora a version 7 de php
See merge request artica/pandorafms!1875
2018-10-26 14:41:15 +02:00
dba51e07b3
Auto-updated build strings.
2018-10-26 00:01:33 +02:00
0b0bad8a73
Merge remote-tracking branch 'origin/develop' into 2221-Actualizacion_de_Pandora_a_version_7_de_PHP
...
Conflicts:
pandora_console/extras/mr/22.sql
pandora_console/include/chart_generator.php
pandora_console/include/functions_graph.php
pandora_console/include/functions_reporting.php
pandora_console/include/functions_reporting_html.php
pandora_console/include/graphs/fgraph.php
2018-10-25 17:43:28 +02:00
artica
Daniel Rodriguez
Ramon Novoa
samucarc
fermin831
Alejandro Fraguas
Samuel Carcases
artica
fbsanchez
vgilc
alejandro-campos
daniel