1b5786aedb
Merge remote-tracking branch 'origin/develop' into ent-3790-sobra-una-columna-de-tnetflow_filter
...
Former-commit-id: 652770c2bad08caef82584fc440736ee36abd03d
2019-04-12 10:32:07 +02:00
342e4b78c9
Merge remote-tracking branch 'origin/develop' into ent-3674-discovery-fase-3
...
Former-commit-id: 3640f0730c8f44cfe865b5a2947b8d0ee5c56ad0
2019-04-11 15:12:46 +02:00
79bd37ee5b
Merge remote-tracking branch 'origin/develop' into ent-3674-discovery-fase-3
...
Former-commit-id: 8310dd36684192ea6e98d3a0c0a3e7ace69485d7
2019-04-08 16:28:26 +02:00
49d925d96a
Merge remote-tracking branch 'origin/develop' into ent-3445-Solucionar_problematica_flip_flop
...
Conflicts:
pandora_console/extras/mr/27.sql
Former-commit-id: 67c41a5bd6a4c95647b097171578c5af67b491fa
2019-04-05 16:48:58 +02:00
49c913c6de
Added custom fields to report templates
...
Former-commit-id: 525d21d17835a3bb08f47df273128e658a35bcd9
2019-04-04 17:31:11 +02:00
798a2aad16
WIP discovery F3
...
Former-commit-id: 19570468cf4de9f600ab9a01468d1e59c69e6939
2019-04-03 18:13:19 +02:00
11b2fbc245
WIP db
...
Former-commit-id: 3c231b9d90dc6c9fae5e7e398e829c8c28ffeed9
2019-04-02 16:25:29 +02:00
1fd40447e1
Custom fields in availability report type
...
Former-commit-id: 1f04e5728cf7d0ed5079c16488493188379d536c
2019-04-02 16:24:29 +02:00
431c807f61
Merge branch 'develop' into 'ent-3445-Solucionar_problematica_flip_flop'
...
# Conflicts:
# pandora_console/extras/mr/27.sql
Former-commit-id: 4fcd03764bf959fb6b126df48e20bc29327105b2
2019-04-02 10:21:04 +02:00
2afc16c8dc
Merge branch 'ent-1901-Enviar-reportes-por-mail-en-otros-formatos-que-no-sean-PDF' into 'develop'
...
Ent 1901 enviar reportes por mail en otros formatos que no sean pdf
See merge request artica/pandorafms!2272
Former-commit-id: 590eddf946623393d02a8c88db33fde2af022937
2019-04-01 17:51:37 +02:00
48c4eb9c01
Add changes in migrate and 27.sql file
...
Former-commit-id: 60c2e2f2dc9a78ff9fb236efe7ac57a288d3717a
2019-03-29 13:58:53 +01:00
e3222626dc
fixed error in bbdd
...
Former-commit-id: dddd4fc90a4d3847c04108ba4dcdd4988872066f
2019-03-28 09:49:16 +01:00
626aacbf43
Merge remote-tracking branch 'origin/develop' into ent-3445-Solucionar_problematica_flip_flop
...
Former-commit-id: 26e21338ea5e7578a4247771d19df75d01e6234e
2019-03-28 08:49:08 +01:00
a3865a3181
flip flop keep counters
...
Former-commit-id: 0d39875c7a78f4be07fdffcf76a686007333c626
2019-03-27 18:16:53 +01:00
128a97d254
fix mr 26
...
Former-commit-id: 72c38dbc1bc8ac4973d6f19cf111ce107497e4ef
2019-03-27 17:38:08 +01:00
66b2102052
Merge remote-tracking branch 'origin/develop' into fix/mr
...
Former-commit-id: a95ef0c2110e1c0b7be3e9c6cd93543f79e0f230
2019-03-27 17:09:46 +01:00
6ebbe54448
minor fix
...
Former-commit-id: 252895bd6c64e5a1cb593ba705fb15a2ec6bed97
2019-03-27 17:06:14 +01:00
b2f046e4d6
Merge remote-tracking branch 'origin/ent-3595-discovery-fase-2' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
...
Conflicts:
pandora_console/extras/mr/26.sql
pandora_console/include/class/ConsoleSupervisor.php
pandora_console/include/class/NetworkMap.class.php
pandora_console/include/styles/pandora.css
pandora_console/operation/menu.php
Former-commit-id: 2a0661a65772d4a91f95587d77b0d1287fb66b18
2019-03-27 12:11:23 +01:00
d1bd5fbb1a
Merge branch 'ent-3595-discovery-fase-2' of https://brutus.artica.lan:8081/artica/pandorafms into ent-3595-discovery-fase-2
...
Former-commit-id: 914a944b96af8bceb26bbb89dbac25452097e20a
2019-03-26 13:06:12 +01:00
1238f15190
discovery task advanced summary support
...
Former-commit-id: f9be116dbc2d9b07119794374319ea79a3343a81
2019-03-25 17:32:18 +01:00
2711eb59ea
Merge remote-tracking branch 'origin/ent-3595-discovery-fase-2' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
...
Conflicts:
pandora_console/extras/mr/26.sql
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
pandora_console/pandoradb.sql
Former-commit-id: 29c3e96f3022c59a9252849c2adeb29182476395
2019-03-25 09:20:06 +01:00
a0f4163c1d
Fix netflow filters on database
...
Former-commit-id: ae1326117f0a78f2234485f1a260df2923e6ce6b
2019-03-20 17:19:56 +01:00
791a3ccfc6
Merge branch 'ent-3595-discovery-fase-2' of https://brutus.artica.lan:8081/artica/pandorafms into ent-3595-discovery-fase-2
...
Former-commit-id: 4ac64c1af6d4487f6a5d1ad1a55400b1879bb730
2019-03-20 15:48:37 +01:00
67d24860d1
Merge remote-tracking branch 'origin/ent-3610-Vista-Edicion-de-Usuario' into ent-3595-discovery-fase-2
...
Former-commit-id: 8a9d1b18d9d3894f2ef7823d3b5624b5c7f59088
2019-03-20 15:46:33 +01:00
bc9192b98a
[Netflow] Merge three reports in one
...
Former-commit-id: 1a7fb1aaacda5009ba2ab911dc69594133517f91
2019-03-19 17:33:39 +01:00
6121c2a32b
Added types reports to send email
...
Former-commit-id: 7d2f349c47d81de454cb5464146d4f0ac2fc3fb6
2019-03-19 17:16:31 +01:00
b660da6e84
Merge remote-tracking branch 'origin/develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
...
Conflicts:
pandora_console/extras/mr/26.sql
pandora_console/install.php
Former-commit-id: dda11929acf5f741e0a4d290b4607ae72683284b
2019-03-14 10:49:16 +01:00
750c64fbd7
Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2
...
Former-commit-id: 8dd2601c41392e8b252b2a719d16deef5b6398c7
2019-03-13 09:52:00 +01:00
c41c9d10e0
Changed sql files
...
Former-commit-id: b9b20d2a5aee08ca1638df9bdb8e16c3b693d47b
2019-03-08 10:01:55 +01:00
d4f5482e99
Added custom field combo values in agent custom field
...
Former-commit-id: 55ca33d3de14c868e1eec3f32179b33dc3ff589b
2019-03-07 13:37:36 +01:00
09897591c3
Add extended events to event reporting tables
...
Former-commit-id: afbf41109bc382c6b26cb0e6b97d5dc3d580c256
2019-03-05 15:03:05 +01:00
287ce78260
Move tnetwork_matrix to mr 26
...
Former-commit-id: 731ffaeb7253345bc83afe645f788e6a130080b4
2019-02-28 18:18:20 +01:00
511c5e3d10
Merge branch 'develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
...
Conflicts:
pandora_console/extras/mr/25.sql
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
pandora_console/godmode/agentes/configurar_agente.php
pandora_console/install.php
pandora_server/util/pandora_db.pl
Former-commit-id: 634d25e1ada208d27ba283506161682a9aa45949
2019-02-28 17:13:48 +01:00
11106f9b86
Merge branch 'ent-2835-revision-visor-de-logs' into 'develop'
...
Added models in tlog_graph_models
See merge request artica/pandorafms!2200
Former-commit-id: 33da3ceca68bc25975dd9f62ed24d7ca0c8a01e4
2019-02-25 19:37:49 +01:00
7f47a4504b
Merge branch 'develop' into 'ent-2082-Mejoras-en-selector-de-widgets'
...
# Conflicts:
# pandora_console/extras/mr/25.sql
Former-commit-id: b0781f5c0d3bce0fdd6a35bba4c77a26f8d112ac
2019-02-25 18:47:28 +01:00
4bf7469565
change mr and migrate for table twidget
...
Former-commit-id: fb7bfc3771b2c019a7e70771d4e5bd47043ba99b
2019-02-25 18:42:52 +01:00
13cbc78fdd
change mr and migrate for table twidget
...
Former-commit-id: d7d07f5e036a8dd81debcb974bd42217e2b59b26
2019-02-25 18:41:24 +01:00
16f1474691
Added models in tlog_graph_models
...
Former-commit-id: 76d6f1358677c02eab4681a1bb290fda0476c91b
2019-02-25 17:45:37 +01:00
d8ee90c285
Merge remote-tracking branch 'origin/develop' into ent-3430-discovery
...
Former-commit-id: cd7b77b0fe8fa41f03024af752b8793ae877de2b
2019-02-25 14:42:48 +01:00
e65d128b25
minor fix db schema
...
Former-commit-id: a4f87c1c7fd9da0f16a37f75cb5029ac6694baef
2019-02-22 12:40:02 +01:00
42448cf0d8
Updated path for discovery plugins
...
Former-commit-id: 222373efee3c768619d5f301f3ae291009901e64
2019-02-22 10:41:54 +01:00
2e9322515d
Move network matrix mr
...
Former-commit-id: 18227212ce8961c9dae24939fa364c03e6f7dff8
2019-02-22 08:45:05 +01:00
50155dd10b
Added tnetwork_matrix table
...
Former-commit-id: c933f5c00d68dd459ca15176dbc1a914f2b7ea32
2019-02-21 18:44:40 +01:00
e856969a59
Minor fix changed vmware_plugin reference to vmware-plugin
...
Former-commit-id: 20e80bfffaf80583c320aa62d35e54f79e6ab03e
2019-02-21 15:13:27 +01:00
8fb84e910a
Minor SQL fixes discovery
...
Former-commit-id: e2513e61ea6038f0bdb8f009619dcb92f07b992e
2019-02-21 14:29:59 +01:00
1167cfcafc
Minor SQL fixes discovery
...
Former-commit-id: 8d27ac99269f228b7fbb0c46b722bc5ea54c86ab
2019-02-21 14:27:09 +01:00
c12ba3b12e
Minor MR and sql updates - presets
...
Former-commit-id: edf310a362b58c68dcadbb078b899948430f23e3
2019-02-21 13:58:29 +01:00
698451ee98
MR25 Discovery
...
Former-commit-id: 2685a72781173e3d87363fe0bc2b5dd72961cdce
2019-02-21 13:38:58 +01:00
acf3c94642
fix bad solved conflict and added changes in bd to migrate and mr
...
Former-commit-id: d52e91d0f2b886620aa9fc07dda48bfeb27ffe0c
2019-02-21 13:16:32 +01:00
a1ba6fdf07
Merge branch 'develop' into 1440-Exportar-informes-pdf-en-formato-apaisado
...
Former-commit-id: ec3448cc0059fbf95e5ada224ca0f9082f6d693c
2018-12-19 19:15:43 +01:00
386eeec7ef
Added group_recursion as tevent_rule column
...
Former-commit-id: fe86489eec11dd38627b8a72b9855e6675507281
2018-12-11 16:07:13 +01:00
a03adb1762
add field group filter
2018-12-03 18:00:41 +01:00
01a9621eb5
Custom fields view add new filters
2018-12-03 11:36:34 +01:00
5ac947c2fd
Merge branch 'ent-2169-REDIRIS-modificacion-de-comandos-en-alertas' into 'develop'
...
Ent 2169 rediris modificacion de comandos en alertas
See merge request artica/pandorafms!1878
2018-11-20 11:33:00 +01:00
4dbcecb951
WIP custom fields view
2018-11-13 15:46:44 +01:00
d63666cbbc
Merge branch 'develop' into ent-2169-REDIRIS-modificacion-de-comandos-en-alertas
...
Conflicts:
pandora_console/extras/mr/22.sql
pandora_console/godmode/alerts/alert_actions.php
Modified files extra:
pandora_console/include/functions_alerts.php
2018-11-08 14:00:49 +01:00
ef90536152
added new field in treport table
2018-11-02 16:31:54 +01: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
9d7f063ef2
Changed tlayout_template name table to varchar 600
2018-10-24 12:39:58 +02:00
f4add9a7f8
Changed tlayout_template name table to varchar 600
2018-10-24 11:49:18 +02:00
3946124cc7
Inaugurate the 22 mr with an alter table in talert_commands
2018-10-22 09:49:06 +02:00
6bb478ea1a
Merge remote-tracking branch 'origin/develop' into 2221-Actualizacion_de_Pandora_a_version_7_de_PHP
2018-10-22 08:04:36 +02:00
a7918a1816
delete field flash chart php7
2018-10-19 11:56:49 +02:00
e299209a92
fixed visual console custam graph in meta
2018-10-18 13:24:15 +02:00
aff2879340
Merge remote-tracking branch 'origin/develop' into ent-2740-servicios-favoritos
...
Conflicts:
pandora_console/extras/mr/21.sql
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
pandora_console/pandoradb_data.sql
2018-10-16 11:35:14 +02:00
42caddeadd
Modified query to match MR requirements
2018-10-10 14:32:43 +02:00
9b7ae31344
MR change
2018-10-09 16:09:44 +02:00
c1af14b90e
Change tlayou name table to varchar 600 - #2823
2018-10-05 12:25:15 +02:00
896ba6051b
fixed issue with string data in visual map
2018-09-26 11:00:44 +02:00
8979890964
Added is_favourite to tservice table
2018-09-18 19:05:20 +02:00
8196ed21df
New mr 21.sql commit
2018-09-18 18:55:53 +02:00
65010d7080
Merge remote-tracking branch 'origin/develop' into 2497-Especificar-version-SNMP-en-tarea-de-reconocimiento-Lead-21487
...
Conflicts:
pandora_console/extras/mr/20.sql
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
pandora_console/pandoradb.sql
2018-09-18 11:17:47 +02:00
080cfb20ca
Merge branch 'develop' into '1979-5352-plugin-de-monitorizacion-log-apache-dev'
...
# Conflicts:
# pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
2018-09-17 14:44:24 +02:00
50a3e43bd4
Insert apache log model in tlog_graph_models
2018-09-17 12:43:51 +02:00
c9af020d91
Remove unwanted git traces on 20.sql
2018-09-17 10:16:12 +02:00
19645f0550
Modified trecon_task table
2018-09-13 18:17:28 +02:00
e9752e790e
Added columns for a policy feature
2018-09-13 16:57:13 +02:00
a2b3d6e07f
Deleted reports from cron
2018-09-12 13:43:23 +02:00
40ff7b9042
Now is possible to link visual consoles from different nodes to the visual console elements
2018-09-10 11:25:44 +02:00
816b969741
Added table tlog_graph_models
2018-09-06 16:48:18 +02:00
36247d391f
Merge branch 'develop' into ent-2588-service-like-visual-console-status
2018-09-04 17:25:23 +02:00
22696a0fc6
Added new modes to calculate the status of the linked visual maps
2018-09-04 17:23:42 +02:00
19f7a5180c
Added default value in parent_module_id
2018-09-04 12:48:58 +02:00
5b30aa5560
Added source, comment and id_extra in event filter
2018-08-31 16:25:12 +02:00
5f4d76f3a7
fixed recursion option in custom report's item editor
2018-08-28 16:38:32 +02:00
8a5495a283
Merge branch 'develop' into ent-2335-gis-group-items
2018-08-17 11:17:29 +02:00
7da4557abc
Added the feature of the new map items (groups) and fixed more bugs
2018-08-17 11:07:42 +02:00
4678c0df53
Fixed copy is_secondary to no_hierarchy in mr 19
2018-08-14 14:16:40 +02:00
3daea977b0
Fixed migration rebranding Event commands
2018-08-13 14:10:19 +02:00
188733962f
Changed is_secondary by no_hierarchy on tusuario_perfil table
2018-08-07 08:31:40 +02:00
f10058428f
Added backend functions to create vconsole template
2018-08-01 12:22:13 +02:00
cb77a299bb
add templates console visual
2018-08-01 09:58:48 +02:00
079b2437b6
Merge remote-tracking branch 'origin/develop' into 1885-ue-configurador-automatico-de-agentes
2018-07-23 18:06:02 +02:00
b922066a72
Add items to the view events
2018-07-19 18:04:50 +02:00
c09a91b284
Added server-name in tautoconfig_rules
2018-07-19 08:35:33 +02:00
b6347072c5
Migrate sql meta policies (add id_node)
2018-07-18 19:19:57 +02:00
86c21aea5d
merge develop
2018-07-12 13:37:46 +02:00
78f17b9970
fixed error bbdd new field CPS in tpolicy_modules
2018-07-12 09:48:51 +02:00
23a9cf7842
Minor fixes
2018-07-04 19:59:31 +02:00
c800061bc2
Autoconfiguration v1
2018-07-04 18:39:06 +02:00
f430b8998f
Added DB changes to support ProvisioningServer 2
2018-07-03 12:01:37 +02:00
1b1bc4aa2e
add new column evaluate_sla into table tservice
2018-06-28 13:34:55 +02:00
17b726d7a0
changes bd for mr, schema and migrate and update tocken mr
2018-06-21 14:15:27 +02:00
faccbec12d
Added a new inventory module to the database
2018-06-19 15:55:33 +02:00
04aad98871
Added the database changes for the custom fields of the remote inventory modules
2018-06-19 13:49:36 +02:00
822fc05258
Merge branch '2042-HA_cluster-dev' into 'develop'
...
2042 ha cluster dev
See merge request artica/pandorafms!1524
2018-06-13 16:14:29 +02:00
6f689f0d0e
Added mr 17 and update migrate
2018-06-13 15:39:31 +02:00
750ed29ac9
[Rebranding] Added a header to white backgrounds and make the favicon and the mobile console configurable
2018-05-24 16:59:50 +02:00
66dfd9b171
[Rebranding] Change alert action Pandora FMS Event to Monitoring Event
2018-05-24 11:16:30 +02:00
d76f8f6c76
Fix MR - #2007
2018-04-30 14:59:35 +02:00
6affae9872
drop agents foreign keys in tcluster tables - #2007
2018-04-30 13:06:08 +02:00
1f79326e97
[Secondary groups] Added SQL changes to migrate scripts
2018-04-10 09:38:00 +02:00
364daa8579
Added group_id in cron job(mr and migrate)
2018-03-21 16:51:08 +01:00
19b566d4c2
Fix cluster id_os bug - #2090
2018-03-20 15:42:37 +01:00
43e374f454
Fix id_os 100 cluster - #1748
2018-03-19 19:09:45 +01:00
458938b751
Fixed mr 13
2018-03-15 14:32:51 +01:00
42107017bf
Merge remote-tracking branch 'origin/develop' into 1873-autoprovisionamiento-de-agentes
2018-03-13 18:40:51 +01:00
560f18f3a2
Add tables for agent provisioning to the schema.
2018-03-13 18:01:04 +01:00
9b9b46ac65
1923 added new tables to MR and migrate sql script
2018-03-13 16:38:09 +01:00
beac30513d
Ad id_os cluster to tconfig_os - #2001
2018-03-01 16:17:26 +01:00
9d36887a02
Fixed graph precision
2018-02-28 14:33:22 +01:00
a6b28cb40e
Fix MR - #1748
2018-02-13 15:59:30 +01:00
c0ee22dbd9
MR 12 clusters - #1748
2018-02-07 15:19:17 +01:00
65dccd3935
MR 12 changes for cnimation clock ticket - #1403
2018-02-06 10:52:49 +01:00
aea9d6ae36
resolved conflicts with containers and added mr12
2018-02-06 09:21:07 +01:00
934ab8ed91
Add support for periodically updating the status of unknown modules.
2018-01-11 16:00:22 +01:00
b10e9cfc67
fixed errors in favourite consola visual
2018-01-04 13:10:25 +01:00
e2ee8a555d
add fullscale container graph
2018-01-03 15:53:49 +01:00
ead1161e0b
add fullscale combined and custom graph
2018-01-03 12:13:00 +01:00
9a0438bc36
Merge branch 'develop' into 1611-No-se-envían-los-informes-por-correo-desde-Metaconsola-4881-vodat
...
Conflicts:
pandora_console/extras/mr/10.sql
2018-01-02 16:56:48 +01:00
ff60278060
fixed error in bbdd tsnmp_filter
2018-01-02 13:54:08 +01:00
0b5678fba6
add new funtionality view favourite console visual
2017-12-28 15:13:06 +01:00
d0d0f8b229
Fix custom graph builder order bar - #1382
2017-12-13 13:08:41 +01:00
43e697a1cb
Added hint in field Add summatory series
2017-12-13 11:50:15 +01:00
afcd03658e
Fix sending mails for reports an templates reports by cronjobs - #1611
2017-12-05 11:40:41 +01:00
6075c9b6b9
1326 / 1382 - Mr 10 changes
2017-11-30 11:55:11 +01:00
828d19a47a
Added mr file
2017-11-29 14:00:27 +01:00
ede677f07c
Added safe_mode_module in metaconsole
2017-11-16 13:38:59 +01:00
f2ad76636c
Merge branch 'develop' into varias-consolas-visuales-en-un-solo-dashboard-modo-slideshow-opcional
...
Conflicts resolved:
pandora_console/extras/mr/9.sql
2017-11-16 09:49:11 +01:00
b565500182
Added sql to MR
2017-11-16 08:32:39 +01:00
b5cff77a4f
Added visual console querys
2017-11-15 16:10:43 +01:00
e8076645d0
Merge branch 'develop' into '1491-Limite-de-caracteres-direcciones-de-email-en-cron-jobs-dev'
...
# Conflicts:
# pandora_console/extras/mr/9.sql
2017-11-15 09:47:21 +01:00
b12d529578
Merge branch '1276-Cascade-protection-a-nivel-de-módulo-dev' into 'develop'
...
1276 cascade protection a nivel de módulo dev
See merge request artica/pandorafms!933
2017-11-15 09:31:05 +01:00
baab22bb28
add queries mr8 and migrate
2017-11-07 11:44:09 +01:00
2da1e57dc1
Change pandora migrate and add mr8 changes - #654
...
Conflicts:
pandora_console/extras/mr/8.sql
2017-10-30 17:26:35 +01:00
9b1cbf3c9b
Changed column in tuser_task_scheduled
2017-10-24 13:10:07 +02:00
f6e012e0fa
Added time autorefresh
2017-10-23 13:17:06 +02:00
b641323eed
[ artica/pandora_enterprise#1462 ] Added the DB changes needed by the dashboard items slideshow feature
2017-10-18 17:29:06 +02:00
74308ae42b
Created Safe operation mode
2017-10-17 16:58:05 +02:00
1838a6b30a
Revert "Merge branch '145-plain-text-mail-cannot-be-send-by-email_mr' into 'develop'"
...
This reverts merge request !863
2017-10-16 16:44:16 +02:00
2d673c8ac1
create mr8 for send mail plain/text
2017-09-27 13:46:29 +02:00
8ce6920e44
DB changes for visual console group elements - #1245
2017-09-07 12:11:13 +02:00
f954b92aae
fixed error in mr for WUX
2017-09-05 11:06:49 +02:00
d74a3f74b4
Merge branch 'develop' into 1056-pandora-wux-grid-server
2017-09-01 10:51:54 +02:00
6b4a15534d
Merge branch 'develop' into '1211-Falta-tabla-de-proceso-de-reseteo-de-contraseñas-en-MR'
...
# Conflicts:
# pandora_console/extras/mr/6.sql
2017-08-31 18:21:08 +02:00
afd184f466
Update 6.sql
2017-08-31 17:58:34 +02:00
2fe8849708
Added db changes to mr 6
2017-08-31 11:33:08 +02:00
b078d48918
fixed errors in wux
2017-08-30 09:47:57 +02:00
068be133ed
Add password reset table in MR - #1211
2017-08-28 12:22:59 +02:00
c29d8a4fdb
Revert "merge develop"
...
This reverts commit 8232911713f5da86ac0a
2017-08-23 09:35:17 +02:00
8232911713
merge develop
2017-08-22 18:39:34 +02:00
1d7d55a451
fixed errors in form wux
2017-08-09 13:27:51 +02:00
3ef3679f10
Fixed issue with cascade_protection_module
2017-08-08 10:38:30 +02:00
590bfbfe84
mr-5 add queries
2017-08-07 13:57:04 +02:00
6dba0a5040
Merge branch 'develop' into '713-Asignar-políticas-a-grupos-dev'
...
# Conflicts:
# pandora_console/extras/mr/4.sql
2017-07-18 12:24:49 +02:00
f0e43e252c
New feature: Add groups to policies
2017-07-18 12:06:57 +02:00
4aa04cfef0
Set texport_server table name field varchar 600 - #1015
2017-07-17 16:19:38 +02:00
1ea465b7d4
Added db changes to package 708
2017-07-17 10:46:26 +02:00
035829ce91
Replaced procedures with prepared statements.
...
The Update Manager client cannot load MySQL procedures because the
parser breaks them.
2017-06-15 15:43:00 +02:00
d2d56b4b89
Add a missing MR.
2017-06-15 13:47:20 +02:00
7c3ef317b0
Revert "Add a missing MR."
...
This reverts commit 16b0da1515
2017-06-15 10:50:31 +02:00
16b0da1515
Add a missing MR.
2017-06-15 10:33:30 +02:00
7a9f63f212
Added change to db
2017-06-01 14:30:34 +02:00
efd28c0513
Added Enrique Camargo db changes to mr number 2
2017-06-01 11:28:24 +02:00
a4636f3435
Added changes in db
2017-05-29 11:55:04 +02:00
0f9a2cf2f8
New feature: Graphic grouping. added mr
2017-05-23 17:17:40 +02:00
2e3f6ad700
Added change to mr
2017-05-10 15:21:42 +02:00
de650b9ef2
Added change to mr (enriquecd)
2017-04-25 16:26:45 +02:00
82530c9b59
Added external query to mr
2017-04-20 16:18:37 +02:00
29ad608ddb
Added ; to query transaction
2017-04-18 11:41:51 +02:00
97abef62c4
Added db field to mr
2017-04-18 11:39:46 +02:00
ef95602157
delete file
2017-04-07 10:48:28 +02:00
3d506d2967
new file.
2017-04-06 15:43:02 +02:00
12548bddc8
new file.
2017-04-06 14:13:19 +02:00
5582240770
removed file.
2017-04-05 17:47:27 +02:00
0d21e46939
new file.
2017-04-05 11:09:48 +02:00
a445877497
new file.
2017-03-31 10:36:05 +02:00
644eeaa7aa
delete file
2017-03-23 16:51:00 +01:00
d006c81eb0
delete files.
2017-03-23 15:53:44 +01:00
b00ddd9beb
new file.
2017-03-22 11:29:28 +01:00
5cf45a08ec
new file
2017-03-22 11:10:09 +01:00
2b7e5de6a1
new file
2017-03-22 11:03:38 +01:00
be188dcf68
new file
2017-03-22 10:47:51 +01:00
7c94400e7b
MR
2017-03-22 10:29:10 +01:00
0b564c2866
new file
2017-03-21 13:43:01 +01:00
2994a9f8a1
new file.
2017-03-21 13:32:08 +01:00
c23767c5d7
new mr file.
2017-03-21 13:11:17 +01:00
d6fb515034
new file.
2017-03-21 12:23:46 +01:00
d5a70bc15e
Deleted files.
2017-03-21 12:04:05 +01:00
cb1cd58d83
new file
2017-03-17 11:36:10 +01:00
37fd8f8851
new sql mr
2017-03-16 12:23:25 +01:00
5d09cfdef3
new file
2017-03-16 12:03:29 +01:00
e7fa5d1f00
New file
2017-03-16 11:15:36 +01:00
309ed42a8f
New mr.
2017-03-15 17:20:16 +01:00
def9172bb9
Deleted files.
2017-03-15 17:04:40 +01:00
a094f67dd9
New file.
2017-03-15 15:50:36 +01:00
a85298d432
new file
2017-03-14 17:11:47 +01:00
26339b39f0
delete file
2017-03-14 16:57:51 +01:00
01945c3cb5
new mr
2017-03-14 16:56:00 +01:00
32f984020b
new mr
...
o
2017-03-14 16:51:38 +01:00
cc39f6d1a8
New file.
2017-03-14 16:46:21 +01:00
fd4b62f604
Delete files
2017-03-14 15:47:11 +01:00
f18f2e1068
New file.
2017-03-14 12:11:16 +01:00
f49d7f3eec
New file.
2017-03-14 10:21:38 +01:00
469c276512
Added file.
2017-03-08 13:26:06 +01:00
bbab12f50e
added file.
2017-03-08 13:12:31 +01:00
ef0f55e2c2
added file.
2017-03-08 11:44:49 +01:00
eea926255b
Added new files.
2017-03-06 13:44:41 +01:00
cf2915ec73
Added dir estructure to minor release system.
2016-07-20 10:54:08 +02:00
marcos.alconada
fbsanchez
Daniel Barbero
manuel
Daniel Rodriguez
fermin831
alejandro-campos
Daniel Maya
vgilc
enriquecd
manuel.montes
Alejandro Gallardo Escobar
Ramon Novoa
Arturo Gonzalez
Alejandro Gallardo Escobar
Enrique Camargo