tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
15,478 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

2773 Commits

Author SHA1 Message Date
enriquecd 22973e9f12 New function pandora ux, let open pics from base64 image modules #90 2016-10-26 18:39:41 +02:00
m-lopez-f d11df9e50e Fixed problems with group view 
(cherry picked from commit b0ccd333de)
 2016-10-25 10:30:58 +02:00
Arturo Gonzalez af3d8d8d24 Removed reference to fail gis map connection. Ticket #3967 2016-10-20 12:16:51 +02:00
Arturo Gonzalez 26862b5f9d Added a function to remove right zeros in precision data feature 2016-10-20 10:47:12 +02:00
Arturo Gonzalez 5d9ae10133 New networkmaps in progress... (Added precision to monitor status data) 2016-10-19 09:10:17 +02:00
Arturo Gonzalez 3b7cad9654 Data precision (So much precision) 2016-10-18 16:32:39 +02:00
Arturo Gonzalez d5f82b568c New data precision... (Init) 2016-10-18 10:32:10 +02:00
enriquecd fb7050feb5 fix status monitor bug 4001 2016-10-17 12:30:52 +02:00
Arturo Gonzalez 13a19c42c2 Merge branch 'develop' into new_networkmap_feature 2016-10-17 11:36:30 +02:00
Arturo Gonzalez 3e50676e19 Merge branch 'develop' into new_networkmap_feature 2016-10-17 11:36:00 +02:00
enriquecd a70d840ea4 (cherry picked from commit 64486bc896) 2016-10-14 19:03:13 +02:00
Arturo Gonzalez cdc469f974 New networkmaps in progress... (Added zoom and offset system to maps in dashboard) 2016-10-14 15:33:42 +02:00
Arturo Gonzalez 5f95a1be60 New networkmaps in progress... (To much changes in the hell) 2016-10-14 14:21:45 +02:00
fbsanchez 2513dea2b5 Added switch to image content 
(cherry picked from commit d0a83b5021)
 2016-10-14 11:44:36 +02:00
Arturo Gonzalez efc117103c New networkmaps in progress... (Added networkmaps to dashboard) 2016-10-14 11:08:19 +02:00
Arturo Gonzalez 36560c70bc New networkmaps in progress... (removed unused message) 2016-10-13 12:07:58 +02:00
Daniel Maya 5283e35ae2 Change agent name in bulk operation 2016-10-13 09:55:53 +02:00
Arturo Gonzalez 9157c76ba0 New networkmaps in progress... (Added new migration system, awesome) 2016-10-11 11:14:28 +02:00
Arturo Gonzalez eb9390cad6 New networkmaps in progress... (Added new migration system and new design elements to js) 2016-10-10 16:11:15 +02:00
Arturo Gonzalez 16ff172bc3 New networkmaps in progress... (Fixed agents count) 2016-10-10 11:17:24 +02:00
Arturo Gonzalez 35d7989dab New networkmaps in progress... (open can modified generation method) 2016-10-10 10:40:31 +02:00
Daniel Maya cf3d44872f Changed agent name 2016-10-06 12:10:10 +02:00
Arturo Gonzalez fa1854e902 New networkmaps in progress... (Changed node images) 2016-10-05 09:56:25 +02:00
Arturo Gonzalez 164ecfcb57 New networkmaps in progress... (Changed migration button position) 2016-10-05 09:44:47 +02:00
Arturo Gonzalez 0ec9ac3b35 New networkmaps in progress... (Fixed migrate button) 2016-10-05 09:41:23 +02:00
Arturo Gonzalez 9aaf4967a3 New networkmaps in progress... (Migrate open maps) 2016-10-05 09:31:20 +02:00
Arturo Gonzalez bca411b005 New networkmaps in progress... (Init migration) 2016-10-04 16:27:51 +02:00
enriquecd a8c583cbe5 change default custom logo and fix module search view bug data column 2016-10-04 15:28:12 +02:00
Arturo Gonzalez bda0584131 New networkmaps in progress... (Fixed other types of generation) 2016-10-03 16:38:18 +02:00
Arturo Gonzalez e3a6fada7f New networkmaps in progress... (To much changes in the maps form and more minor things) 2016-10-03 16:09:07 +02:00
enriquecd 9e5f383099 change modal window alert on enterprise version 
(cherry picked from commit 80d9ce1ae0)
 2016-10-03 15:59:01 +02:00
m-lopez-f 2f93fddb6e Add percentil 95 in snmp graphics. internal ticket: 3 2016-10-03 12:48:48 +02:00
Daniel Maya 370f7ff373 Changed agent name 2016-10-03 12:24:15 +02:00
Arturo Gonzalez 6f20c31560 New networkmaps in progress... (Deleted the older new networkmaps reference, rest in peace sweet heart) 2016-09-30 10:46:32 +02:00
Arturo Gonzalez 56887cd51c New networkmaps in progress... (To much changes to write it all in only one line, i just say that "The magic was done") 2016-09-29 16:47:30 +02:00
Daniel Maya 54dcadfe33 changed agent name by alias in visual console,custom reports,view events and csv files. 2016-09-29 13:09:50 +02:00
enriquecd e5c82954f3 repair visual bugs 
(cherry picked from commit 7928125092)
 2016-09-28 18:20:42 +02:00
