a5fe4d58a5
Show real case in login page titles - #1672
2017-12-05 19:39:26 +01:00
092ec0acf6
Disable autorefresh on new dashboard view - #1527
2017-11-07 11:19:31 +01:00
f2c6837cd5
Add minor realeases doc link in header advice modal window - #951
2017-10-30 18:20:43 +01:00
f6e012e0fa
Added time autorefresh
2017-10-23 13:17:06 +02:00
d74a3f74b4
Merge branch 'develop' into 1056-pandora-wux-grid-server
2017-09-01 10:51:54 +02:00
c29d8a4fdb
Revert "merge develop"
...
This reverts commit 8232911713f5da86ac0a
2017-08-23 09:35:17 +02:00
7b208f6209
Added code to separate networkmap manage and networkmap view
2017-08-22 09:24:16 +02:00
e0746e65e8
Merge branch '138-login-items-separate-width-dev' into 'develop'
...
Added separation width to login fields
See merge request !632
2017-08-18 13:18:40 +02:00
7dd0e989fa
Merge branch '412-consola-visual-Módulo-imagen' into 'develop'
...
Add data image option to simple data visual console element - #412
See merge request !584
2017-07-17 17:03:04 +02:00
0bd74d92f0
Merge branch '1040-autorefresh-in-user-section-is-separated-by-user-dev' into 'develop'
...
Added refresh by user
See merge request !607
2017-07-17 10:54:06 +02:00
1e7fbc443e
Merge branch 'develop' into '412-consola-visual-Módulo-imagen'
...
# Conflicts:
# pandora_console/godmode/reporting/visual_console_builder.editor.js
2017-07-17 10:39:20 +02:00
fd955112fb
Merge branch '994-No-se-muestra-correctamente-la-versión-en-el-footer-dev' into 'develop'
...
Fixed version in footer
See merge request !570
2017-07-13 11:47:57 +02:00
97e897c0d4
Merge branch '963-Ventana-Welcome-to-Pandora-FMS-siempre-aparece' into 'develop'
...
Change jquery ajax call method in welcome window dont show get to post - #963
See merge request !551
2017-07-13 11:30:47 +02:00
b4ca9c958d
fixed error XSS in login_page
2017-06-30 13:26:05 +02:00
b519cd46d3
Added separation width to login fields
2017-06-29 14:51:43 +02:00
bea2a38969
fixed error xss in login page
2017-06-29 13:07:35 +02:00
39d090db1e
fixed minor error
2017-06-28 16:39:54 +02:00
e86c87d23b
Added refresh by user
2017-06-21 13:50:05 +02:00
44fb3f248d
Show enterprise icon in login header when is not defined in config - #976
2017-06-15 11:01:39 +02:00
2ede057298
Add data image option to simple data visual console element - #412
2017-06-13 16:49:25 +02:00
a27a9e8cb3
Fixed version in footer
2017-06-08 10:22:59 +02:00
d101d9abdc
Changed bad ajax call
2017-06-07 11:28:09 +02:00
85b98a10fa
Change jquery ajax call method in welcome window dont show get to post - #963
2017-06-02 12:51:22 +02:00
6d2607e178
Merge branch '912-login-page-background-dev' into 'develop'
...
Added correct path to images in login page background
See merge request !506
2017-05-31 17:51:34 +02:00
f64b4852a6
Merge branch '870-No-se-muestra-Custom-logo-header-en-pantalla-de-logout' into 'develop'
...
Show custom header logo when logout - #870
See merge request !477
2017-05-31 17:14:10 +02:00
fe7b4257f0
Changed text in header when mr file is available
2017-05-30 13:59:47 +02:00
a1063e9b50
Translations changed
2017-05-29 12:35:31 +02:00
3155b81eb5
Added correct path to images in login page background
2017-05-24 17:09:44 +02:00
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
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
19a76701a3
Merge branch '813-Footer-no-muestra-la-versión-correctamente' into 'develop'
...
Show package version rather build version in footer (ext. fix update manager css) - #813
See merge request !454
2017-05-17 17:51:25 +02:00
ab51561ecf
Merge branch 'Barra-de-scroll-en-ventana-de-error-de-permisos-de-config.php' into 'develop'
...
Not show scroll bar in config permission error dialog in index - #728
See merge request !385
2017-05-17 17:40:29 +02:00
888d66ca4c
Merge branch '732-Cambio-enlace-a-soporte-en-el-login-de-la-consola-(version-enterprise)-dev' into 'develop'
...
Support link changed in pandora enterprise
See merge request !381
2017-05-17 17:28:22 +02:00
a2f8919c75
Show custom header logo when logout - #870
2017-05-17 11:18:50 +02:00
0346b49f1e
Fixed jquery request
2017-05-16 10:42:41 +02:00
12dde46552
Change load order of homeurl when load config, fix mysql login error dialog - #825
2017-05-11 15:44:18 +02:00
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
746eab7666
Show package version rather build version in footer (ext. fix update manager css) - #813
2017-05-10 13:18:45 +02:00
ade8931149
fixed error icon comunity edition
2017-05-03 17:29:27 +02:00
ba312476e3
Changed help section in cascade protection help button and fixed help language.
2017-04-27 15:49:23 +02:00
4b5da69e31
Merge branch '688-problema-acl-enterprise-workspace-2-7' into 'develop'
...
Change sec url string in message and vconsole section - #688 - 2
See merge request !378
2017-04-25 16:21:00 +02:00
8802f1cdca
Merge branch '605-ayuda-descolocada-modulos-webserver' into 'develop'
...
Fixed text overflow in help window
See merge request !332
2017-04-25 16:16:29 +02:00
dfd0bb38e8
Merge branch '672-change_forums_url_in_wellcome_window' into 'develop'
...
Changed forums url in wellcome window
See merge request !343
2017-04-25 16:05:34 +02:00
d93fa1bb3f
Added new option to enable and disable reset pass
2017-04-20 15:31:39 +02:00
63254ac7e4
Move mail setup section to enterprise setup
2017-04-20 12:54:15 +02:00
bfa3b43ee7
Added changes to reset password system
2017-04-20 12:36:33 +02:00
e26dfcd466
Move code to enterprise section
2017-04-20 11:18:43 +02:00
727bd095f5
Added function to reset password in node
2017-04-20 10:59:32 +02:00
48f7fa50dd
Added error control and email handler
2017-04-19 16:04:24 +02:00
b21b3cabf6
Not show scroll bar in config permission error dialog in index - #728
2017-04-19 15:10:55 +02:00
bd30625532
Added return to login button
2017-04-19 15:10:51 +02:00
7011eee871
Added a new page to reset password, for now without code, only visual page and error control
2017-04-19 13:26:20 +02:00
8f1d93c008
Support link changed in pandora enterprise
2017-04-18 11:46:57 +02:00
1348256d1a
Change sec url string in message section - #684 /4
2017-04-17 19:30:44 +02:00
553e58deba
Merge branch '99-problemas-visualizacion-graficas-combinadas-tipo-gauge-bullet-chart-y-pie-chart-en-consolas-visuales' into 'develop'
...
Filter custom graph size in visual console editor, autoset size - #99
See merge request !287
2017-04-07 12:51:37 +02:00
790eb164da
Changed forums url in wellcome window
2017-04-04 17:09:26 +02:00
a4d5de69b4
Fixed text overflow in help window
2017-03-31 13:03:54 +02:00
07e5274d0d
fixed error in login page errors and change icon pdf report
2017-03-22 15:26:54 +01:00
62541482ab
Filter custom graph size in visual console editor, autoset size - #99
2017-03-22 10:10:56 +01:00
8365afbe76
fixed errors in helps pandora and visual styles
2017-03-21 11:44:46 +01:00
3ff7d28240
fixed minor error in icon open source
2017-03-17 09:34:31 +01:00
1325601082
fixed errors
2017-03-16 18:41:53 +01:00
e252135979
merge develop
2017-03-15 17:09:40 +01:00
aec0d91109
login page new
2017-03-15 15:23:28 +01:00
a87839bd07
login page
2017-03-15 10:12:18 +01:00
294477a982
Merge branch '517-footer-metaconsola-vs-footer-consola-open' into 'develop'
...
Print metaconsole footer in buttom and change marks order - open - #517
See merge request !244
2017-03-13 17:46:42 +01:00
0094cfa9bf
Center alert modal window when is opened - #93
2017-03-13 13:25:16 +01:00
6b625197ec
Print metaconsole footer in buttom and change marks order - open - #517
2017-03-10 17:42:55 +01:00
8de4984faf
Fixed dialog of system warning alerts. Gitlab: #506
2017-03-09 15:40:59 +01:00
7f0359283d
Fixed problems with ACL permmisions. Gitlab: #451
2017-03-06 12:54:48 +01:00
ca97686b25
Change data function to show in footer windows compatible - #80
2017-02-27 12:00:28 +01:00
45316cdd0f
Fixed visual in welcome view. Gitlab: #359
2017-02-23 12:26:48 +01:00
5db7f93b53
Removed header bar in wellcome menu. Ticket #335
2017-02-21 16:54:53 +01:00
2abff60380
Fixed code
2017-02-21 13:30:53 +01:00
584427de06
Added changes to finish rr feature. Ticket #169
2017-02-14 09:36:11 +01:00
b42e4a8277
Rewrite lost code.
2017-02-13 15:29:45 +01:00
5b7f4a5139
Merge branch 'develop' into feature/rolling_release
...
Conflicts:
pandora_console/general/header.php
pandora_console/include/functions.php
pandora_console/index.php
pandora_console/pandoradb_data.sql
2017-02-13 14:19:25 +01:00
4c63756f51
Fixed classic menu mode. Ticket #250
2017-02-13 13:50:28 +01:00
cafda2a116
Added new option to see the menu bar in classic mode. Ticket #234
2017-02-07 12:58:29 +01:00
543fd0c7ea
delete shortcut bar
2017-02-03 12:23:58 +01:00
d066c5f88f
Erase integria incidents integration with integria tickets - #29
2017-01-25 12:40:42 +01:00
6f0a1dfb00
Mensaje no access solo aparece con alertas [INTEGRIA: #4368 ]
2017-01-20 11:00:32 +01:00
99aa41b32a
fixed reports events
2017-01-13 14:09:56 +01:00
9b02510599
Fixed problems with wizard login when cancel wizard. Ticket: #4246
...
(cherry picked from commit f11e78cc3a
2017-01-09 09:10:13 +01:00
2a596dc31c
Feature: add button cancel at identification login wizard. Ticket: #4246
...
(cherry picked from commit 527de7b0b3
2016-12-27 10:30:41 +01:00
c949a7eef5
Text and images for Transactional System
2016-12-19 13:31:06 +01:00
e7ea4bbda8
Change header help icon function #Noticket
2016-11-22 11:33:00 +01:00
d203bee751
Visual console improvements - Edit Signes for builder, main creator / Main help modal window #110
2016-11-18 17:19:33 +01:00
3f082324e4
Fixed problems with sessions.
2016-11-16 16:01:53 +01:00
39169a8e91
Change no access error page - #91
2016-11-03 16:51:18 +01:00
018a115bfa
fixed error images open in header and login
...
(cherry picked from commit e34517fb70
2016-11-03 11:32:51 +01:00
5bdf1da03d
fixed minor error login page ticket: 4166
...
(cherry picked from commit 6e47972a11
2016-11-02 18:07:21 +01:00
8b54287e29
Change no access error page - #91
2016-10-31 16:19:46 +01:00
63048e42a4
Transactional maps, added new image to empty transactions form
2016-10-26 16:38:42 +02:00
a913b54401
fixed QR Bar code in the header #94
2016-10-26 13:21:38 +02:00
62706b6729
Transactional maps (Added "no maps" message with styles)
2016-10-24 11:42:40 +02:00
609e1a0379
add subselect_data_module file in general, search filter by module type #4001
2016-10-21 18:06:33 +02:00
8484531080
fix login page and alert messages
2016-10-03 13:36:04 +02:00
359f0aaac1
add qr icon, separate menu bar, favicon and optional graph logo 46,64,45,80,55
2016-10-03 12:31:23 +02:00
096f79056f
Fixed warning in header.php.
2016-10-02 09:56:50 +09:00
78f5d79638
fix visual errors
2016-09-29 15:02:12 +02:00
b722e70620
Changes on enterpise alert icons, limit screens and favicons
2016-09-28 13:26:58 +02:00
22a4dbe67b
header logo and login logo limited for pandoraopen, module group aspect and update manager modal window. 64,63,59,48,61
...
modificacion de estilos de ventana modal y editor de usuarios
(cherry picked from commit 6f33c0eaf8d4ba681833
2016-09-26 11:46:41 +02:00
6f33c0eaf8
modificacion de estilos de ventana modal y editor de usuarios
2016-09-22 11:17:32 +02:00
4516a88f4f
Modify module template popup - ticket 68
...
(cherry picked from commit a051243b64
2016-09-19 17:11:25 +02:00
a051243b64
GUI improvement, add enterprise edition popup - ticket gitlab 49/68
2016-09-19 16:20:18 +02:00
f63da6d89a
Fixed bug in autorefresh. Ticket 3931.
2016-09-05 11:22:49 +02:00
b5854712bd
Added autorefresh list in user settings. Ticket #3931 .
2016-09-05 10:31:43 +02:00
9ec8858e13
N-ticket integria: 3909 fixed menu autohidden #16
2016-08-10 11:30:11 +02:00
8c20874a88
Changed rolling release manager system.
2016-07-19 12:39:03 +02:00
0346516129
New icon in shortcut bar. Ticket #3018 .
2016-07-06 12:30:51 +02:00
be4a257137
Changed newsletter wizard width
2016-06-22 11:31:16 +02:00
28c8726834
Added some translation handles to wizard buttons
2016-06-22 11:26:50 +02:00
33e6b8048f
Fixed width and position on logout message
...
(cherry picked from commit 9c0c54ff2e
2016-06-20 19:07:48 +02:00
be708eaa35
Changed E-mail label into initial wizard
...
(cherry picked from commit 68f4086c93
2016-06-20 15:18:50 +02:00
6370904ba9
fixed accent mark. Ticket #3845 .
2016-06-20 10:34:20 +02:00
bbe90fce28
Solved problems with single quotes when download UM messages
2016-06-17 12:34:07 +02:00
b91cb38b2d
Fixed bug when return button in initial wizard
2016-06-17 10:41:56 +02:00
f2d51ebad1
Changed display way on um messages view and other changes
2016-06-17 09:27:28 +02:00
25ade121da
Added email to field1_recovery
...
(cherry picked from commit 52d15da62e
2016-06-16 14:51:36 +02:00
e8ce7e7a13
Changed Mail to XXX to Mail to Admin and email is retrieved from initial wizard
2016-06-16 13:13:23 +02:00
4734d666bf
Solved download messages at first time and other visual changes
2016-06-16 13:12:29 +02:00
210c7c7d40
Definitive messages to update manager and solved some issues.
...
Conflicts:
pandora_console/godmode/update_manager/update_manager.setup.php
2016-06-16 13:12:05 +02:00
0ed8b03862
Fixed display newsletter checkbox at first time
2016-06-16 13:09:55 +02:00
42d5010681
Added some dafault values
2016-06-16 13:09:40 +02:00
55db630b36
Removed some unwanted traces
2016-06-16 13:09:25 +02:00
92563961a9
Added um messages pop-up and fixed popup order
...
Conflicts:
pandora_console/index.php
2016-06-16 13:09:09 +02:00
83d03720ab
Added some definitive images and fixed several design issues
2016-06-16 13:03:26 +02:00
a8c21aeac4
Added feedback message when subscription and register
2016-06-16 13:02:45 +02:00
fcafb16648
Added connection with update manager and some design changes
...
Conflicts:
pandora_console/index.php
2016-06-16 13:02:29 +02:00
aafb00c640
Solved newsletter display if forced. Delete all required when return
2016-06-16 13:00:43 +02:00
72c1c9c736
Solved problem with return button
2016-06-16 13:00:32 +02:00
67607cf78c
Added pagination to update manager messages
2016-06-16 13:00:21 +02:00
7a4366e8f5
Added header link to UM messages
2016-06-16 13:00:09 +02:00
70ff234b97
Minor type fix
2016-06-16 12:59:38 +02:00
dbde4ffc43
Added dummy and undesigned identification wizard
...
Conflicts:
pandora_console/godmode/update_manager/update_manager.setup.php
pandora_console/include/functions_config.php
pandora_console/index.php
2016-06-16 12:59:11 +02:00
c5e97eb396
Auto-hidden menu.Ticket #3601
2016-06-07 14:50:47 +02:00
18ba1ed374
Fixed url in firts task of custom field
2016-06-06 10:17:23 +02:00
a42e3a310b
Fixed menu position. Ticket #3709 .
2016-06-02 15:09:06 +02:00
0acf4f41eb
New development. Display lateral menus whit left click.
2016-06-02 11:59:35 +02:00
0618dbbab3
Rolling release in progress... (Added minor releases)
2016-06-01 14:43:31 +02:00
c29cc92587
Rolling release in progress... (Alert when minor release are available)
2016-06-01 10:43:22 +02:00
9255d87869
Fixed errors in saml login page
2016-05-30 10:23:33 +02:00
8cb651079a
Added a diferent loging page to saml system.
2016-05-27 13:59:19 +02:00
f52d02992e
Added change in pandora header, now users without PM permissions dont see warning incon. Ticket #3548
2016-05-26 17:22:18 +02:00
bb4ec54fbc
Improved sql cache to permit make cache of several databases TICKETS #3581
2016-05-03 16:16:37 +02:00
e9eb16a848
Some changes in saml login system.
2016-02-18 12:29:50 +01:00
a3a38c9bb6
New login method (saml). Ticket#3393
2016-02-17 13:05:22 +01:00
fe8300655d
Cleaned source code.
2016-01-27 13:08:11 +01:00
1242db08f8
Fixed the refresh time in the enterprise dashboard. TICKET: #3156
...
(cherry picked from commit b94f47f3a9
2016-01-13 14:11:19 +01:00
858e3ea202
Fixed problems with performance. Tiquet: #2970
...
(cherry picked from commit a57f62e5bf
2015-11-18 16:32:20 +01:00
740536a034
Changed text in firts task
2015-08-06 14:55:55 +02:00
42f8ad7072
Change url in botton create. Tiquet: #2499
2015-07-22 08:50:15 +02:00
c4d6c18b25
Fixed styles and errors of php
2015-07-14 15:59:39 +02:00
8c64e6b481
Fixed style
2015-07-09 17:52:37 +02:00
606e29684b
Add pagination in custom reports and visual console. Tiquet: #2398
2015-07-08 16:09:00 +02:00
3e2fd15302
Fixed, now the first task for visualmap does not show in metaconsole.
2015-07-06 18:18:52 +02:00
8c3056eb79
Add legal text in files and change data
2015-07-02 15:24:39 +02:00
0b2bdfa72d
Improved the behaviour of the login page inputs
2015-06-30 15:48:54 +02:00
1b4ae0d26e
Merge to feature/Newview
2015-06-29 10:39:05 +02:00
806962f2e5
Add new firts task and change text in other
2015-06-29 10:33:01 +02:00
06b56d80c8
Add new view when no have data in this view
...
(cherry picked from commit 15fb6f20a4
2015-06-26 14:52:50 +02:00
15fb6f20a4
Add new view when no have data in this view
2015-06-26 14:52:01 +02:00
94c742bfbe
Merge from Develop
2015-06-25 10:40:35 +02:00
37d792e07c
Change visual
2015-06-25 08:21:53 +02:00
3b037caf32
Merge remote-tracking branch 'origin/develop' into features/oracle
2015-06-18 20:02:01 +02:00
ff1186ee57
Changed visual of console
2015-06-16 16:09:50 +02:00
9e528d0459
Change visual of console
2015-06-12 15:50:46 +02:00
7574f6ed09
Clean the source code style.
2015-06-08 13:13:09 +02:00
89cac169f4
Clean the source code style.
2015-06-08 11:05:19 +02:00
b96fdad6d8
Sanitized the project (clean code and removed the deprecated htmLaWed)
2015-06-08 09:18:00 +02:00
5c7b230e9b
Merge some changes and fixed from the 'develop' branch.
2015-05-29 14:16:39 +02:00
aba3379d73
Changed images in error login page because don't show with new style. Tiquet: #2233
2015-05-27 12:36:40 +02:00
1cb3399425
Fixed PHP Warnings and PHP notices (The PHP version 5.3.4 (the PHP version in new CentOS) and uppers are very noisy.)
2015-05-21 12:18:40 +02:00
73e0a74a1a
Merge branch 'develop' into feature/#1978-REESCRITURA_DEL_MOTOR_DE_INFORMES
...
Conflicts:
pandora_console/godmode/reporting/reporting_builder.item_editor.php
pandora_console/include/functions_reporting.php
2015-05-06 17:02:40 +02:00
c50bbb7eea
Change login and styles
2015-04-28 15:29:15 +02:00
63354c0188
Add new images to login and changed login
2015-04-24 13:45:13 +02:00
a21d14e162
Fixed width to menu
2015-04-23 08:49:57 +02:00
32582e5017
add title in dialog in tree view and change image in header
2015-04-20 12:31:04 +02:00
2d9168ac8f
Changed styles from views in nodo
2015-04-15 09:45:13 +02:00
8d8476118f
reorganize menu and changed styles of menu
2015-04-13 13:44:29 +02:00
a02acad7c4
Change visual of menu and funcionality
2015-04-10 13:43:02 +02:00
91556f8096
Add new funcionality to menu and fixed other problems
2015-04-10 09:29:33 +02:00
f84863540f
Merge from the pandora_5.1 branch to feature/#1978-REESCRITURA_DEL_MOTOR_DE_INFORMES branch the new report items (availability and time overlaped in the simple graphs).
2015-04-10 00:58:24 +02:00
01149f214a
Changed lateral menu, order options and eliminate options
2015-04-09 15:04:23 +02:00
878c676c76
Fixed hidden menu and preparated immovable menu
2015-04-07 09:50:46 +02:00
ff7fd3d8a7
Fixed menu and change visual
2015-04-06 12:44:35 +02:00
acfd2146dc
Change views and styles in Console
2015-04-01 12:09:23 +02:00
0e29cc520e
Change visual of node
2015-03-31 17:26:22 +02:00
16679256e9
Change visual of any views
2015-03-31 09:28:06 +02:00
62c940986b
Change menu and actions in this menu.
2015-03-31 09:18:46 +02:00
220ad47b3f
Change menu and visual any views, tiquets: #1815,#1702
2015-03-26 13:12:48 +01:00
5f57ca716b
Change some code for the future fixed in PHP about the try catch in the includes. TICKET: #1791 (still open thanks PHP)
2015-03-17 16:48:52 +01:00
c873fd6993
Delete includes of javascript because this includes are exists in header, tiquet #1878
2015-03-16 15:21:18 +01:00
cf84411c59
Fixed a PHP Notice
2015-02-06 17:02:28 +01:00
87ebc49dc9
Changed location of servers down clippy
2015-02-03 15:43:44 +01:00
9f43d2d2b2
Changed page no access
2015-02-03 13:33:00 +01:00
adf2bc3f6d
Add clippy help for all servers down
2015-02-03 09:47:17 +01:00
5e80428ed9
Revert "Fixed some paths"
...
This reverts commit 7d1894e2ca
2014-12-11 18:49:04 +01:00
716a52e94d
Fixed some paths
2014-12-11 18:43:16 +01:00
0d54510462
Modifications on the login process to include the 2 step verification
2014-12-11 16:18:26 +01:00
b7fe0c2cdc
First commit in the monday, a tiny fix of styles of logon page with huge news text.
2014-12-01 09:53:41 +01:00
e6eb72e49a
Fixed the vulnerability. http://cxsecurity.com/issue/WLB-2014110100 Thanks William Costa
2014-11-17 10:40:58 +01:00
9a5f680197
Fixed the footer version for metaconsole
2014-10-24 11:01:58 +02:00
1bc57ef841
Fixed the style of minitactical view
2014-10-21 11:17:16 +02:00
173000c27e
Fixed home screen when the resolution is low. Ticket #1307 .
2014-09-23 12:16:15 +02:00
27c16b04e8
Change the tooltip text of the clippy
2014-09-22 13:35:48 +02:00
628ecfaebd
Avoid PHP Warnings that breaks the javascript code.
2014-09-16 12:40:05 +02:00
dd0e71227f
Cleaned source code style, only for to test the github webhooks
2014-09-08 15:26:04 +02:00
32101ccfe2
Changes some bad colors and others aesthetic changes. Thanks Carla.
...
2014-09-04 Miguel de Dios <miguel.dedios@artica.es>
* pandora_console/extensions/module_groups.php,
pandora_console/general/login_help_dialog.php,
pandora_console/images/close_button_dialog.png,
pandora_console/images/documentation.png,
pandora_console/images/enterprise_version.png,
pandora_console/images/error_login.png,
pandora_console/images/online_help.png,
pandora_console/images/support.png,
pandora_console/include/ajax/events.php,
pandora_console/include/constants.php,
pandora_console/include/functions_events.php,
pandora_console/include/javascript/pandora_events.js,
pandora_console/include/styles/jquery-ui-1.10.0.custom.css,
pandora_console/include/styles/pandora.css,
pandora_console/mobile/include/style/main.css,
pandora_console/operation/events/events_list.php: changes some
bad colors and others aesthetic changes. Thanks Carla.
2014-09-04 12:19:55 +02:00
cb26a1e6c5
Fixed the search of enterprise help files
...
* general/pandora_help.php: Error fixes on the help file
search.
2014-09-03 19:40:37 +02:00
c76e39d17f
2014-08-26 Miguel de Dios <miguel.dedios@artica.es>
...
* include/javascript/introjs.css, include/styles/pandora_black.css,
include/styles/pandora.css, general/logon_ok.php,
mobile/include/style/main.css: some aesthetic changes suggested by
Carla.
* include/help/clippy/godmode_agentes_modificar_agente.php: fixed
the position of dialog.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10458 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-08-26 12:22:33 +00:00
0d003c8840
2014-08-18 Miguel de Dios <miguel.dedios@artica.es>
...
* include/functions_ui.php, operation/search_helps.php,
operation/search_results.php, operation/search_helps.getdata.php,
general/pandora_help.php: added feature to search into the help
files, it is in the search bar header.
* operation/search_main.php: fixed the search any term of several
words separated with whitespaces.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10435 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-08-18 14:50:07 +00:00
5a2102f26c
2014-08-12 Miguel de Dios <miguel.dedios@artica.es>
...
* index.php, operation/agentes/ver_agente.php,
operation/agentes/estado_monitores.php, general/header.php,
include/functions_clippy.php, include/functions_ui.php,
include/help/en/help_context_module_unknow.php,
include/help/clippy/module_unknow.php, include/styles/pandora.css,
include/javascript/intro.js: added first version of context help
interactive.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10410 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-08-12 16:31:27 +00:00
e1e77b6bc1
2014-08-12 Miguel de Dios <miguel.dedios@artica.es>
...
* images/clippy_icon.png, images/pandorin.png,
include/help/clippy/homepage.php, general/header.php: yes there is
a octopus another time in Pandora.
2014-08-12 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_clippy.php,
include/help/clippy/godmode_agentes_modificar_agente.php,
include/help/clippy/godmode_agentes_configurar_agente.php: fixed the
execution of help tour when never it started. Sorry the clippy is
less annoying.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10407 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-08-12 11:41:55 +00:00
de5a16b29d
2014-08-12 Miguel de Dios <miguel.dedios@artica.es>
...
* general/header.php, godmode/setup/setup_general.php,
include/functions_clippy.php, include/functions_config.php,
include/help/clippy/homepage.php: wip in the clippy.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10404 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-08-12 09:36:05 +00:00
8c7ac00f14
2014-08-08 Miguel de Dios <miguel.dedios@artica.es>
...
* include/functions.php,
include/help/clippy/godmode_agentes_modificar_agente.php,
include/help/clippy/homepage.php,
include/help/clippy/godmode_agentes_configurar_agente.php,
include/javascript/intro.js,
include/javascript/introjs.css,
include/javascript/clippy.js,
include/functions_ui.php,
include/functions_clippy.php,
index.php,
general/header.php: first version of the new feature a annoying
clippy such as the lovely micro$oft mascot.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10393 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-08-08 15:11:00 +00:00
125f1c19b8
2014-08-05 Alejandro Gallardo <alejandro.gallardo@artica.es>
...
* general/main_menu.php: Improved the submenus state
persistence functionality.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10383 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-08-05 13:16:54 +00:00
825852d324
2014-08-05 Alejandro Gallardo <alejandro.gallardo@artica.es>
...
* general/main_menu.php: Fixed the menu position when
it's fixed and the header's not.
* include/functions_graph.php,
include/graphs/pandora.d3.js: Added colors to the elements
depending on their status on the functions 'sunburst' and
'graph_monitor_wheel'.
* include/styles/pandora.css: Fixed the z-index of the
shortcut bar.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10382 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-08-05 13:09:46 +00:00
d974a5bb6c
2014-08-04 Alejandro Gallardo <alejandro.gallardo@artica.es>
...
* general/header.php: Now the header can be configured
to be fixed at the top.
* general/main_menu.php: Now the menu can be configured
to be fixed at the left.
* godmode/setup/setup_visuals.php,
include/functions_config.php: Added new options to
enable the fixed header and menu.
* include/styles/menu.css,
include/styles/pandora.css: Changes on the menu styles.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10377 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-08-04 16:50:36 +00:00
877fd5a834
2014-08-04 Alejandro Gallardo <alejandro.gallardo@artica.es>
...
* general/main_menu.php: Now the submenus opened by the
user remain opened when navigating through Pandora FMS.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10375 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-08-04 12:17:13 +00:00
61144da653
2014-06-10 Miguel de Dios <miguel.dedios@artica.es>
...
* include/functions_config.php,
include/functions_update_manager.php, index.php,
general/logon_ok.php, extensions/update_manager.php,
godmode/update_manager_xxx/update_manager.online.php: work in the
first version of new update manager.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10154 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-06-10 14:34:27 +00:00
11e9271316
2014-06-09 Miguel de Dios <miguel.dedios@artica.es>
...
* include/functions_config.php, general/login_page.php: improved
the source code style.
* godmode/setup/os.builder.php: fixed the form.
* godmode/update_manager_xxx/*, godmode/menu.php,
include/functions_update_manager.php,
include/ajax/update_manager.ajax.php,
include/graphs/functions_gd.php, include/graphs/functions_flot.php,
include/config_process.php, include/javascript/update_manager.js,
include/javascript/jquery.knob.js,
include/javascript/jquery.iframe-transport.js,
include/javascript/jquery.fileupload.js, images/check-cross.png:
first version of new update manager.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10144 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-06-09 13:33:55 +00:00
fe36d8e2c3
2014-06-03 Sergio Martin <sergio.martin@artica.es>
...
* include/styles/pandora.css
images/login_background.png
general/login_page.php: Change the whole
login screen to new style
* fonts
fonts/nunito.woff: Added a web font
* include/functions_events.php
include/functions_reporting.php: Fix a bug in the
agent events item on reports to reutilize the
standard code
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10094 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-06-03 16:59:55 +00:00
f067dd83b0
2014-06-03 Sergio Martin <sergio.martin@artica.es>
...
* general/news_dialog.php: Fix a bug in modal window news that
did incompatible with "first time" modal help
* include/graphs/functions_gd.php: Add a white background to the
progress bars
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10087 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-06-03 08:39:39 +00:00
47872751c0
2014-06-02 Sergio Martin <sergio.martin@artica.es>
...
* include/styles/pandora.css
include/styles/dialog.css
include/functions_events.php
operation/agentes/group_view.php
images/data.png
images/network.png
images/tab_green_bg.png
images/database.png
images/os_icons/so_other.png
images/os_icons/so_mac_small.png
images/os_icons/so_mac.png
images/os_icons/so_other_small.png
images/tab_grey_bg.png
images/network.disabled.png
images/plugin.png
images/chart_curve.png
images/header_blackout.png
images/eye.png
general/logon_ok.php: A bunch of aesthetic changes
like table header colors, new icons, etc.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10079 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-06-02 16:57:20 +00:00
dba745e2fa
2014-06-01 Miguel de Dios <miguel.dedios@artica.es>
...
* general/news_dialog.php: fixed the empty list of news in the first
login.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10071 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-06-02 10:47:00 +00:00
a3d27b749c
2014-05-30 Miguel de Dios <miguel.dedios@artica.es>
...
* godmode/agentes/agent_manager.php,
godmode/setup/setup_visuals.php, include/functions_config.php,
include/config_process.php, include/functions_ui.php,
include/javascript/qrcode.js, include/javascript/pandora.js,
operation/visual_console/public_console.php, images/qrcode_icon.jpg,
general/header.php: added the feature to show the QR code of the
pages for to make for example sticker for the fisical machines or
other things.
Incident: #818
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10047 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-05-30 10:51:33 +00:00
6cd21beca0
2014-05-30 Sergio Martin <sergio.martin@artica.es>
...
* general/news_dialog.php: Missed file in last commit
* godmode/alerts/configure_alert_action.php
godmode/alerts/configure_alert_command.php
include/javascript/pandora_alerts.js: fixed preview
of commands in action configuration and changed the
text input by a textarea in command configuration for
ticket: #852
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10046 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-05-30 10:34:21 +00:00
3a4ec99fe5
2014-05-30 Sergio Martin <sergio.martin@artica.es>
...
* general/logon_ok.php
godmode/setup/news.php
include/functions.php
pandoradb.sql
pandoradb.postgreSQL.sql
pandoradb.oracle.sql
index.php
extras/pandoradb_migrate_5.0.x_to_5.1.postgreSQL.sql
extras/pandoradb_migrate_5.0.x_to_5.1.mysql.sql
extras/pandoradb_migrate_5.0.x_to_5.1.oracle.sql: Added modal window mode
to the pandora news for ticket: #821
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10044 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-05-30 09:27:20 +00:00
6119b2e4a6
2014-05-27 Miguel de Dios <miguel.dedios@artica.es>
...
* godmode/agentes/module_manager.php,
operation/agentes/estado_monitores.php, general/main_menu.php: fixed
the PHP warnings.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10014 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-05-27 08:57:20 +00:00
014fe85f17
2014-05-21 Sergio Martin <sergio.martin@artica.es>
...
* general/main_menu.php
godmode/setup/setup_visuals.php
include/styles/pandora.css
include/functions_config.php: Added autohidden menu
feature
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9977 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-05-21 10:44:36 +00:00
6003af8fd8
2014-05-09 Alejandro Gallardo <alejandro.gallardo@artica.es>
...
* general/shortcut_bar.php: Updated the shortcut bar.
* include/styles/pandora.css: Added new styles for the
shortcut bar elements.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9900 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-05-09 14:57:40 +00:00
969ce6e855
2014-03-27 Alejandro Gallardo <alejandro.gallardo@artica.es>
...
* include/functions_config.php,
godmode/setup/setup_visuals.php,
general/login_page.php: Now is possible to select a
custom login background in the setup visuals section.
* images/backgrounds/default_4.0-stripes.gif,
images/backgrounds/default_4.0.jpg,
images/backgrounds/default_5.0.png,
images/backgrounds/flowers.jpg,
images/backgrounds/grass.jpg,
images/backgrounds/tiles.jpg,
images/backgrounds/wall.jpg,
images/backgrounds/wood.jpg: Added new images to use
it as custom login backgrounds.
* images/backgrounds/background1.jpg,
images/backgrounds/background2.jpg,
images/backgrounds/background3.jpg,
images/backgrounds/background4.jpg,
images/backgrounds/background5.jpg,
images/backgrounds/background6.jpg,
images/backgrounds/background7.jpg,
images/backgrounds/background8.jpg,
images/backgrounds/background9.jpg,
images/backgrounds/background10.jpg,
images/backgrounds/background_red.jpg: Delete some
VERY old images.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9655 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-03-27 11:49:00 +00:00
6f96534060
2014-03-13 Miguel de Dios <miguel.dedios@artica.es>
...
* general/shortcut_bar.php, include/functions_ui.php: fixed the
PHP warnings.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9577 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-03-13 11:00:12 +00:00
5f689176b1
2014-01-16 Miguel de Dios <miguel.dedios@artica.es>
...
* general/header.php: fixed the PHP notices about the var
$search_keywords.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9329 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-01-16 16:19:05 +00:00
1fb126e4da
2014-01-08 Miguel de Dios <miguel.dedios@artica.es>
...
* general/header.php: fixed the empty action with trying to write
some thing in the global search field when it is search anything.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9298 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-01-08 17:03:21 +00:00
c52943aac7
2013-11-12 Sergio Martin <sergio.martin@artica.es>
...
* general/shortcut_bar.php: Fix styles, icons and links of the
shortcut bar. Incident #374
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9067 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-11-12 17:14:11 +00:00
f7034ef559
2013-11-12 Miguel de Dios <miguel.dedios@artica.es>
...
* general/header.php: fixed the action to click in the search
bar with something wrote that before the javascript empty this
field, now it does not empty.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9059 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-11-12 11:05:41 +00:00
4af53ca3ad
2013-10-11 Sergio Martin <sergio.martin@artica.es>
...
* include/functions_ui.php
index.php
general/header.php: Add include of dialog.css in
config for incident #254
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8889 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-10-11 09:19:59 +00:00
c179dd60d3
2013-10-02 Sergio Martin <sergio.martin@artica.es>
...
* include/styles/install.css
include/styles/pandora.css
install.php
images/warn.png
images/pandora_tinylogo_open.png
images/dot_red.png
images/dot_green.png: Improve visual styles of
install screens
* general/pandora_help.php: Add a opensource logo
image in help screen when enterprise is not installed
* general/error_screen.php: Add css styles to
error screens before login
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8844 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-10-02 14:51:02 +00:00
bc81b2fac4
2013-10-02 Miguel de Dios <miguel.dedios@artica.es>
...
* include/javascript/jquery.pandora.js, index.php,
general/login_page.php: fixed the show the warning trial enterprise
message when fail login.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8841 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-10-02 10:08:45 +00:00
260c677dac
2013-09-24 Sergio Martin <sergio.martin@artica.es>
...
* include/styles/pandora.css
include/javascript/jquery.pandora.js
images/license_key.png
general/login_help_dialog.php
general/login_page.php: Change the visual styles
of some dialogs
* extensions/agents_modules.php
extensions/module_groups.php: Improve the visual
style of extensions and their legends
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8803 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-09-24 13:20:59 +00:00
f3ddbc6b04
2013-09-20 Sergio Martin <sergio.martin@artica.es>
...
* operation/agentes/estado_monitores.php
godmode/agentes/module_manager.php: Fixing translation
of adopted modules and reestructure translations calls
to do the translations more efecctively for bug #2375
* general/login_help_dialog.php: Fix size
of the login help dialog
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8788 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-09-20 09:52:58 +00:00
de3742d915
2013-08-19 Miguel de Dios <miguel.dedios@artica.es>
...
* general/logon_ok.php, godmode/setup/news.php: fixed the lost
"<br>" in the news.
Fixes : #2380
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8675 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-08-19 06:49:17 +00:00
f5fb7c94ae
2013-07-17 Sergio Martin <sergio.martin@artica.es>
...
* operation/menu.php
operation/events/events_rss.php
operation/events/export_csv.php
operation/events/events_list.php
operation/events/events.php
operation/events/events.build_query.php
general/shortcut_bar.php: Fixed group filter
for bug #2346 and clean a lot of events code
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8538 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-17 15:58:15 +00:00
4c9b5aefb2
2013-07-03 Sergio Martin <sergio.martin@artica.es>
...
* include/functions_config.php
include/help/en/help_custom_logo.php
include/help/es/help_custom_logo.php
include/help/ja/help_custom_logo.php
images/custom_logo/sourceforge.jpg
images/custom_logo/pandora_logo_head.jpg
images/custom_logo/artica_logo.png
images/custom_logo/sourceforge.png
images/custom_logo/pandora_logo_head.png
images/custom_logo/none.jpg
images/pandora_header_logo_enterprise.png
images/pandora_header_logo.png
extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql
extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql
extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql
general/header.php: Change the old system of custom logo
to be used in the unique logo (left side) of Pandora FMS 5
Bug #2241
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8458 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-03 10:15:25 +00:00
a8b5fada07
2013-06-13 Sergio Martin <sergio.martin@artica.es>
...
* include/functions_ui.php: Fix layout issue
* operation/events/events.build_table.php: Hide checkbox column
in read only view
* operation/events/events_list.php: Hide save filter button
when user has only ER ACLs permission
* general/login_page.php: Fix width and height of the
login error modal win
* operation/agentes/stat_win.php: Enable the show events
filter in replication mode when show local events is enabled
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8320 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-06-13 15:03:07 +00:00
c38ad22f0b
2013-06-10 Sergio Martin <sergio.martin@artica.es>
...
* include/styles/jquery-ui-1.10.0.custom.css
include/styles/pandora.css
include/ajax/events.php
include/functions_graph.php
include/functions_events.php
include/functions_networkmap.php
include/functions_netflow.php
operation/tree.php
operation/events/events.build_table.php
operation/reporting/reporting_viewer.php
operation/agentes/status_monitor.php
operation/agentes/stat_win.php
operation/netflow/nf_live_view.php
images/header_refresh_disabled.png
images/image_problem_data.png
images/input_pdf.png
images/input_delete.png
general/header.php
godmode/users/user_list.php
godmode/events/event_edit_filter.php
godmode/events/event_responses.list.php
godmode/events/events.php: Fix a lot of aesthetic issues and other
little fixes
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8283 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-06-10 16:15:36 +00:00
61a97fe28d
2013-06-06 Sergio Martin <sergio.martin@artica.es>
...
* include/ajax/events.php: Fix the info of the
user that validate a event in the event info that
is showed when click on a event on interactive graphs
* include/gettext.php: Add a hack to fix the languages change
on certain machines, like TSOL one.
* operation/events/events.build_table.php: Add a "access node"
control to column server name
* operation/agentes/status_monitor.php
* general/header.php: Add disable possibility in autorefresh combo
* godmode/agentes/module_manager_editor_network.php: Fix show/hide fields
in the module editor. TCP and SNMP fields were moved from advanced to main
options and javascript was broken
* godmode/events/event_edit_filter.php
godmode/events/custom_events.php
godmode/events/event_filter.php: Fix some ACLs problems in events
filter editor
* godmode/reporting/reporting_builder.item_editor.php: Add an absolute
path in a library inclusion to fix metaconsole bug
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8262 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-06-06 13:54:39 +00:00
enriquecd
Daniel Maya
daniel
Arturo Gonzalez
vgilc
Enrique Camargo
m-lopez-f
fbsanchez
Junichi Satoh
fermin831
mdtrooper
Alejandro Gallardo Escobar
zarzuelo