Commit Graph

9322 Commits

Author SHA1 Message Date
Daniel Maya 0acf4f41eb New development. Display lateral menus whit left click. 2016-06-02 11:59:35 +02:00
artica 86b3cfe4cc Auto-updated build strings. 2016-06-02 00:01:15 +02:00
fermin831 ea313336ab Reformuled users_can_manage_group_all Tickets #3680 2016-06-01 18:11:47 +02:00
Alejandro Gallardo Escobar 4473b42657 Fixed the menu parameter of the area graph function
(cherry picked from commit 52d82bcae1127046b081e157bbb1696bc934bcad)
2016-06-01 15:03:15 +02:00
m-lopez-f decb820659 Fixed problems with session in pandora mobile verison. Tiquet: #3656 2016-06-01 12:54:00 +02:00
Alejandro Gallardo Escobar bce76b5505 Now when using the wizard the value macro are added only to the simple values as expected. Ticket #3751
(cherry picked from commit 650b42966f)
2016-06-01 12:01:23 +02:00
artica 8b650c12c5 Auto-updated build strings. 2016-06-01 00:01:14 +02:00
Alejandro Gallardo Escobar d58d3aa52f Removed the strange behaviour of the label size when printing a resized map
(cherry picked from commit b120478d3e273a7cb3414dbc58ad637d836e027c)
2016-05-31 17:08:57 +02:00
fermin831 10fb47d2fd Enlarged the text on plugins fields Tickets #3739 2016-05-31 15:32:47 +02:00
m-lopez-f ef4597ee94 Fixed pandora login in mobile version. Tiquet: #3656 2016-05-31 13:12:18 +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 ebf11e0473 Now the dashboard and visual console area graphs show the last and avg value in their legend
(cherry picked from commit 554e592275cda6c4adffc5bdb5b5779b86a1d192)
2016-05-31 11:27:38 +02:00
Arturo Gonzalez a4da4bbc8d Added a function to dashboard groups checkboxes. Ticket#2598 2016-05-31 10:05:23 +02:00
artica 9bce86d1ac Auto-updated build strings. 2016-05-31 00:01:18 +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 cffe5eab5f Now the pie graph is bigger
(cherry picked from commit e5b49240c7)
2016-05-30 18:47:29 +02:00
Alejandro Gallardo Escobar 1b951caf84 Apply the fix of the area graph height only to the dashboard and the visual consoles
(cherry picked from commit a2ba4acb6c)
2016-05-30 17:55:28 +02:00
Alejandro Gallardo Escobar a08387d91f Re-calculate the area graph height with the legend height
(cherry picked from commit 2aa420e623)
2016-05-30 17:33: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
fermin831 2b5d58279d Fixed module selection in scheduled downtimes Tickets #3444 2016-05-30 15:25:48 +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 9255d87869 Fixed errors in saml login page 2016-05-30 10:23:33 +02:00
Arturo Gonzalez 2ce399dd0d Fixed last value checkbox in reports. Ticket#3685 2016-05-30 08:58:24 +02:00
Arturo Gonzalez a5eeb7e4f1 New css class to saml button login... 2016-05-30 08:13:46 +02:00
artica bec6baa746 Auto-updated build strings. 2016-05-30 00:01:12 +02:00
artica b6d3f94a94 Auto-updated build strings. 2016-05-29 00:01:14 +02:00
artica 0825d79123 Auto-updated build strings. 2016-05-28 00:01:15 +02:00
fermin831 1c94eee171 Solved problems with availability reports and unknown time (2)
Tickets #3449
2016-05-27 14:11:26 +02:00
Arturo Gonzalez 8cb651079a Added a diferent loging page to saml system. 2016-05-27 13:59:19 +02:00
Alejandro Gallardo Escobar 534a9f4cfa Show only the avg on the legend of the area/line graphs when the graph is inside a dashboard or a visual map
(cherry picked from commit f1a3863460c8c31d79f60d4f5e398d1116670860)
2016-05-27 11:44:16 +02:00
Hirofumi Kosaka 225aef21ad BIG_OPERATION_STEP, SMALL_OPERATION_STEP of pandora_db.pl to be configured through the Console. TICKET #3558. 2016-05-27 16:37:58 +09:00
artica 94656c1f6d Auto-updated build strings. 2016-05-27 00:01:17 +02:00
Arturo Gonzalez 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
Arturo Gonzalez c0ccd438a9 Saml login fixed
(cherry picked from commit 02344033f3)
2016-05-26 16:42:35 +02:00
Arturo Gonzalez 0ee5ccb6b6 Saml login, fixed constants 2016-05-26 15:45:41 +02:00
Alejandro Gallardo Escobar 5a7fecb570 Improved the legends of the vertical bar graphs
(cherry picked from commit 922566dbf7)
2016-05-26 15:38:23 +02:00
Alejandro Gallardo Escobar 7f277e6be0 Fixed the watermark of the vertical bars graph
(cherry picked from commit 12d7087014)
2016-05-26 15:08:12 +02:00
Alejandro Gallardo Escobar 0490a00506 Some visual improvements and an option to hide the labels of the pie graphs
(cherry picked from commit 14127df1dc)
2016-05-26 13:48:08 +02:00
Alejandro Gallardo Escobar 595d2768f4 Now some graphs has auto margin (left and right) to center it to its container
(cherry picked from commit 97615ce9fd)
2016-05-26 09:50:38 +02:00
Alejandro Gallardo Escobar 5a2a54e127 Some changed on the vbar and hbar legends and tooltips and changed the windows carriage returns by its unix version
(cherry picked from commit 3637ddc2d479edfc68d6494cb8f59ab85e72ec80)
2016-05-26 08:58:33 +02:00
artica 49f0d1fa1f Auto-updated build strings. 2016-05-26 00:01:16 +02:00
Alejandro Gallardo Escobar e16cb318a1 Visual fixes on the horizontal bar graphs 2016-05-25 18:02:13 +02:00
Arturo Gonzalez 74ab9a5fe9 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2016-05-25 17:43:52 +02:00
Alejandro Gallardo Escobar e4758e9731 Fixed an error which affected to the values of the custom graphs 2016-05-25 17:41:19 +02:00
Arturo Gonzalez 9a9f8e17b8 Fixed events with/without tags table in advanced options. Ticket #3702 2016-05-25 17:40:34 +02:00
Arturo Gonzalez 921a79bd30 Fixed error when a user havent profiles and is acl strict. Ticket #3555 2016-05-25 16:04:06 +02:00
Arturo Gonzalez 710e15f1b2 Fixed "autocomplete agent search" with disabled agents. Ticket #3655 2016-05-25 15:30:46 +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 52921b4fde Added the styles for the fullscreen view of the visual consoles
(cherry picked from commit 72ff758d49)

