fbsanchez
|
bbedf36235
|
minor update
Former-commit-id: da7ef108bd3b71ece515407fb932e6b9bef761fd
|
2019-04-23 16:28:22 +02:00 |
|
fbsanchez
|
cbdd8e7104
|
Merge remote-tracking branch 'origin/develop' into ent-3674-discovery-fase-3
Former-commit-id: 4efed0a1512550d09b8beb6a9851f7b1eeb3ff0c
|
2019-04-22 09:01:24 +02:00 |
Marcos Alconada
|
d3d5312f40
|
Update 27.sql
Former-commit-id: 4e027274bb9edeb51dc64f935ddd3ee2bfd62d0d
|
2019-04-15 11:14:41 +02:00 |
|
marcos.alconada
|
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 |
|
fbsanchez
|
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 |
|
fbsanchez
|
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 |
Daniel Barbero
|
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 |
manuel
|
49c913c6de
|
Added custom fields to report templates
Former-commit-id: 525d21d17835a3bb08f47df273128e658a35bcd9
|
2019-04-04 17:31:11 +02:00 |
|
fbsanchez
|
798a2aad16
|
WIP discovery F3
Former-commit-id: 19570468cf4de9f600ab9a01468d1e59c69e6939
|
2019-04-03 18:13:19 +02:00 |
|
fbsanchez
|
11b2fbc245
|
WIP db
Former-commit-id: 3c231b9d90dc6c9fae5e7e398e829c8c28ffeed9
|
2019-04-02 16:25:29 +02:00 |
|
manuel
|
1fd40447e1
|
Custom fields in availability report type
Former-commit-id: 1f04e5728cf7d0ed5079c16488493188379d536c
|
2019-04-02 16:24:29 +02:00 |
|
daniel
|
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 |
|
marcos.alconada
|
48c4eb9c01
|
Add changes in migrate and 27.sql file
Former-commit-id: 60c2e2f2dc9a78ff9fb236efe7ac57a288d3717a
|
2019-03-29 13:58:53 +01:00 |
|
Daniel Barbero Martin
|
e3222626dc
|
fixed error in bbdd
Former-commit-id: dddd4fc90a4d3847c04108ba4dcdd4988872066f
|
2019-03-28 09:49:16 +01:00 |
|
Daniel Barbero Martin
|
a3865a3181
|
flip flop keep counters
Former-commit-id: 0d39875c7a78f4be07fdffcf76a686007333c626
|
2019-03-27 18:16:53 +01:00 |
|
manuel
|
6121c2a32b
|
Added types reports to send email
Former-commit-id: 7d2f349c47d81de454cb5464146d4f0ac2fc3fb6
|
2019-03-19 17:16:31 +01:00 |