enriquecd b722e70620 Changes on enterpise alert icons, limit screens and favicons 2016-09-28 13:26:58 +02:00
Daniel Maya 2014f51410 sort by alias. 2016-09-27 10:31:42 +02:00
Arturo Gonzalez 446063dd51 New networkmaps in progress... (hells commit with magic to fix the interface links) 2016-09-26 16:14:12 +02:00
Daniel Maya 9a39798f43 Changed agent name in tree view, alert status, agent/alert view and agent/modules view. 2016-09-26 10:58:42 +02:00
m-lopez-f 50e2c14ce8 Add percert of critical agents in group view. Ticket: #3344 2016-09-23 13:46:44 +02:00
enriquecd 6f33c0eaf8 modificacion de estilos de ventana modal y editor de usuarios 2016-09-22 11:17:32 +02:00
Daniel Maya 21dd508e53 Changed name by alias. Ticket #74. 2016-09-22 10:27:35 +02:00
Arturo Gonzalez b441f1a2d4 New networkmaps in progress... (Added Alex super mega ultra street fighter maps) 2016-09-21 15:01:53 +02:00
Arturo Gonzalez d422546d0f New networkmaps in progress.. (Added open alert) 2016-09-21 10:24:41 +02:00
Arturo Gonzalez cbef0f3dfd New networkmaps in progress... (Fixed problems in Open part) 2016-09-21 09:52:42 +02:00
Arturo Gonzalez c643e2bce0 New networkmap in progress... (Removed unused function) 2016-09-20 16:43:09 +02:00
Arturo Gonzalez ff0aa5e3b6 New networkmaps in progress... (Moved code from O to E) 2016-09-20 16:26:57 +02:00
Arturo Gonzalez 5d987ed066 New networkmaps in progress... (Moved E code to E section and removed nun dependences) 2016-09-20 15:06:29 +02:00
Arturo Gonzalez 038470793d New networkmaps in progress... (Fixed holding area) 2016-09-19 17:03:31 +02:00
enriquecd a051243b64 GUI improvement, add enterprise edition popup - ticket gitlab 49/68 2016-09-19 16:20:18 +02:00
Arturo Gonzalez 5adcdd9b5f New networkmaps in progress... (Fixed the node and fictional node adition) 2016-09-19 14:47:02 +02:00
Arturo Gonzalez b8ad4a0fa3 New networkmaps in progress... (Added menu control) 2016-09-19 12:05:38 +02:00
Arturo Gonzalez 55747ce557 New networkmaps in progress... (fixed node details function) 2016-09-19 11:44:03 +02:00
Arturo Gonzalez 7a513db06b New networkmaps in progress... (Fixed "erase node" function and more things) 2016-09-16 13:21:59 +02:00
Arturo Gonzalez 53d94843b9 New networkmaps in progress... (Now the map generate nodes) 2016-09-16 10:12:40 +02:00
Arturo Gonzalez 831e7ca314 New networkmap in progess... (Changed db structure and more important things) 2016-09-15 16:41:05 +02:00
Arturo Gonzalez 17e3f38aca New networkmaps in progress... (Transfer e code to Open version) 2016-09-14 11:18:26 +02:00
Arturo Gonzalez 9f70d5081b New networkmaps in progress... (Traspassing the code from E to O) 2016-09-13 16:39:21 +02:00
m-lopez-f 98715ae341 Fixed problems with images in monitor view 2016-09-13 15:15:48 +02:00
Arturo Gonzalez dbb5aeee4c Fixed monitor details search by module name and module group. Ticket #4025 2016-09-12 11:54:54 +02:00
m-lopez-f 581d3835db Fixed acl's permmissions. Ticket #3912 2016-09-08 16:06:12 +02:00
m-lopez-f afa34a11fd Fixed problems with auto-refresh 
(cherry picked from commit 18d3f1e7a0)
 2016-09-08 09:50:50 +02:00
Daniel Maya d39123eb0a Added search by multiple ips agents. Ticket #3949. 2016-09-05 13:50:22 +02:00
Daniel Maya b5854712bd Added autorefresh list in user settings. Ticket #3931. 2016-09-05 10:31:43 +02:00
m-lopez-f 02388ff31f Add style css to image and fixed problems in metaconsole when grouped by agents in events. Internal ticket: #3079 2016-09-01 10:50:34 +02:00
m-lopez-f e815ea022b Fixed problems with line father when use pure in visual console. Internal ticket: #3936 2016-08-31 14:39:51 +02:00
fermin831 d0c1d5eede Changed require for include 2016-08-31 12:10:14 +02:00
Daniel Maya 58f0ccae77 Added default event filter. Ticket #3930. 2016-08-31 11:13:37 +02:00
fermin831 7462ff1ece RSS menu does not appear if IP is not in white API IP list 2016-08-30 10:47:00 +02:00
m-lopez-f 3ae6866ab0 Fixed problems with menu. Internal Ticket: #3912 2016-08-29 16:09:11 +02:00
m-lopez-f 2db19c539f Fixed problems with ACL permmisions. Internal Tiquet: #3912 2016-08-29 09:40:43 +02:00
m-lopez-f a98242d151 Fixed problems with times of execution and load page. Tiquet: #3988 2016-08-24 15:31:28 +02:00
Daniel Maya bb26f4b82d Added new check to equalize maximum thresholds. Ticket #3732. 2016-08-23 08:50:23 +02:00
daniel dcb18bcbd2 add graph agent new feature ticket integria: 3722 2016-08-19 12:46:27 +02:00
Daniel Maya e32c606fb0 Added new date filters. Ticket #3946. 2016-08-19 11:23:09 +02:00
m-lopez-f 0d8761d009 Fixed problems with parents lines objects. Tiquet: #3936 2016-08-16 12:16:01 +02:00
m-lopez-f 9c256623d0 Fixed problems with group agents. Tiquet: #3079 
(cherry picked from commit 774b0f9cab)
 2016-08-16 10:44:21 +02:00
Daniel Maya 5928f22d8d Fixed modules ordination. Ticket #3885. 2016-08-11 11:51:02 +02:00
m-lopez-f 2217e9f908 Fixed problems with group agents. Tiquet: #3079 2016-07-22 16:08:45 +02:00
Daniel Maya 24a9eee6e8 Fixed icon in graphs. Ticket #3830. 2016-07-19 15:52:45 +02:00
Daniel Maya e4cdef363e show unknown and not init modules. Ticket #3844. 2016-06-29 10:41:34 +02:00
Daniel Maya 2f5457d938 Fixed issue. Ticket #3844. 2016-06-28 16:10:09 +02:00
Daniel Maya ec073eb8b4 New filter actions. Ticket #3893. 2016-06-28 14:55:13 +02:00
Alejandro Gallardo Escobar 35e6a5f8fc Changed the name of an ehorus integration tab 
(cherry picked from commit e848067a61cbfcd03020f8a73830147daf64b636)
 2016-06-22 16:11:18 +02:00
Alejandro Gallardo Escobar 8b8f71ffd6 Fixes on the ehorus integration ACL 
(cherry picked from commit b74267676d)
 2016-06-22 15:29:10 +02:00
Alejandro Gallardo Escobar f746ba8109 Improved the ACL of the ehorus integration 
(cherry picked from commit 55fee7bf8f)
 2016-06-22 14:51:39 +02:00