Conflicts:
	pandora_console/include/styles/pandora.css
2016-05-25 13:38:17 +02:00
Alejandro Gallardo Escobar 735bb32e1a Added the keep_aspect_ratio parameter to the render_map action
(cherry picked from commit a1155e5e71)
2016-05-25 13:37:17 +02:00
Alejandro Gallardo Escobar 2bea12d737 Huge improvement on the public console visualization 2016-05-25 11:45:31 +02:00
Alejandro Gallardo Escobar 1f455a5958 Added a parameter to resize the visual map while keeping its aspect ratio 2016-05-25 10:43:49 +02:00
Arturo Gonzalez b6ee433df3 New transactional maps in progress... (Working in transactions creation system) 2016-05-25 10:22:05 +02:00
artica 72c83d4720 Auto-updated build strings. 2016-05-25 00:01:15 +02:00
Alejandro Gallardo Escobar 6b8c92c6b3 Error fix 2016-05-24 16:33:32 +02:00
Alejandro Gallardo Escobar 732a651d6d Added a function to easily made a control which only appear on mouse move
(cherry picked from commit 8d69c50d4b6e23defd22eafe99aceeaf0e5927da)
2016-05-24 16:24:40 +02:00
artica 927e8ba396 Auto-updated build strings. 2016-05-24 00:01:15 +02:00
m-lopez-f cefbc70ede Fixed feature to add cron extension in meta. Tiquet: #3669 2016-05-23 15:20:46 +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
Junichi Satoh 61f1947728 Updated Japanese translations. 2016-05-23 15:37:44 +09:00
artica 92d203fbf9 Auto-updated build strings. 2016-05-23 00:01:50 +02:00
artica 8cdaf766fb Auto-updated build strings. 2016-05-22 00:01:12 +02:00
artica b99bdb5527 Auto-updated build strings. 2016-05-21 00:01:18 +02:00
artica c4caf668c1 Auto-updated build strings. 2016-05-20 00:01:16 +02:00
fermin831 c7737c14d6 Added password type to update manager proxy Tickets #3552 2016-05-19 11:01:29 +02:00
artica 621a396fd1 Auto-updated build strings. 2016-05-19 00:01:14 +02:00
Alejandro Gallardo Escobar a0097dc31d Now the custom title used in pandora uses event delegation, so won't be necessary to bind the event to new elements
(cherry picked from commit 38a26cd739)
2016-05-18 15:30:57 +02:00
Alejandro Gallardo Escobar c4c37c1e15 Fixed the error which caused the simple value elements disappear from the visual console after enable the grid
(cherry picked from commit ce150336a9)
2016-05-18 12:34:41 +02:00
m-lopez-f 67f1765248 Fixed problems with menus and acl enterprise 2016-05-18 11:40:20 +02:00
artica 80f635c10f Auto-updated build strings. 2016-05-18 00:01:17 +02:00
mdtrooper cc67922d5c Fixes in the interface text in the arrows. 2016-05-17 15:42:00 +02:00
Alejandro Gallardo Escobar e47f6d9968 Now is possible to print multiple gauge graphs without errors
Fixes ticket #3635
2016-05-17 15:35:26 +02:00
mdtrooper 23fd308953 Another fixes in the arrows with interfaces. 2016-05-17 15:19:15 +02:00
mdtrooper 37fe7a6601 Some fixes in the arrows with interfaces. 2016-05-17 15:06:09 +02:00
fermin831 8a4d627ca6 Added custom graph selection in item list Tickets #3664 2016-05-17 13:58:52 +02:00
Alejandro Gallardo Escobar 0fa6369733 Added the _VALUE_ macro to the simple value items of the visual console created using the wizard
(cherry picked from commit 2d269a3d184bb8032e5d85bd862bdfb3db3c58fe)
2016-05-17 13:52:35 +02:00
mdtrooper e6a84b2aff Some fixes in the enterprise holding area. 2016-05-17 13:14:40 +02:00
mdtrooper cdc14c2582 Working in the refresh holding area. 2016-05-17 12:22:15 +02:00
mdtrooper b69960b2da Set the default refresh time for the migrated networkmap open. 2016-05-17 12:12:44 +02:00
mdtrooper cd6e8490fb Added the border to the nodes. 2016-05-17 11:46:07 +02:00
mdtrooper ce06e95900 Resize to fill the page the viewport of new networkmap. 2016-05-17 11:44:20 +02:00
mdtrooper 5d53de11a7 Fixed the resize action in the new networkmap. 2016-05-17 11:16:21 +02:00
mdtrooper 897d0171b9 Fixed the size of diferent nodes (agents, modules,...). 2016-05-17 10:55:05 +02:00
mdtrooper d4c84ddde2 Fixed the AMMA arrows. 2016-05-17 10:25:49 +02:00
mdtrooper e0403e90b2 Fixed the AMMA arrows in the javascript code. 2016-05-17 09:27:17 +02:00
Arturo Gonzalez 268cc025d8 New transactional maps in progress... (Added constants to nodes and arrows) 2016-05-17 09:16:19 +02:00
artica 220f3349f7 Auto-updated build strings. 2016-05-17 00:01:12 +02:00
artica 05387fc702 Auto-updated build strings. 2016-05-16 00:01:13 +02:00
artica 3483924416 Auto-updated build strings. 2016-05-15 00:01:13 +02:00
artica 958defd67e Auto-updated build strings. 2016-05-14 00:01:20 +02:00
mdtrooper f16a6a812e Working in the fixes of A-M-M-A arrows. 2016-05-13 16:04:32 +02:00
mdtrooper 995187d02a Some fixes in the generation of new networkmap from the source of old static networkmaps. 2016-05-13 14:18:33 +02:00
mdtrooper b229002dd7 Remove the old debug traces. 2016-05-13 13:41:30 +02:00
mdtrooper ae475c8447 Fixed the relations A-M-M-A and A-M-A in the old networkmaps (and this is the source of new networkmaps) 2016-05-13 13:20:53 +02:00
mdtrooper 04c6bd9c88 Merge branch 'develop' into feature/new_networkmap 2016-05-13 11:39:18 +02:00
artica 753d8107bb Auto-updated build strings. 2016-05-13 00:01:15 +02:00
Ramon Novoa 567d45cdc4 Added new columns to tagente_modulo for dynamic critical interval
calculation.
2016-05-12 13:37:18 +02:00
artica e9e5b95e6c Auto-updated build strings. 2016-05-12 00:01:15 +02:00
Alejandro Gallardo Escobar a90ae26178 Changed the default cell number of the dashboard from 9 to 4
(cherry picked from commit bb853bf779)
2016-05-11 18:16:24 +02:00
Alejandro Gallardo Escobar d98d135855 Now the public visual console graphs are images by default 2016-05-11 16:33:42 +02:00
mdtrooper aedce995ab Starting to fixed the arrows with interfaces. 2016-05-11 12:05:40 +02:00
fermin831 4bc3105ccc Patched library to solve some infinite loops in static graphics Tickets #3438 2016-05-11 10:25:52 +02:00
artica 02dbc727b3 Auto-updated build strings. 2016-05-11 00:01:16 +02:00
Axel bb85ab9636 Update AUTHORS
Added myself <3
2016-05-10 17:40:12 +02:00
mdtrooper fade837f1d Fixed another thing about the length of titles. 2016-05-10 15:09:53 +02:00
mdtrooper 5b77944f97 Fixed the lenght of titles. 2016-05-10 15:08:10 +02:00
mdtrooper 2e49a82938 Fixed the length in the editor of labels of nodes. 2016-05-10 14:02:04 +02:00
mdtrooper 1a3b977224 Show a tooltip to help when there is a relationship action. 2016-05-10 12:48:55 +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
artica c170ff6368 Auto-updated build strings. 2016-05-10 00:01:18 +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 16454c30a1 Now the eHorusID custom field is created automatically when the feature is enabled 2016-05-09 19:22:10 +02:00
Alejandro Gallardo Escobar bc9bd99f23 Added a variant of the ehorus logo 2016-05-09 18:49:16 +02:00
Alejandro Gallardo Escobar df99cf9f64 Now the eHorus ID custom field name has a default value 2016-05-09 18:48:56 +02:00
Alejandro Gallardo Escobar 8bb9a31a28 Added a menu entry for the eHorus setup 2016-05-09 17:08:25 +02:00
mdtrooper 26fa0c92e7 Changed the style of body arrow. 2016-05-09 16:56:06 +02:00
Alejandro Gallardo Escobar 9e9c45d031 Minor text fix 2016-05-09 16:50:20 +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 b9fb8a8f47 Added a set of images for the eHorus integration 2016-05-09 16:30:16 +02:00
Alejandro Gallardo Escobar 2861b877f6 Updated the eHorus client assets 2016-05-09 16:29:17 +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
mdtrooper 35d0d4db66 Fixed the enterprise feature of add relation between nodes in the new networkmap. 2016-05-09 14:38:37 +02:00
Alejandro Gallardo Escobar 82bd565f5d Updated the eHorus client sources to fix an error with the header 2016-05-09 13:25:50 +02:00
Alejandro Gallardo Escobar 8c0d2b1614 Updated the eHorus client assets 2016-05-09 13:06:59 +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
Alejandro Gallardo Escobar 9ef5ab0fec Fixed a style rule 2016-05-09 13:04:59 +02:00
mdtrooper 9e2460a042 Erased old trace code. 2016-05-09 12:37:24 +02:00
mdtrooper e57d08fd73 Fixed the generation spring in new networkmaps. 2016-05-09 12:31:18 +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
artica 97364cae8e Auto-updated build strings. 2016-05-09 00:01:11 +02:00
artica 240f4c477f Auto-updated build strings. 2016-05-08 00:01:10 +02:00
artica ffe863814d Auto-updated build strings. 2016-05-07 00:01:14 +02:00
artica 568fa28c94 Auto-updated build strings. 2016-05-06 00:01:13 +02:00
Alejandro Gallardo Escobar 7f72a089e0 More work on the visualization section of the eHorus integration 2016-05-05 18:32:34 +02:00
Alejandro Gallardo Escobar 5616429f9e Fixed an error in a query 2016-05-05 18:26:41 +02:00
Alejandro Gallardo Escobar 142d544ef1 Added a connection test with the eHorus API and custom fields management 2016-05-05 18:26:06 +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
artica 93413b93da Auto-updated build strings. 2016-05-05 00:01:14 +02:00
Alejandro Gallardo Escobar 8fa87e7e1e Added a new agent tab to launch the eHorus Client 2016-05-04 19:21:24 +02:00
Alejandro Gallardo Escobar e3cfca24ed Added a setup section for ehorus 2016-05-04 19:19:07 +02:00
Alejandro Gallardo Escobar e515a1d587 Added the function 'agents_get_agent_custom_field' 2016-05-04 18:48:54 +02:00
Alejandro Gallardo Escobar df89969301 Added the eHorus Client assets 2016-05-04 18:48:05 +02:00
mdtrooper 9a3525f544 Fixed the event move for several networkmaps in one page (as enterprise dashboard) 2016-05-04 15:19:45 +02:00
mdtrooper 8eee70f06d Fixed the dragable module group in new networkmap. 2016-05-04 15:10:57 +02:00
mdtrooper 751a07ccc8 Some work about the javascript for uniq networkmaps for the enterprise dashboard. 2016-05-04 14:37:44 +02:00
mdtrooper c58e3c599d Fixed the uniq div for each networkmap in the enterprise dashboard. 2016-05-04 13:14:15 +02:00
fermin831 48581e1259 Added toggle control to hide legend on service map TICKETS #3620 2016-05-04 13:03:04 +02:00
mdtrooper 6ba38adc56 Fixed typo error in the radial dynamic networkmaps. 2016-05-04 11:51:04 +02:00
mdtrooper 9945502466 Changed the filter var (before as global var) for the enterprise dashboard. 2016-05-04 11:06:57 +02:00
mdtrooper 2cc5f96915 Changed the edges (before as global var) for the enterprise dashboard 2016-05-04 10:38:47 +02:00
fermin831 053b39e4a4 Oracle and postgre sql cache changes TICKETS #3581 2016-05-04 09:14:10 +02:00
artica d7b3dc57b9 Auto-updated build strings. 2016-05-04 00:01:16 +02:00
mdtrooper 0690e303e9 Some fixes for two or more networkmaps in enterprise dashboard 2016-05-03 17:26:30 +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
mdtrooper c3ab1371e1 Fixed the networkmap for the enterprise dashboard. 2016-05-03 14:59:25 +02:00
Arturo Gonzalez db9e677d7e New transactional maps in progress... (Added necessary js files) 2016-05-03 14:58:35 +02:00
artica 48f66052da Auto-updated build strings. 2016-05-03 00:01:11 +02:00
artica caf42408b9 Auto-updated build strings. 2016-05-02 00:01:12 +02:00
artica 2287e12c34 Auto-updated build strings. 2016-05-01 00:01:11 +02:00
artica da64c77015 Auto-updated build strings. 2016-04-30 00:01:14 +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
artica 667ea34213 Auto-updated build strings. 2016-04-29 00:01:13 +02:00
mdtrooper f9ca419aa9 Working in the enterprise holding area. 2016-04-28 16:03:24 +02:00
Arturo Gonzalez 6d77e68247 Merge branch 'develop' into feature/satellite_view 2016-04-28 13:40:34 +02:00
Arturo Gonzalez 5fb6c1cbcd Fixed some errors in saml login system 2016-04-28 12:39:27 +02:00
artica d8a656f756 Auto-updated build strings. 2016-04-28 00:01:12 +02:00
mdtrooper 8faf1079fd Added two vars from php to javascript 2016-04-27 16:31:13 +02:00
fermin831 d82bf95891 Solved error 500 on resource exportation TICKETS #3604 2016-04-27 15:46:06 +02:00
artica 54db4aef98 Auto-updated build strings. 2016-04-27 09:42:11 +02:00
mdtrooper 78f044dbf5 Some fixes. 2016-04-26 15:03:53 +02:00
mdtrooper 67a65d84b1 Fixed the refresh time of map and networkmap 2016-04-26 12:23:09 +02:00
mdtrooper 1bc205f1f6 Working in the holding area into the minimap. 2016-04-26 11:26:28 +02:00
Arturo Gonzalez c0ff44da83 New satellite view in progress... 2016-04-26 10:44:52 +02:00
fermin831 aec47d20ef Fixed vulnerability in some extensions TICKETS #3554 2016-04-25 18:36:31 +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 87f7425467 The longest function networkmap_generate_dot is divided in two functions. 2016-04-25 15:17:15 +02:00
Arturo Gonzalez c335394a7b New maps in progress... (Fixed error in delete node) 2016-04-25 15:09:51 +02:00
fermin831 e97aff1cc4 Added report_limit token and functionality TICKETS #3577 2016-04-25 12:27:30 +02:00
mdtrooper e47c8641ac Working in the enterprise holding area. 2016-04-25 10:45:38 +02:00
Arturo Gonzalez 058a51232e New maps in progress... (Document the code) 2016-04-25 09:09:38 +02:00
Arturo Gonzalez 5f53b2fa12 New maps in progress... (Fixed errors in enterprise ajax) 2016-04-22 13:26:18 +02:00
mdtrooper 74957c30a2 Fixed the networkmap enterprise when it is update. 2016-04-22 12:57:36 +02:00