artica
|
42704e5981
|
Auto-updated build strings.
|
2017-05-24 00:01:10 +02:00 |
vgilc
|
c8251d62e0
|
Merge branch '788_Añadir_macros_para_varias_ips' into 'develop'
add new macros all_address and address_n
See merge request !497
|
2017-05-23 10:25:56 +02:00 |
|
vgilc
|
b21e09deef
|
Merge branch '635-reset-or-recover-password-in-pandora-node-and-meta-dev' into 'develop'
635 reset or recover password in pandora node and meta dev
See merge request !389
|
2017-05-23 10:14:43 +02:00 |
daniel
|
37d3d895b0
|
add new macros all_address and address_n
|
2017-05-23 10:09:32 +02:00 |
artu30
|
faa353bc5c
|
Merge branch 'develop' into '635-reset-or-recover-password-in-pandora-node-and-meta-dev'
# Conflicts:
# pandora_console/include/help/clippy/extension_cron_send_email.php
|
2017-05-23 09:50:22 +02:00 |
|
artu30
|
37757f7ace
|
Merge branch 'develop' into '596-default_event_filter_by_user'
# Conflicts:
# pandora_console/godmode/users/configure_user.php
|
2017-05-23 09:48:37 +02:00 |
|
artica
|
eddeb12bcf
|
Auto-updated build strings.
|
2017-05-23 00:01:18 +02:00 |
|
artu30
|
a78b5cc60d
|
Merge branch 'develop' into '777-translations-dev'
# Conflicts:
# pandora_console/godmode/update_manager/update_manager.offline.php
# pandora_console/include/functions_update_manager.php
|
2017-05-22 17:51:21 +02:00 |
|
artu30
|
b5d3893c41
|
Merge branch 'develop' into '836-fixed-margin-top-images-in-vc-lines-open-dev'
# Conflicts:
# pandora_console/include/javascript/pandora_visual_console.js
|
2017-05-22 17:38:49 +02:00 |
|
Arturo Gonzalez
|
f58a9151f7
|
Fixed bad merge, thx branches
|
2017-05-22 17:37:21 +02:00 |
|
Arturo Gonzalez
|
309e9e900e
|
Added margin top value to images when have lines
|
2017-05-22 17:31:29 +02:00 |
|
vgilc
|
6bded36a60
|
Merge branch '599-csv_divider_selector' into 'develop'
599 csv divider selector
See merge request !359
|
2017-05-22 17:11:52 +02:00 |
|
artica
|
3b6272a7d2
|
Auto-updated build strings.
|
2017-05-22 00:01:14 +02:00 |
|
artica
|
7d7d5a9cec
|
Auto-updated build strings.
|
2017-05-21 00:01:52 +02:00 |
|
artica
|
7749e7c08a
|
Auto-updated build strings.
|
2017-05-20 00:01:16 +02:00 |
enriquecd
|
bb0eec8883
|
Update en_GB translations - #886
|
2017-05-19 11:44:12 +02:00 |
|
artica
|
8d16f573cc
|
Auto-updated build strings.
|
2017-05-19 00:01:19 +02:00 |
|
Arturo Gonzalez
|
8141dac798
|
Added date format to long periods of time
|
2017-05-18 17:01:15 +02:00 |
Enrique Camargo
|
2ccd799cbd
|
Merge branch 'develop' into '825-La-pantalla-de-login-con-mysql-parado/no-configurado-no-se-ve-correctamente'
# Conflicts:
# pandora_console/general/login_page.php
|
2017-05-18 15:23:20 +02:00 |
|
artica
|
15b65ef3f8
|
Auto-updated build strings.
|
2017-05-18 00:01:18 +02:00 |
|
vgilc
|
4cee2eaea8
|
Merge branch '836-bad-parents-line-position-in-visual-console-dev' into 'develop'
836 bad parents line position in visual console dev
See merge request !448
|
2017-05-17 17:48:53 +02:00 |
|
vgilc
|
e89be76e61
|
Merge branch 'fixed-graphs-styles' into 'develop'
Fixed graphs styles Gitlab: #537
See merge request !283
|
2017-05-17 17:45:55 +02:00 |
|
vgilc
|
8be3e434c8
|
Merge branch '761-pandora-ux-widget-dev' into 'develop'
761 pandora ux widget dev
See merge request !414
|
2017-05-17 17:39:52 +02:00 |
|
vgilc
|
15a63f6b2b
|
Merge branch '735-Global-profile-user-with-pm-cannot-edit-module-treshold-in-policies-dev' into 'develop'
Added lost id to dynamic threshold select
See merge request !384
|
2017-05-17 17:31:26 +02:00 |
|
vgilc
|
3118a70f66
|
Merge branch 'dashboards-in-home-page-dev' into 'develop'
Added dashboards to "edit my user" section
See merge request !391
|
2017-05-17 17:20:29 +02:00 |
|
vgilc
|
eb7514dcd0
|
Merge branch '700-wrong_format_in_graphs' into 'develop'
Added new ranges to graph period
See merge request !355
|
2017-05-17 17:17:47 +02:00 |
|
vgilc
|
7d62f6ff50
|
Merge branch '797-infinite-session-time-dev' into 'develop'
797 infinite session time dev
See merge request !438
|
2017-05-17 17:15:18 +02:00 |
|
vgilc
|
5e442bcb0b
|
Merge branch '711-Agent-name-en-lugar-de-alias-en-visor-de-actividad-dev' into 'develop'
Changed name by alias when deleting agent
See merge request !380
|
2017-05-17 17:12:46 +02:00 |
|
vgilc
|
a2f664f0c9
|
Merge branch 'ent-531-Macro-alert_unknown_instructions_' into 'develop'
Added _alert_unkown_instructions_ macro
See merge request !279
|
2017-05-17 17:10:46 +02:00 |
|
vgilc
|
56fd0f85ba
|
Merge branch 'ent-565-pintado-del-menu-lateral-con-acl-enterprise-activado' into 'develop'
Modified menu position to fit it with ACL enterprise
See merge request !304
|
2017-05-17 17:10:11 +02:00 |
|
vgilc
|
b384d058d9
|
Merge branch '653-ayuda-descuadrada' into 'develop'
Fixed tet in a help pop-up.
See merge request !323
|
2017-05-17 17:06:47 +02:00 |
artica
|
24915e47cb
|
Updated version and build strings.
|
2017-05-17 12:08:40 +02:00 |
|
artica
|
ead3556700
|
Auto-updated build strings.
|
2017-05-17 00:01:21 +02:00 |
|
artu30
|
1546e48e15
|
Merge branch 'develop' into '689-Change_translations_in_mr_and_um_section'
# Conflicts:
# pandora_console/include/javascript/update_manager.js
|
2017-05-16 11:57:58 +02:00 |
|
Arturo Gonzalez
|
0346b49f1e
|
Fixed jquery request
|
2017-05-16 10:42:41 +02:00 |
|
artica
|
63cc6f5244
|
Auto-updated build strings.
|
2017-05-16 00:01:15 +02:00 |
|
artica
|
45239e4cdd
|
Auto-updated build strings.
|
2017-05-15 00:01:14 +02:00 |
|
artica
|
31970c521d
|
Auto-updated build strings.
|
2017-05-14 00:01:14 +02:00 |
|
artica
|
afff44138c
|
Auto-updated build strings.
|
2017-05-13 00:01:16 +02:00 |
|
artica
|
3d0c77709e
|
Auto-updated build strings.
|
2017-05-12 00:01:25 +02:00 |
|
enriquecd
|
12dde46552
|
Change load order of homeurl when load config, fix mysql login error dialog - #825
|
2017-05-11 15:44:18 +02:00 |
|
vgilc
|
31bc5e08a1
|
Merge branch '787-help-in-cascade-protection-dev' into 'develop'
Changed help section in cascade protection help button and fixed help language.
See merge request !421
|
2017-05-11 12:12:08 +02:00 |
|
artica
|
46e16f65ea
|
Auto-updated build strings.
|
2017-05-11 00:01:21 +02:00 |
m-lopez-f
|
808e579af7
|
Merge branch 'develop' into fixed-graphs-styles
|
2017-05-10 11:07:39 +02:00 |
|
artica
|
71f8f29107
|
Auto-updated build strings.
|
2017-05-10 00:01:15 +02:00 |
|
Arturo Gonzalez
|
6f40069aa9
|
Added a new system to draw lines in visual console when element have an image
|
2017-05-09 17:29:17 +02:00 |
|
Arturo Gonzalez
|
eb1dafe807
|
Fixed lines in visual console
|
2017-05-09 12:40:22 +02:00 |
|
artica
|
ce179c39aa
|
Auto-updated build strings.
|
2017-05-09 00:01:18 +02:00 |
|
Arturo Gonzalez
|
658ff78efb
|
Added homedir lost reference to functions_html
|
2017-05-08 11:49:54 +02:00 |
|
artica
|
3865f13f8f
|
Auto-updated build strings.
|
2017-05-08 00:01:14 +02:00 |