fermin831 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
fermin831 fcafb16648 Added connection with update manager and some design changes 
Conflicts:
	pandora_console/index.php
 2016-06-16 13:02:29 +02:00
fermin831 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
Daniel Maya 2c0dae13b1 button inserted Agent_detail. Ticket #3831. 2016-06-15 10:52:44 +02:00
Sancho Lerena 38ea5e78d3 Show the gauge custom graphs with the defined height. If the user can choose the graph height he should be able to see how is used. 2016-06-10 11:49:29 +02:00
Alejandro Gallardo Escobar c7d4bc2cca Fixed the error which prevented the opening of the QR dialog on the public console section 
(cherry picked from commit 6e8d57f3be)
 2016-06-09 17:01:27 +02:00
Alejandro Gallardo Escobar a87de02e0b Removed the tinyMCE from the agent description and custom fields. Removed the url injection feature from the agent description. Added the url injection feature to the agent custom fields of some sections 
(cherry picked from commit c4bbe38b69e9b076b45871bc35b8c861b8ed2cc9)
 2016-06-08 19:17:39 +02:00
Alejandro Gallardo Escobar 3686b60ba5 Reduced the width of the graph to avoid the horizontal overflow. Ticket #3778 
(cherry picked from commit 3daf59701a)
 2016-06-07 14:48:44 +02:00
Alejandro Gallardo Escobar d68129f830 Fixed the huge space between legend elements on the pie graphs. Ticket #3785 
(cherry picked from commit 679b0c6749)
 2016-06-07 13:10:25 +02:00
Alejandro Gallardo Escobar a8f773dab4 Removed the zoom. Now the graph is loaded with the page width after the page load 
(cherry picked from commit b32172651d)
 2016-06-07 11:40:20 +02:00
Alejandro Gallardo Escobar 057b3cfcdc Now avg_only is enabled by default in stat_win.php and errors fixed. Ticket #3778 
(cherry picked from commit 8000b55a68)
 2016-06-06 17:01:51 +02:00
Arturo Gonzalez 31fcab0309 Fixed agent serarch in metaconsole events. Ticket#3766 2016-06-03 11:00:35 +02:00
Alejandro Gallardo Escobar a88fe29009 Minor visual fix 
(cherry picked from commit a15d45fb30)
 2016-06-02 18:08:37 +02:00
Daniel Maya 9f2e523136 fixed special characters output. Ticket #3741. 2016-06-02 16:30:17 +02:00
fermin831 ea313336ab Reformuled users_can_manage_group_all Tickets #3680 2016-06-01 18:11:47 +02:00
Alejandro Gallardo Escobar a59887707f Added some space to the bottom of the vertical bars graph 
(cherry picked from commit e4357a1047)
 2016-05-31 12:14:57 +02:00
Alejandro Gallardo Escobar 63b7e5c43c Fixed the custom line thickness of the flot line graphs 
(cherry picked from commit 6e2cddc48d)
 2016-05-30 19:31:23 +02:00
Alejandro Gallardo Escobar 0d24ae7258 Now all the graphs of the visual console are images by default 
(cherry picked from commit 7cec21d839)
 2016-05-30 18:53:30 +02:00
Alejandro Gallardo Escobar 7ae4eaae5b Now all the graphs of the fullscreen visual console are images 
(cherry picked from commit 90427855fb)
 2016-05-30 17:30:54 +02:00
Alejandro Gallardo Escobar 267290a5dc Improved the graphs behaviour when rendered into the dashboard or the visual console 
(cherry picked from commit 20128621395cf381d62f1e1b35064b2fb3a67ac1)
 2016-05-30 15:26:29 +02:00
Arturo Gonzalez 39d54518eb New transmap in progress (problem with merge from develop) 2016-05-30 13:13:39 +02:00
Arturo Gonzalez a4dd64bb8e Merge branch 'develop' into feature/transactional-map 
Conflicts:
	pandora_console/include/constants.php
	pandora_console/operation/menu.php
 2016-05-30 13:08:34 +02:00
Arturo Gonzalez 9a9f8e17b8 Fixed events with/without tags table in advanced options. Ticket #3702 2016-05-25 17:40:34 +02:00
Alejandro Gallardo Escobar 60261b2d01 Huge improvements on the visual console fullscreen view 
(cherry picked from commit f68f1823f3)
 2016-05-25 13:38:31 +02:00
Alejandro Gallardo Escobar 2bea12d737 Huge improvement on the public console visualization 2016-05-25 11:45:31 +02:00
m-lopez-f 4b90a4f318 Fixed problems in new feature with url. Tiquet: #3079 2016-05-23 10:00:50 +02:00
m-lopez-f fe51e17511 Feature grouped by agent in event list. Supported to metaconsole. Tiquet: #3079 2016-05-23 09:45:42 +02:00
m-lopez-f 9f772e5091 Feature. new form of groped data in event list. Tiquet: #3079 2016-05-23 09:22:57 +02:00
m-lopez-f 67f1765248 Fixed problems with menus and acl enterprise 2016-05-18 11:40:20 +02:00
mdtrooper cdc14c2582 Working in the refresh holding area. 2016-05-17 12:22:15 +02:00
mdtrooper 04c6bd9c88 Merge branch 'develop' into feature/new_networkmap 2016-05-13 11:39:18 +02:00
Alejandro Gallardo Escobar d98d135855 Now the public visual console graphs are images by default 2016-05-11 16:33:42 +02:00
Alejandro Gallardo Escobar 5c9b747519 Merge pull request #53 from pandorafms/ehorus-integration 
eHorus integration
 2016-05-10 11:37:32 +01:00
