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

11822 Commits

Author SHA1 Message Date
vgilc 285e63d2a7 Merge branch 'update-mr-token-dev' into 'develop' 
Changed mr token

See merge request !879
 2017-10-04 16:24:54 +02:00
vgilc bd184f9e7a Merge branch '1358-Configuracion-de-email-en-la-consola-de-Pandora-dev' into 'develop' 
Added encryption select in enterprise setup

See merge request !869
 2017-10-04 16:05:51 +02:00
Arturo Gonzalez 08ff3798c5 Changed mr token 2017-10-04 15:59:56 +02:00
vgilc 13f12baa33 Merge branch '1255-Opcion-para-tener-Alias-as-name-por-defecto-4463-vodat' into 'develop' 
Use alias as name with option default tconfig - #1255

See merge request !803
 2017-10-04 15:52:17 +02:00
vgilc aaa21d2bd8 Merge branch '1241-adv-config-in-ldap-auth-dev' into 'develop' 
1241 adv config in ldap auth dev

See merge request !853
 2017-10-04 15:49:39 +02:00
vgilc 45c35a1a0f Merge branch '1251-export-data-to-csv-in-graph-container-dev' into 'develop' 
Fixed error in js library and added good export to graph container graphs

See merge request !828
 2017-10-04 14:28:38 +02:00
vgilc 83488e517e Merge branch '1349-Boton-muy-feo-en-el-wizard-de-instalacion-de-pandora' into 'develop' 
Change installer next button style - #1349

See merge request !833
 2017-10-04 14:01:54 +02:00
vgilc 9d4f11113e Merge branch '1283-Imagen-No-data-to-show' into 'develop' 
Fix error showing image when there is no data to show in graphs - #1283

See merge request !831
 2017-10-04 13:46:49 +02:00
vgilc df8210924c Merge branch '1266-Checkbox-All-modules-en-operaciones-masivas-4472-onenet' into 'develop' 
Prevent select any and others options at the same time for agents/modules multis…

See merge request !829
 2017-10-04 11:06:39 +02:00
vgilc 26da8fe19d Merge branch '1312-merge-errors-in-the-last-package-dev' into 'develop' 
Added lost changes

See merge request !811
 2017-10-04 11:05:06 +02:00
vgilc 4cc3f0d426 Merge branch '1368-Problems-with-empty-networkmaps-dev' into 'develop' 
Fixed id of pandora node

See merge request !873
 2017-10-04 10:37:26 +02:00
vgilc 82f8b333d5 Merge branch '1134-url-routes-analyzer-feature-dev' into 'develop' 
1134 url routes analyzer feature dev

See merge request !870
 2017-10-04 09:42:37 +02:00
artica de8285dc27 Auto-updated build strings. 2017-10-04 00:01:23 +02:00
Arturo Gonzalez 09f73929aa Changed route analyzer styles 2017-10-03 16:40:01 +02:00
Arturo Gonzalez 7cd5d9c3a9 Added new styles to route analyzer 2017-10-03 15:20:35 +02:00
Arturo Gonzalez c58ccfe693 Merge branch 'develop' into 1134-url-routes-analyzer-feature-dev 2017-10-03 10:35:58 +02:00
Arturo Gonzalez 65bfedf404 Fixed id of pandora node 2017-10-03 10:32:22 +02:00
artica 7b3a0d49f1 Auto-updated build strings. 2017-10-03 00:01:22 +02:00
Arturo Gonzalez e9db7e95f8 Added image to url analyzer 2017-10-02 17:53:30 +02:00
Daniel Maya 67a17679e3 Added encryption select in enterprise setup 2017-10-02 15:40:10 +02:00
artica 3188bf1b0b Updated version and build strings. 2017-10-02 11:57:37 +02:00
artica e9b8f01931 Auto-updated build strings. 2017-10-02 00:01:20 +02:00
artica bc48ddc747 Auto-updated build strings. 2017-10-01 00:01:20 +02:00
artica befb1fb196 Auto-updated build strings. 2017-09-30 00:01:23 +02:00
vgilc 3ea66cbae8 Merge branch 'update-japanese-help' into 'develop' 
Updated Japanese help.

See merge request !771
 2017-09-29 08:32:27 +02:00
artica 6d7a9fd648 Auto-updated build strings. 2017-09-29 00:01:25 +02:00
Arturo Gonzalez 8cd7b3205b Merge branch 'develop' into 1134-url-routes-analyzer-feature-dev 2017-09-28 16:29:23 +02:00
artica 165087d670 Auto-updated build strings. 2017-09-28 00:01:20 +02:00
artu30 d372d3a93e Merge branch 'develop' into '1241-adv-config-in-ldap-auth-dev' 
# Conflicts:
#   pandora_console/include/auth/mysql.php
 2017-09-27 11:02:15 +02:00
Arturo Gonzalez b09fdce7e3 Added password verification when log in with ldap 2017-09-26 15:41:04 +02:00
daniel e032f40525 fixed minor error TIP 2017-09-26 12:03:00 +02:00
artica 5ab5e04630 Auto-updated build strings. 2017-09-26 00:01:25 +02:00
daniel b23f83036c fixed errors in extension db status 2017-09-25 17:23:57 +02:00
Arturo Gonzalez cb85cff34f ldap adv conf v3 (good version) 2017-09-25 14:18:40 +02:00
daniel 00f779817d fixed errors in report interfaces 2017-09-25 13:26:04 +02:00
Arturo Gonzalez 89ba75f466 Added ldap adv conf v2 2017-09-25 13:13:11 +02:00
vgilc 04dc184b62 Merge branch '1168-icon-to-know-if-agent-is-in-planned-downtime-dev' into 'develop' 
Added iconin agent view

See merge request !851
 2017-09-25 10:39:45 +02:00
Arturo Gonzalez 7b437d612a Added with quiet agent to 2017-09-25 10:29:34 +02:00
Arturo Gonzalez 83e9276f1b Added iconin agent view 2017-09-25 10:25:12 +02:00
daniel 7a8135f36d fixed error merge dani 2017-09-25 09:45:58 +02:00
vgilc 3bdd23e2d7 Merge branch '1296-Barra-de-eventos---Vista-táctica-metaconsola2-dev' into 'develop' 
update info of state in events

See merge request !847
 2017-09-25 09:23:58 +02:00
vgilc 851a8082a4 Merge branch '1338-Graficas_TIP_en_informes_open_rev' into 'develop' 
reajust date in flash graphs

See merge request !849
 2017-09-25 08:50:51 +02:00
artica 444101dbdf Auto-updated build strings. 2017-09-25 00:01:22 +02:00
artica 3e3268971f Auto-updated build strings. 2017-09-24 00:01:21 +02:00
artica d1c4ce1008 Auto-updated build strings. 2017-09-23 00:01:17 +02:00
daniel 44a6e39f99 reajust date in flash graphs 2017-09-22 15:12:53 +02:00
Daniel Maya 4c4a89ecf1 update info of state in events 2017-09-22 15:01:17 +02:00
Arturo Gonzalez f738fa2fce Added ldap login adv conf v1 2017-09-22 13:54:02 +02:00
daniel feae62f11c add tip reports simple graph 2017-09-22 11:39:54 +02:00
vgilc a42e2eae4c Merge branch '1099-Anadir_TIP_para_graficas_de_interfaz_rev_1' into 'develop' 
fixed minor errors tips

See merge request !842
 2017-09-22 09:30:35 +02:00