artica
|
8bf92720ee
|
Auto-updated build strings.
Former-commit-id: 544097161030608395112a142ed341e26700a678
|
2019-04-16 00:01:30 +02:00 |
|
Daniel Rodriguez
|
7c8b1fcf27
|
Merge branch 'ent-3625-Aviso-No-acceso-a-página' into 'develop'
Ent 3625 aviso no acceso a página
See merge request artica/pandorafms!2357
Former-commit-id: 7e4824a223e85f73b02bf6b85c37a83dc137979b
|
2019-04-15 18:32:54 +02:00 |
|
marcos.alconada
|
e9fee71078
|
Merge branch 'ent-3750-carrefour-api-crear-modificar-y-eliminar-perfiles-de-usuarios-metaconsola' of https://brutus.artica.lan:8081/artica/pandorafms into ent-3750-carrefour-api-crear-modificar-y-eliminar-perfiles-de-usuarios-metaconsola
Former-commit-id: e12c3e1ad1b695745a506375ab62033ababc5800
|
2019-04-15 17:53:31 +02:00 |
|
Marcos Alconada
|
bda67d56c4
|
Update functions_api.php
Former-commit-id: 91efe3435a08085d63e4fc4129b97c290653f237
|
2019-04-15 17:49:10 +02:00 |
|
marcos.alconada
|
86ff1accbd
|
Sintax problems resolved on Api.php
Former-commit-id: e42cbd99938e57abad1ea4e9c76ddeedb9e0cc01
|
2019-04-15 17:18:16 +02:00 |
|
Ramon Novoa
|
c971191477
|
Do not get stuck trying to send buffered XML files to a secondary server.
Ref pandora_enterprise#3379
Former-commit-id: 7f7a1ca5958cd8959516de5f46737d7b88074dd0
|
2019-04-15 16:22:14 +02:00 |
|
marcos.alconada
|
28eae48a9e
|
Changed sintaxis
Former-commit-id: 4011dbcba98ad59e7a152e2e3e87c6ae8d646a85
|
2019-04-15 15:51:01 +02:00 |
|
Marcos Alconada
|
8c27411be6
|
Delete plugin.php
Former-commit-id: c37a85bcf4082a148e72cdc9b1a166a70ec94537
|
2019-04-15 15:18:22 +02:00 |
|
marcos.alconada
|
a3787c687c
|
prueba
Former-commit-id: 61d4bc20b7811c44125b806f960561eb40412818
|
2019-04-15 15:10:43 +02:00 |
|
Tatiana Llorente
|
29c282dc79
|
Changed popup no access - #3625
Former-commit-id: 0798f53d9074a580309aeb9f9577ec518efd9264
|
2019-04-15 14:42:58 +02:00 |
|
fbsanchez
|
072fec3dd1
|
removed map link from mysql/oracle/RDS discovery tasks
Former-commit-id: c01ca25dbe4ca16265a6377d80f60f6d603b7664
|
2019-04-15 13:03:11 +02:00 |
|
fbsanchez
|
6648e0268a
|
removed reconview link from menu
Former-commit-id: 41b80e4eaa41617982c91a218aee3902b76e4fde
|
2019-04-15 12:54:22 +02:00 |
|
Marcos Alconada
|
c8af83b112
|
Update with validations and type return data functions_api.php
Former-commit-id: 0757de69c24df3e547924d8dacd32ba9dd88524c
|
2019-04-15 12:30:42 +02:00 |
|
marcos.alconada
|
994424fe52
|
Functions changed
Former-commit-id: 7eb0fb25ec863df6c60ed88bf84a6f5db5c90979
|
2019-04-15 12:19:35 +02:00 |
|
vgilc
|
f3590e1d54
|
Merge branch 'ent-3792_spec_console_enterprise_for_rhel7' into 'develop'
fixed minor bug in the open spec
See merge request artica/pandorafms!2356
Former-commit-id: e5a73f169ba8044a94b25b27d99cf384785221e5
|
2019-04-15 11:33:42 +02:00 |
|
Daniel Rodriguez
|
3e15b77095
|
Merge branch 'ent-3790-sobra-una-columna-de-tnetflow_filter' into 'develop'
Ent 3790 sobra una columna de tnetflow filter
See merge request artica/pandorafms!2313
Former-commit-id: 31e8399658450e3f0ac4bd591f7eee631b3ba937
|
2019-04-15 11:22:28 +02:00 |
|
Rafael Ameijeiras
|
eca7f6e53a
|
fixed minor bug in the open spec
Former-commit-id: 0d8aacf0d4e7ae6199d103e62b6a6a8891c3a0f2
|
2019-04-15 11:20:57 +02:00 |
|
Marcos Alconada
|
d3d5312f40
|
Update 27.sql
Former-commit-id: 4e027274bb9edeb51dc64f935ddd3ee2bfd62d0d
|
2019-04-15 11:14:41 +02:00 |
|
artica
|
68258661b1
|
Auto-updated build strings.
Former-commit-id: a45bf5f65399be38165be423f0b40a40e4468522
|
2019-04-15 00:01:24 +02:00 |
|
artica
|
d0f6726d00
|
Auto-updated build strings.
Former-commit-id: b06d9487fb226c80a72020082f0b33ee2af854f7
|
2019-04-14 00:01:23 +02:00 |
|
artica
|
ef0f7cded8
|
Auto-updated build strings.
Former-commit-id: c9f4339d4c39a14d446e1a3ea42c28d68398670d
|
2019-04-13 00:01:31 +02:00 |
|
fbsanchez
|
8bdc980ab0
|
minor fix
Former-commit-id: 4222b217953e88da43d0f50d3217a065dbb13332
|
2019-04-12 23:47:21 +02:00 |
|
fbsanchez
|
5d176bb61f
|
Merge branch 'ent-3792-spec_console_enterprise_for_rhel7' into 'develop'
spec console open and build_rpm for rhel7
See merge request artica/pandorafms!2355
Former-commit-id: d40cbedb10b628adc8c710c2b37d0eaf64657af6
|
2019-04-12 19:24:54 +02:00 |
|
fbsanchez
|
45c9f6d51c
|
Merge remote-tracking branch 'origin/develop' into ent-3674-discovery-fase-3
Former-commit-id: 4c13aa9288330584db108ab04fd9ac096b2714ce
|
2019-04-12 19:24:27 +02:00 |
|
fbsanchez
|
fa6529b652
|
Merge remote-tracking branch 'origin/develop' into ent-3792-spec_console_enterprise_for_rhel7
Former-commit-id: 8c7e1f5f4aad250e01931a420f8da8819817152f
|
2019-04-12 19:18:15 +02:00 |
|
Tatiana Llorente
|
6a9c972ed6
|
Changed popup no access - #3625
Former-commit-id: c58c9f47bab666985ed4cfe0c9c5edf1ed057e76
|
2019-04-12 13:54:48 +02:00 |
|
fbsanchez
|
15cd02a49b
|
fix v1
Former-commit-id: f217f78e8085a81df68b9899513e547e148fca0d
|
2019-04-12 13:45:13 +02:00 |
|
marcos.alconada
|
3dafe2d66d
|
changed querys and refactor methods
Former-commit-id: 8a9ca4a6e70809ff76b922d20980725eb2d879ca
|
2019-04-12 13:20:59 +02:00 |
|
Daniel Rodriguez
|
9da83faade
|
Merge branch 'ent-3806-Nuevo_mapa_Edicion_usuario' into 'develop'
add map user edit
See merge request artica/pandorafms!2349
Former-commit-id: 921eb0faff704e17f26024ab2add32f53e151df7
|
2019-04-12 13:11:27 +02:00 |
|
Daniel Rodriguez
|
a792128906
|
Merge branch 'ent-3522-Conservar-perfiles-de-usuarios-standard-en-caso-de-cambio-LDAP/AD' into 'develop'
Added token save profile user
See merge request artica/pandorafms!2343
Former-commit-id: f6558be197626904837589df0a7559df60b2ef3e
|
2019-04-12 12:53:20 +02:00 |
|
marcos.alconada
|
ddfd3339ff
|
add api
Former-commit-id: 7704a1226754067aee849526329eebce372063a1
|
2019-04-12 11:39:34 +02:00 |
|
marcos.alconada
|
1e7fb2f375
|
concatenation
Former-commit-id: 1a025ccb247ada9f36f51309baee13f4a2c03a78
|
2019-04-12 11:37:12 +02:00 |
|
marcos.alconada
|
2ec72c4d78
|
Changed query
Former-commit-id: f5094c8747677108187e0ba377b80afce2bbd5e0
|
2019-04-12 11:10:42 +02:00 |
|
Tatiana Llorente
|
b50ed1c810
|
New arrow and timestamp images - #3707
Former-commit-id: 908928e47d7e635eee1e18925b176835f8e9c928
|
2019-04-12 10:41:55 +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 |
|
Daniel Barbero Martin
|
26d5060232
|
fixed errors css
Former-commit-id: eebae84a94b3c32350beb5cea4816b8fded28b32
|
2019-04-12 10:10:04 +02:00 |
|
manuel
|
61552bc201
|
Fixed ldap login
Former-commit-id: bd94a6112a88b3143973ab7f915de40995149ca8
|
2019-04-12 10:03:18 +02:00 |
|
Tatiana Llorente
|
59c2734b5a
|
Deleted old files. Centered the map. Fixed broken image in meta. - #3806
Former-commit-id: 30ebc8e1afeb3401011ee359ecd8626436d85fb7
|
2019-04-12 09:20:55 +02:00 |
|
artica
|
f5088299f3
|
Auto-updated build strings.
Former-commit-id: 3e8354494b7250c6bdcefbe8a961411bdfe5180a
|
2019-04-12 00:01:24 +02:00 |
|
fbsanchez
|
e80649073f
|
Minor fixes
Former-commit-id: 71698d61db59e7f94fb8c770715decb0fe6e5f0f
|
2019-04-11 15:36:55 +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
|
e998c8dd70
|
Discovery RDS
Former-commit-id: e03d600b06fec25fb5808b9425cc94832d9d1268
|
2019-04-11 15:05:03 +02:00 |
|
Rafael Ameijeiras
|
c91893c948
|
spec console open and build_rpm for rhel7
Former-commit-id: 324d90d95ea5757285e64ba3e28346ef007a815f
|
2019-04-11 13:45:57 +02:00 |
|
Tatiana Llorente
|
c33a2cfaf6
|
Change arrow images to sort the table in custom reports - #3707
Former-commit-id: 62613d1c4e41fff93217ddb111c3b8c7ddc08ff4
|
2019-04-11 10:26:26 +02:00 |
|
marcos.alconada
|
0afc699b2b
|
Add concatenation to user variable in filter user group function
Former-commit-id: 3e1cef1d560309cbfad9670e8e020ca352ac3619
|
2019-04-11 10:15:00 +02:00 |
|
Tatiana Llorente
|
187bdb1701
|
New design for the tables - #3707
Former-commit-id: 7781a8b392919f38259aed142f01e786fc82698a
|
2019-04-11 09:57:07 +02:00 |
|
artica
|
29e1fc828c
|
Auto-updated build strings.
Former-commit-id: 180188c01ab9644d5672f1b984a1454402acc1cd
|
2019-04-11 00:01:30 +02:00 |
|
fbsanchez
|
2af9cbb711
|
Discovery RDS Bypass perl thread ENV limitation
Former-commit-id: 34ca5374e66c174887683077ba5efcae5412b9bb
|
2019-04-10 23:16:18 +02:00 |
|
fbsanchez
|
834d5d6c50
|
WIP:Discovery RDS
Former-commit-id: d53eb29ec8e7c70c1c76918c1770f65ad81f8ba0
|
2019-04-10 20:40:03 +02:00 |
|
manuel
|
0f78d87504
|
Fixed bug in save profile users
Former-commit-id: 8f79e2c3de0e7cedb581d90e53f39ef176afe040
|
2019-04-10 16:12:22 +02:00 |
|