mdtrooper 414a948871 Fixed the count of nodes in the enterprise new networkmap. 2016-05-10 11:49:32 +02:00
Alejandro Gallardo Escobar 8af8b6a480 Now the permission to access the eHorus client is Agents Manager (AM) 2016-05-09 19:23:39 +02:00
Alejandro Gallardo Escobar 853ef78168 Changed the temporal images of the menus for eHous with their definitive version 2016-05-09 16:31:29 +02:00
Alejandro Gallardo Escobar 2b88b58448 Added a token expiration check to warn users they should request another 2016-05-09 16:22:01 +02:00
Alejandro Gallardo Escobar efc5642aa2 Almost finished the eHorus integration 2016-05-09 13:06:30 +02:00
Alejandro Gallardo Escobar 63fb20ed95 Added subtabs for the ehorus tab 2016-05-09 13:05:53 +02:00
mdtrooper 529ea387b6 Fixed again the generation method when a new networkmap is update. 2016-05-09 11:54:25 +02:00
mdtrooper bb777aa47b Fixed the generation method in the new networkmap. 2016-05-09 11:20:08 +02:00
mdtrooper 3d9265003b Fixed the creation button in the networkmap list. 2016-05-09 10:22:30 +02:00
mdtrooper 35b66968f9 fixed the link to editor networkmap in the list. 2016-05-09 10:18:14 +02:00
mdtrooper 08d1cece5c Some fixes. 2016-05-09 09:51:20 +02:00
Alejandro Gallardo Escobar 7f72a089e0 More work on the visualization section of the eHorus integration 2016-05-05 18:32:34 +02:00
mdtrooper 4c2336e7b7 Working in the fixes for the networkmaps into enterprise metaconsole. 2016-05-05 15:12:58 +02:00
mdtrooper fc7961b0d8 Merge branch 'develop' into feature/new_networkmap 2016-05-05 14:21:04 +02:00
mdtrooper 98e45f4b03 Another fixes for the new networkmap in the enterprise metaconsole. 2016-05-05 14:04:30 +02:00
mdtrooper 8d255dacd8 Some fixes for the new networkmap in the enterprise metaconsole. 2016-05-05 13:05:35 +02:00
mdtrooper 98bf61fd12 Some fixes for the new networkmap in the enterprise metaconsole. 2016-05-05 12:54:04 +02:00
mdtrooper 42dedd2d23 Fixed the networkmap in the enterprise metaconsole. 2016-05-05 11:56:46 +02:00
Alejandro Gallardo Escobar 8fa87e7e1e Added a new agent tab to launch the eHorus Client 2016-05-04 19:21:24 +02:00
mdtrooper 6ba38adc56 Fixed typo error in the radial dynamic networkmaps. 2016-05-04 11:51:04 +02:00
fermin831 bb4ec54fbc Improved sql cache to permit make cache of several databases TICKETS #3581 2016-05-03 16:16:37 +02:00
mdtrooper 63306e0288 Fixed the size of radial dynamic networkmap in the dashboard. 2016-05-03 15:06:33 +02:00
Arturo Gonzalez ceee981cfb New transmap in progress... (This is only THE BEGINNING) 2016-04-29 15:31:22 +02:00
mdtrooper 7d14169e61 Added the enterprise tab for the list deleted items. 2016-04-29 15:12:44 +02:00
mdtrooper 78f044dbf5 Some fixes. 2016-04-26 15:03:53 +02:00
mdtrooper 30f806f41c Merge branch 'develop' into feature/new_networkmap 
Conflicts:
	pandora_console/include/functions_modules.php
 2016-04-25 15:25:16 +02:00
mdtrooper 74957c30a2 Fixed the networkmap enterprise when it is update. 2016-04-22 12:57:36 +02:00
mdtrooper 64d08739c7 Fixed another widget in the form editor for the radial dynamic. 2016-04-19 09:56:32 +02:00
mdtrooper 1ecbd62bd8 Fixed the form for the radial dynamic. 2016-04-19 09:53:24 +02:00
mdtrooper 074edb87e3 Added some constants. 2016-04-19 09:48:47 +02:00
mdtrooper 6fea7dd3f1 Added old code of radial dynamic networkmap. 2016-04-19 09:33:40 +02:00
mdtrooper 84b249b4a7 Fixed the setted values of a disable show modules in networkmap. 2016-04-15 11:29:55 +02:00
Arturo Gonzalez 18412b7727 New maps in progress... (Fixed error in maps update) 2016-04-12 10:23:12 +02:00
Arturo Gonzalez 0f76fdde49 New maps in progress... (Fixed error in source data) 2016-04-12 09:18:14 +02:00
mdtrooper ff598940e1 Some work in the networkmap. 2016-04-07 15:14:29 +02:00
fermin831 57190faf76 Fixed sql fail in snmp console TICKETS #3504 2016-04-04 12:16:07 +02:00
Akihiro Uchida 57d6ae5c8b Fix reporting format for exportdata 
- for 'data', timestamp should be timestamp of data
- for 'avg', timestamp should be averaging period
 2016-04-04 15:48:25 +09:00
Arturo Gonzalez 01d751505a New maps in progress... (Init migrate ntw maps enterprise) 2016-03-29 14:04:11 +02:00
mdtrooper 16812b55b5 Merge branch 'develop' into feature/new_networkmap 2016-03-29 13:46:59 +02:00
m-lopez-f d989ac8442 Re-fixed problems with visual console. Tiquet: #3492 
(cherry picked from commit 951856d837)
 2016-03-23 15:14:47 +01:00
fermin831 744b60cbd1 Solved config token homedir_filetransfer duplication TICKETS #3475 2016-03-16 18:49:17 +01:00
m-lopez-f 368a96222e Fixed problems with dashboard performance when include users maps. Tiquet: #3438 
(cherry picked from commit e3e549cbe8)
 2016-03-15 09:26:24 +01:00
mdtrooper aefff3041f Merge branch 'develop' into feature/new_networkmap 
Conflicts:
	pandora_console/include/constants.php
 2016-03-09 11:15:17 +01:00
mdtrooper 1b60dbb7ad https://bugzilla.mozilla.org/show_bug.cgi?id=1254159 2016-03-08 15:37:20 +01:00
fermin831 179857e560 Fixed filter agent and modules empty in events 2016-03-08 13:51:08 +01:00
Hirofumi Kosaka 5cf90eeb27 Fixed the case "bulk module edit" had failed when selecting "Select modules first". 2016-03-08 18:06:16 +09:00
mdtrooper d12eb3f8ea Add tiny improvement 2016-02-22 13:18:54 +01:00
mdtrooper 0b8ec4a89d Added another library (jquery.svg.js) for to fix jquery bug (the pretty jquery can not work with "svg dom"...I love it). 2016-02-19 13:17:18 +01:00
Arturo Gonzalez db66113fb1 Fixed group view with strict user. Ticket#3391 2016-02-18 09:20:14 +01:00
mdtrooper c5f6259fce Working in the new networkmaps. 2016-02-17 12:25:03 +01:00
mdtrooper 9d2c2049cf Some debug traces for the jobmate for the next monday. 2016-02-12 17:22:44 +01:00
mdtrooper ab51866abb Change the filters as we need from the last metting. 2016-02-12 13:05:15 +01:00
mdtrooper 9376e9aa6d Merge branch 'develop' into feature/new_networkmap 2016-02-10 14:54:08 +01:00
Arturo Gonzalez 5a908d8c02 New maps in progress... (Added fields to creation) 2016-02-10 14:17:08 +01:00
mdtrooper df25018631 Working in the code of new networkmap. 2016-02-10 14:01:10 +01:00
fermin831 a658b88361 Set initial status to modules pagination in agent view TICKETS #3362 2016-02-09 20:07:43 +01:00
mdtrooper 255f67c545 Fixed the networkmap editor. 2016-02-08 16:23:25 +01:00
mdtrooper fe863f61df Working in the code of new networkmaps. 2016-02-08 13:47:46 +01:00
mdtrooper f0afd427bb Working in the new networkmap, the view and d3 2016-02-03 11:40:08 +01:00
mdtrooper fe3f404837 Improve the page header. 2016-02-03 09:38:00 +01:00
Arturo Gonzalez c167e5f167 New maps in progress... (forms finished) 2016-02-03 09:31:39 +01:00
Arturo Gonzalez 596cacb41c New maps in progress... (Create, edit and list mode) 2016-02-03 09:08:37 +01:00
Arturo Gonzalez d65ab71600 New maps in progress... (Creation, edit and list mode) 2016-02-02 16:58:39 +01:00
mdtrooper 65411abc8f Some changes in the page header. 2016-02-02 16:03:01 +01:00
mdtrooper 988c417435 Added the first version of new networkmap viewer. 2016-02-02 15:54:02 +01:00
Arturo Gonzalez a24670d961 New maps in progress... (List, create and edit mode) 2016-02-02 15:36:31 +01:00
mdtrooper 9cebc5ef12 Some changes. 2016-02-02 15:29:15 +01:00
Arturo Gonzalez 50646084ce New maps in progress... 2016-02-02 15:27:17 +01:00
Arturo Gonzalez a9a2aca35b New maps in progress... 2016-02-02 15:25:38 +01:00
Arturo Gonzalez a5bcd25e5e New maps in progress... (List, edit and creation pages) 2016-02-02 14:10:13 +01:00
Arturo Gonzalez a14521312b New maps in progress... 2016-02-02 09:30:01 +01:00
mdtrooper d834146122 Working in the new networkmaps. 2016-02-01 16:19:01 +01:00
mdtrooper 8602d9eb4b Working in the new networkmaps. 2016-02-01 16:02:43 +01:00
mdtrooper 7931b7f770 Working in the new networkmaps. 2016-02-01 15:23:56 +01:00
mdtrooper 71f38f7e02 Working in the migration. 2016-02-01 15:12:21 +01:00
Arturo Gonzalez 93e1e75193 Feature in progress... (New networkmap) 2016-02-01 14:16:38 +01:00
Arturo Gonzalez 0e433e3eb1 Added preliminar table to networkmap list. 2016-02-01 13:36:26 +01:00
mdtrooper b0b6b89509 Add menu entry. 2016-02-01 12:56:14 +01:00
mdtrooper 10cc2d04a0 Working in the migration. 2016-02-01 12:21:54 +01:00
mdtrooper 84001dd65b Start the new page for the new networkmaps 2016-02-01 12:00:38 +01:00
m-lopez-f d0cea38c8d Fixed view data in group view. Tiquet: #3289, #3297 2016-02-01 11:52:03 +01:00
m-lopez-f 948e691acb Revert "Fixed problems of count agents and modules in group view. Tiquet: #3028,#3297" 
This reverts commit b274ea805b.
 2016-01-29 14:25:09 +01:00
m-lopez-f b274ea805b Fixed problems of count agents and modules in group view. Tiquet: #3028,#3297 2016-01-29 13:53:00 +01:00
m-lopez-f 1c374acc3f Change refr in visual console. Tiquet: #3277 2016-01-28 11:57:32 +01:00
mdtrooper c817d96937 Cleaned source code. 2016-01-27 15:58:54 +01:00
m-lopez-f 0ac40e51e6 Fixed problems in reports view in metaconsole. Tiquet: #3176 2016-01-26 11:44:45 +01:00
Arturo Gonzalez 2a2b8bb465 Added pagination to group view. Visual errors fixed. Ticket#3239 2016-01-20 15:11:37 +01:00
mdtrooper f253a16d9b Rewrote some parts the GIS to adapt from pandora v3 to newest versions. TICKET: #3170 2016-01-19 13:21:18 +01:00
mdtrooper 110241ecc8 Change the rossete icon for long strig module values in the console for a dialog. TICKET: #3019 2016-01-18 16:58:24 +01:00
mdtrooper 90c024eb9c Now the menu entries are can highlight with subpages (with the item 'pages'). TICKET: #2903 2016-01-18 14:50:42 +01:00
mdtrooper e64901ec03 Disable in the code the get total alerts in the main search. TICKET: #3126 
(cherry picked from commit 66ce615a2e)
 2016-01-18 12:41:14 +01:00
mdtrooper 82c890410d Now the dates are showed in the locale of user. TICKET: #2487 2016-01-18 11:54:17 +01:00
Arturo Gonzalez d23246b58c Added visual data to not init monitors in group view. 2016-01-15 13:19:47 +01:00
Arturo Gonzalez 173ccc5fe1 Added new data in groups view and fixed some numeric errors. 2016-01-15 12:54:28 +01:00
mdtrooper 703b27027f Readded the extension admin page. TICKET: #3149 2016-01-12 14:08:17 +01:00
Hirofumi Kosaka 77d86636c4 (only for Oracle) Fixed if direccion of any agents has NULL, snmp console fail to list 
unregistered agents' trap (by using "NOT IN" against NULL-inclued list).
 2016-01-08 17:37:22 +09:00
Arturo Gonzalez b7de284180 Fixed graph event position in modules graph when resizes the window. Ticket#3070 2015-12-31 12:04:23 +01:00
fermin831 2126843f1e Changed instruction column in event view 2015-12-30 12:25:42 +01:00
mdtrooper 96f77c7595 Fixed the form to search modules in an agent. TICKET: #3071 2015-12-30 11:16:11 +01:00
Arturo Gonzalez 7f28e03bed Added two decimals to resume data in group view. Ticket#3095 2015-12-24 11:04:47 +01:00
Arturo Gonzalez 320c7638a7 Group view fixed 2015-12-23 09:31:50 +01:00
m-lopez-f aeb0fc3de9 Fixed problems with public console. Tiquet: #3106 2015-12-22 10:00:16 +01:00
m-lopez-f 052dc11cc4 Only show module group of this agent use. Tiquet: #2991 2015-12-21 09:12:04 +01:00
m-lopez-f 719ece1ce8 Fixed warning php 2015-11-27 09:51:26 +01:00
m-lopez-f c20ba9023f Delete check f acl in gis map. Tiquet: #2989 
(cherry picked from commit 9455d54a76)
 2015-11-25 16:47:19 +01:00
m-lopez-f 769f2c2899 Change toltip helper and add new toltip helper because its confused search a snmp trap. Tiquet: #2975 2015-11-25 16:15:10 +01:00
m-lopez-f 806d9a55b5 Latest events in tactical view open permanetly 2015-11-25 15:55:32 +01:00
m-lopez-f 84615a259d Delete file, dont use 2015-11-25 08:54:15 +01:00
m-lopez-f 332fce904d Fixed problems with includes javascript when enter in list of gis map. Tiquet: #2935 
(cherry picked from commit ecd5e92184)
 2015-11-25 08:40:22 +01:00
m-lopez-f b5de23a9b3 Fixed tooltip text. Tiquet: #2993 2015-11-24 15:21:03 +01:00
m-lopez-f b4ebdb1c8e Fixed problems with oracle in snmp console. Tiquet: #2943 2015-11-19 13:02:03 +01:00
m-lopez-f 858e3ea202 Fixed problems with performance. Tiquet: #2970 
(cherry picked from commit a57f62e5bf)
 2015-11-18 16:32:20 +01:00
m-lopez-f 25a3e09895 Move links submenu and add image and style. tiquet: #2960 2015-11-17 12:20:34 +01:00
m-lopez-f 4761d4ad8e Fixed styles of lateral menu and add link in submenu of tools. Tiquet: #2960 2015-11-17 11:20:45 +01:00
m-lopez-f 28aba1c646 Add not hidden parts of tactical view when this view have refresh. Tiquet: #2956 
(cherry picked from commit efabeb887b)
 2015-11-10 10:07:37 +01:00
Arturo Gonzalez 5773a94022 Fixed table in events filter. Ticket#2940 2015-11-05 10:40:50 +01:00
m-lopez-f c72f024610 Add new custom graphs and fixed others graphs. 
New graphs:
	Bullet Chart
	Vertical Bars and Horizontal
	Pie
	Gauges
 2015-11-04 17:42:45 +01:00
Arturo Gonzalez Diaz 7a4110ebee Fixed sql error (oracle) in gis view. Ticket#2873 2015-10-23 13:31:46 +02:00
Arturo Gonzalez Diaz ba492135ca Added a new option to visual setup that configure the interface unit graphs. Ticket#2620 2015-10-23 12:54:58 +02:00
Arturo Gonzalez Diaz e8cc3ccbf9 Fixed sql problemas in incidents section (oracle). Ticket#2902 2015-10-21 13:57:05 +02:00
Arturo Gonzalez Diaz e93606bda4 Fixed modules general search when shows the status. Ticket#2913 2015-10-20 08:48:24 +02:00
Arturo Gonzalez Diaz 98c8b30b52 Fixed module search in oracle (now it is true) 2015-10-19 15:32:39 +02:00
m-lopez-f 102375d377 Fixed show data. tiquet: #2865 2015-10-19 15:27:25 +02:00
Arturo Gonzalez Diaz 3218bd7fec Fixed module search in oracle (general search). Ticket#2901 2015-10-19 15:23:17 +02:00
Arturo Gonzalez Diaz 8091827490 Fixed a parentesis 2015-10-14 09:37:38 +02:00
Arturo Gonzalez Diaz 67d0a6602e Fixed some things. 2015-10-14 08:38:30 +02:00
Arturo Gonzalez Diaz 10044a6f3a Added a text message to clarify the source of the event table (Agent view). 2015-10-09 14:12:33 +02:00
m-lopez-f 63838760cb Fixed problems with print data in view 2015-10-09 13:47:02 +02:00
Arturo Gonzalez Diaz d67af2d0f4 Now modules without events in the last 24h it shows as green bar. Fixed time of data checks in events graph (agent general view). 2015-10-09 09:20:30 +02:00
Arturo Gonzalez Diaz d829d34f13 Merge branch 'develop' into new-agent-view 2015-10-07 15:02:02 +02:00
Arturo Gonzalez Diaz 5c1fdcde8a Fixed "avg only" in module graphs. Ticket #2740 2015-10-07 11:52:27 +02:00
Arturo Gonzalez Diaz fe001a9cb4 New visualization of agent view 2015-10-07 11:33:12 +02:00
Arturo Gonzalez Diaz 37882026fd New visualization of agent view 2015-10-07 10:27:03 +02:00
Arturo Gonzalez Diaz 5d9a3a24d3 New visualization of agent view 2015-10-07 09:57:45 +02:00
m-lopez-f bea8170120 Fixed problems with function and pass variables. Tiquet: #2856 2015-10-06 15:37:16 +02:00
m-lopez-f e35401566a add select option in bulk edit agent in cascade protecction. Tiquet: #2813 and fixed style 2015-10-06 13:52:45 +02:00
Arturo Gonzalez Diaz c411c026fa Fixed external link images in meta. Ticket#2827 2015-10-05 16:45:49 +02:00
m-lopez-f 7a98fb79f7 Fixed problems with show data in recon task and save data. Tiquet: #2780 2015-10-02 15:02:35 +02:00
Arturo Gonzalez Diaz 1951cce831 Fixed general module search, now searches all the modules if the user haven't tags. Tickets #2847 and #2835 2015-10-02 14:24:00 +02:00
Alejandro Gallardo Escobar 565744c176 Now the section applies the module ACL properly 2015-10-01 16:18:45 +02:00
m-lopez-f 7d6f03c3c8 Fixed problems with save event filters and dont save agent and module. Tiquet: #2794 2015-09-30 09:26:19 +02:00
m-lopez-f 417d43118c Fixed style 2015-09-29 13:14:55 +02:00
m-lopez-f 8a8515ecbc Fixed problems with export or view data when data start and end is in same day. Tiquet: #2763 2015-09-29 13:12:17 +02:00
m-lopez-f afef30bc75 Fixed when export csv in custom graph and only print one register and add label in export data, tiquet: #2755 2015-09-28 16:17:30 +02:00
Arturo Gonzalez Diaz 2ad67bc8b3 Fixed problem with services in public link (visual console). Ticket #2819 2015-09-25 11:51:28 +02:00
m-lopez-f bd336d68f0 Fixed warning php. Tiquet: #2791 2015-09-22 12:30:47 +02:00
Arturo Gonzalez Diaz d208e06604 Fixed case sensitive error in oracle machines. Ticket #2783 2015-09-22 10:40:34 +02:00
Arturo Gonzalez Diaz 3df4b3d9f5 Fixed visual error in agent view. Ticket#2786 2015-09-21 09:51:00 +02:00
Alejandro Gallardo Escobar d8340344b0 Added a dynamic height on the fixed bottom box 2015-09-11 11:58:12 +02:00
Arturo Gonzalez Diaz 378bcf09c3 Fixed sound_events access in Pandora 6. Ticket #2691 2015-09-08 11:52:06 +02:00
Arturo Gonzalez Diaz e6fb5a8af1 fixed visual error in group view. Ticket #2621 2015-09-07 13:42:55 +02:00
Alejandro Gallardo Escobar bf287dd98b Adapted the tree view to show the elements detail info using the fixed-bottom-box module 2015-09-07 11:54:15 +02:00
Arturo Gonzalez Diaz ffb1d9fe98 Fixed error in tags table, the tables were unbalanced. Ticket #2648 2015-09-07 10:18:55 +02:00
m-lopez-f 6a3ead3ca4 improvement the last commit(6db4c59) 2015-08-31 12:17:53 +02:00
m-lopez-f 6db4c59c3c Fixed global search alerts when db engine is oracle. Tiquet: #2651 2015-08-31 12:14:32 +02:00
mdtrooper 7edd288707 Fixed PHP Warning. 
(cherry picked from commit a79666f60c)
 2015-08-28 18:04:16 +02:00
mdtrooper bcb1b7123a Fixed PHP Error, lost the $store_group var. 2015-08-28 17:35:04 +02:00
mdtrooper 63498fdbf7 Added percentile 95º in the stat win of module. TICKET: #2613 2015-08-20 17:55:10 +02:00
Arturo Gonzalez Diaz 566acd3404 Fixed minor visual error in tactical view. Ticket #2441 2015-08-19 15:15:07 +02:00
m-lopez-f 7f1d89940d Change menu. Tiquet: #2471 2015-08-19 08:49:16 +02:00
m-lopez-f 4e090e20a6 Change label to filter by text and add toltip help. Tiquet: #2589 2015-08-18 16:55:59 +02:00
m-lopez-f 27e5bfc43d Fixed problems when filter by text in incidents and charge firts task of incidents. 2015-08-18 16:23:45 +02:00
Arturo Gonzalez Diaz 0eb68ef9cb Added icon to module graph. 2015-08-17 15:11:04 +02:00
Arturo Gonzalez Diaz 435b7381de Fixed broken image in module graph (meta). Ticket #2574 2015-08-17 14:54:04 +02:00
Arturo Gonzalez Diaz 4419166825 Fixed view errors in group view. #Ticket2517 2015-08-13 12:02:07 +02:00
Arturo Gonzalez Diaz 3288c35cbf Bug fixed in group view, now when you pick a tag, shows the correct number of agents, in tree view. Ticket#2517 2015-08-13 11:39:36 +02:00
mdtrooper 0a0d9fad25 Merge branch 'develop' into feature/ticket#2491-features-dashboard 2015-08-12 13:03:50 +02:00
mdtrooper 6f9f20f996 Added the parameter to set the size of networkmaps. 2015-08-10 19:44:28 +02:00
Alejandro Gallardo Escobar 34f56c5f47 Now the module graph popup shows a control to set the start time 
Also added date and time pickers
 2015-08-10 17:04:53 +02:00
Arturo Gonzalez Diaz cd6d142cf4 Fixed error in "free search" section (Alert detail). #2562 2015-08-05 12:32:02 +02:00
Alejandro Gallardo Escobar 8fb71f8413 Fixes and improvements in the use of agents and monitors multiselects 2015-08-05 10:39:16 +02:00
Alejandro Gallardo Escobar 3eddf9dbdc Fixed another SQL injection point 2015-08-04 12:49:54 +02:00
Alejandro Gallardo Escobar a7586d0a90 Fixed a SQL injection point and improved the code 2015-08-03 16:46:49 +02:00
Alejandro Gallardo Escobar ada30b1f03 Fixed a SQL injection point 2015-08-03 13:32:46 +02:00
m-lopez-f cd676cac59 change in the way data show snmp data timeticks. Tiquet: #2494 2015-07-31 11:16:42 +02:00
Arturo Gonzalez Diaz a7ed92c919 Now in group view, groups and tags differ and the tags have an characteristic image. Ticket#2517 2015-07-30 16:15:53 +02:00
m-lopez-f ea850a7d7a Fixed problems with access. Tiquet: #2479 2015-07-29 10:43:14 +02:00
m-lopez-f 25106d8383 Add order data in metaconsole enterprise. Tiquet: #2232 2015-07-29 10:13:18 +02:00
m-lopez-f 1babc752dc Add new options when render proc is active. Tiquet: #2503 2015-07-29 08:50:09 +02:00
m-lopez-f a9c6900852 Fixed problems when filter maps and not have data, show firts task of networkmaps. Tiquet: #2531 2015-07-28 15:45:27 +02:00
m-lopez-f 3e0b8a0f52 Fixed errors in php 2015-07-27 15:34:09 +02:00
m-lopez-f eb548a5296 Fixed print name in form and list of networkmaps. Tiquet: #2530 2015-07-22 13:02:47 +02:00
mdtrooper a4b5f8607f Added feature. The report items SLA, Availaibily and General do not show the not init modules. TICKET: #2510 2015-07-21 13:10:44 +02:00
mdtrooper f1ada9076e Added a filter 'normal & critical' in severity into events. 2015-07-21 10:40:29 +02:00
Arturo Gonzalez Diaz afd0ac6490 Merge branch 'develop' into feature/ticket#2463-monitor-detail-show-monitors 2015-07-20 10:43:46 +02:00
Arturo Gonzalez Diaz c9231ad125 Now always show the number of monitors in monitor view. Ticket #2463 2015-07-20 10:41:14 +02:00
Arturo Gonzalez Diaz 8531cd91fd Always show the number of monitors. Ticket #2463 2015-07-20 10:30:05 +02:00
m-lopez-f 8bdc11a00c Reorganizate requiere_once for see correct Snapshot view. Tiquet:#2452 2015-07-17 10:47:30 +02:00
Alejandro Gallardo Escobar a90111ac18 Restored the call 'get_agent_modules_json_for_multiple_agents' and improved their performance 2015-07-17 10:02:11 +02:00
mdtrooper 8b608a43f5 Fixed the javascript bug with lines in the visualmap. TICKET: #2464 2015-07-16 14:59:29 +02:00
m-lopez-f bc54629604 Fixed problems with user edit when change language,see all fields in home screen. Tiquet: #2448 2015-07-15 15:08:14 +02:00
m-lopez-f 994f1a39b6 fixed problems php 2015-07-15 08:49:16 +02:00
m-lopez-f c4d6c18b25 Fixed styles and errors of php 2015-07-14 15:59:39 +02:00
mdtrooper 656e7ab3bf Fixed the SQL querys for get list of snmp traps in the view page. 2015-07-14 12:50:05 +02:00
Alejandro Gallardo Escobar a097aabf80 Replaced the use of the jQuery 'attr' function with the 'prop' function when using the 'selected' property. 
The 'attr' function is going to be deprecated an may cause errors in Firefox.
 2015-07-14 11:11:22 +02:00
m-lopez-f 8c64e6b481 Fixed style 2015-07-09 17:52:37 +02:00
mdtrooper 3d46327f55 Rewrote the ajax call 'get_agent_modules_json_for_multiple_agents' for to run with the agents cache in new metaconsole in 6 version. 2015-07-08 16:40:12 +02:00
Alejandro Gallardo Escobar a26c930c91 Fixes and improvements 2015-07-08 15:20:28 +02:00
m-lopez-f 09f6b7a29a Fixed styles metaconsole 2015-07-07 13:57:47 +02:00
mdtrooper 3e2fd15302 Fixed, now the first task for visualmap does not show in metaconsole. 2015-07-06 18:18:52 +02:00
m-lopez-f 10a5dc5ffb Fixed style in events filters list 2015-07-03 14:55:12 +02:00
m-lopez-f d7bd4773db Change visual of metaconsole 2015-07-02 08:54:21 +02:00
m-lopez-f 03b617908b Change visual of metaconsole 2015-07-01 17:05:53 +02:00
m-lopez-f 78e60249a7 Change visual of metaconsole and console 2015-07-01 14:50:00 +02:00
m-lopez-f 09bcaa42f5 Change visual of metaconsole. 2015-07-01 11:27:37 +02:00
m-lopez-f 69bc104b99 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-06-30 17:06:15 +02:00
m-lopez-f b880f8c726 Fixed style event list in metaconsole 2015-06-30 17:05:58 +02:00
Ramon Novoa a9f2171cce Show system events in the metaconsole. 2015-06-30 16:48:32 +02:00
mdtrooper def7a59a97 Cleaned source code style. 2015-06-30 16:29:39 +02:00
mdtrooper 2fd82b6ee5 Merge branch 'feature/ticket#1980-dynamic_reports' into develop 2015-06-29 13:26:14 +02:00
mdtrooper cf5b850c3f Some fixes in the dynamic reports for metaconsole. 2015-06-29 13:18:55 +02:00
m-lopez-f 15fb6f20a4 Add new view when no have data in this view 2015-06-26 14:52:01 +02:00
m-lopez-f 58ea3ebb6b Change visual 2015-06-26 08:49:51 +02:00
mdtrooper 247796ae8b Merge branch 'develop' into feature/ticket#1980-dynamic_reports 2015-06-25 16:02:27 +02:00
m-lopez-f 94c742bfbe Merge from Develop 2015-06-25 10:40:35 +02:00
m-lopez-f 5b4214277b Changed of visual 2015-06-25 10:07:53 +02:00
m-lopez-f 83a88d7a91 Fixed maps in Windows. Tiquet: #2153 
(cherry picked from commit 298b509b97)
 2015-06-23 15:15:03 +02:00
mdtrooper afecb459c5 Working in the enterprise feature dynamic reports. 2015-06-22 16:22:48 +02:00
mdtrooper 447c4ccd6d Some fixes in the code. 2015-06-22 16:10:15 +02:00
Alejandro Gallardo Escobar 9644a91b67 Fixed an error in the order of the parameters of a function 2015-06-19 12:11:11 +02:00
Alejandro Gallardo Escobar 3b037caf32 Merge remote-tracking branch 'origin/develop' into features/oracle 2015-06-18 20:02:01 +02:00
Alejandro Gallardo Escobar 1905c8a038 Visual fixes into the alerts list 2015-06-16 17:54:19 +02:00
m-lopez-f ff1186ee57 Changed visual of console 2015-06-16 16:09:50 +02:00
m-lopez-f 9544dec1ac Change visual of console 2015-06-15 15:50:28 +02:00
m-lopez-f 2f5596ed9e Merge branch 'develop' into feature/NewView 2015-06-15 13:23:12 +02:00
m-lopez-f 9e528d0459 Change visual of console 2015-06-12 15:50:46 +02:00
mdtrooper 9ad8b1035c Tiny feature, the slide form to config chart in the module chart window adapt to the height of window. 2015-06-11 20:19:50 +02:00
mdtrooper 37a7cf6cf2 Some fixes in the code. 2015-06-11 20:17:54 +02:00
Alejandro Gallardo Escobar 11d50f06ba Removed some jQuery.ajax() 'timeout: 10000' and 'async: false' properties 2015-06-11 12:08:14 +02:00