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

5378 Commits

Author SHA1 Message Date
artica 358fc7f393 Auto-updated build strings. 2016-02-28 00:01:11 +01:00
artica 0c93432204 Auto-updated build strings. 2016-02-27 00:01:15 +01:00
artica fcb98912d8 Auto-updated build strings. 2016-02-26 00:01:17 +01:00
mdtrooper fd0ffb8264 Some changes. 2016-02-25 16:38:20 +01:00
Arturo Gonzalez a3d70740d0 New maps in progress... (adapt tooltip data to modules) 2016-02-25 16:34:32 +01:00
mdtrooper 78bf99e9f0 Some changes 2016-02-25 16:18:14 +01:00
Arturo Gonzalez 5404d9cff0 New maps in progress... (remove useless code) 2016-02-25 12:59:22 +01:00
mdtrooper 5c3aa3ce07 Some changes in the tooltips. 2016-02-25 12:55:30 +01:00
Arturo Gonzalez d72be97e5e New maps in progress... (Fixed ajax to module nodes) 2016-02-25 09:27:00 +01:00
artica f41949cf57 Auto-updated build strings. 2016-02-25 00:01:23 +01:00
Arturo Gonzalez 6c35f5e64a New maps in progress... (fixed js error) 2016-02-24 16:58:09 +01:00
Arturo Gonzalez b7d4c97334 New maps in progress... (Tooltip buttons now have a function) 2016-02-24 16:44:37 +01:00
mdtrooper dce72cbca2 Link the tooltipster to d3 event. 2016-02-24 15:46:49 +01:00
Arturo Gonzalez 799730c48d New maps in progress... (tooltips data and click events) 2016-02-24 14:28:13 +01:00
mdtrooper 6d7286ec6f Fixed the last commit. 2016-02-24 14:12:07 +01:00
mdtrooper 6c037e0ef7 Merge branch 'feature/new_networkmap' of https://github.com/pandorafms/pandorafms into feature/new_networkmap 
Conflicts:
	pandora_console/include/class/Map.class.php
	pandora_console/include/javascript/map/MapController.js
 2016-02-24 14:06:24 +01:00
mdtrooper b345467fa0 Some work on the drag and drop 2016-02-24 13:59:39 +01:00
Arturo Gonzalez cccce11f79 New maps in progress... (get node data) 2016-02-24 13:04:38 +01:00
Arturo Gonzalez bd736ea598 New maps in progress... (get node data) 2016-02-24 11:45:08 +01:00
mdtrooper f203070e5e Some tiny changes. 2016-02-24 10:38:51 +01:00
mdtrooper d11448838f Added data attributes for the nodes. 2016-02-24 10:36:34 +01:00
Arturo Gonzalez fcc42ce5a3 New maps in progress... (new ajax and class files for nodes) 2016-02-24 10:00:01 +01:00
artica 089d748019 Auto-updated build strings. 2016-02-24 00:01:13 +01:00
Arturo Gonzalez 2b89d5d7e0 New maps in progress... (node data by ajax, first contact) 2016-02-23 17:28:55 +01:00
Arturo Gonzalez f3de5c9aaa New maps in progress... (document js file) 2016-02-23 17:13:24 +01:00
mdtrooper 5f7eee5bc8 Fixed the zoom controller, thanks to R.Novoa 2016-02-23 16:48:58 +01:00
mdtrooper 2ee1e5c345 Finish the zoom controller (well it is not finish, it needs the plus and minor buttons...sorry) 2016-02-23 12:37:58 +01:00
mdtrooper e2b8870afe Working in the home zoom button 2016-02-23 09:33:49 +01:00
artica 897e54f2e0 Auto-updated build strings. 2016-02-23 00:01:28 +01:00
mdtrooper 967aac57ef Starting to working in the zoom bar controller. 2016-02-22 18:54:19 +01:00
mdtrooper 952dd081ab Restore the code before the testing svg. 2016-02-22 17:17:03 +01:00
mdtrooper c66445d3a5 Change the code for testing the svg bug. 2016-02-22 17:14:18 +01:00
Arturo Gonzalez d154a1a779 New maps in progress... (Fixed error when tooltips and zoom) 2016-02-22 15:51:20 +01:00
mdtrooper 83951266d0 An another change. 2016-02-22 15:03:59 +01:00
mdtrooper 3eddfb2c7f An another changes. 2016-02-22 13:33:26 +01:00
Arturo Gonzalez 9648affaaa New maps in progress... 2016-02-22 13:30:44 +01:00
Arturo Gonzalez 6fae17432a New maps in progress... 2016-02-22 13:28:33 +01:00
mdtrooper d12eb3f8ea Add tiny improvement 2016-02-22 13:18:54 +01:00
mdtrooper e7b664dd63 Some changes that we need. 2016-02-22 13:02:06 +01:00
mdtrooper 646a90211e Some changes needs for the zoom. 2016-02-22 12:05:28 +01:00
Arturo Gonzalez 400620a11f New maps in progress... (tooltipster css files added) 2016-02-22 11:48:42 +01:00
Arturo Gonzalez accac98aae New maps in progress... (node tooltips) 2016-02-22 10:20:46 +01:00
Arturo Gonzalez 2da733e8b5 New maps in progress... (tooltips) 2016-02-22 09:55:32 +01:00
Hirofumi Kosaka 38ba2cfcbd Fixed massive-edit-plugins to show multi-byte string values properly. 2016-02-22 17:44:27 +09:00
artica 010f531b97 Auto-updated build strings. 2016-02-22 00:01:10 +01:00
artica 7b345f4453 Auto-updated build strings. 2016-02-20 00:01:19 +01:00
Arturo Gonzalez 0afd6e3eb6 New maps in progress... (first version of nodes tooltip) 2016-02-19 13:43:23 +01:00
mdtrooper 3e8cb70d0b First version of tooltip with svg 2016-02-19 13:30:58 +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
artica a839c63005 Auto-updated build strings. 2016-02-19 00:01:25 +01:00
mdtrooper 1d936ad230 First version of scroll and pan of new networkmap but it is buggy. 2016-02-18 16:51:03 +01:00
mdtrooper 5659589e01 Fixed the bug in the generation nodes. 2016-02-18 16:49:11 +01:00
Arturo Gonzalez b20828c85d New maps in progress... (Added css reference to TOOLTIPSTER!) 2016-02-18 15:33:24 +01:00
Arturo Gonzalez e5c05c7055 Fixed error in group view with father groups without user read permissions. Ticket#3395 2016-02-18 15:04:59 +01:00
Arturo Gonzalez a2d7f6bbf4 New map in progress... (Added a tooltipster js) 2016-02-18 11:21:26 +01:00
mdtrooper 8e7103e097 Merge branch 'feature/new_networkmap' of https://github.com/pandorafms/pandorafms into feature/new_networkmap 2016-02-18 11:07:13 +01:00
Arturo Gonzalez 42e962c5ed New maps in progress. Added tooltip plugin to test. 2016-02-18 10:51:33 +01:00
Arturo Gonzalez db66113fb1 Fixed group view with strict user. Ticket#3391 2016-02-18 09:20:14 +01:00
Hirofumi Kosaka 1ca151fa03 Fixed get_plugins API that had returned values in wrong order if updated from ver 4.x. 2016-02-18 16:58:01 +09:00
artica bdaf4689eb Auto-updated build strings. 2016-02-18 00:01:17 +01:00
mdtrooper 6dbf6e18f2 Working in the new networkmap. 2016-02-17 18:31:46 +01:00
mdtrooper fb3b4d8a6f Some fixes, thanks Arturo. 2016-02-17 15:36:44 +01:00
Arturo Gonzalez a3a38c9bb6 New login method (saml). Ticket#3393 2016-02-17 13:05:22 +01:00
mdtrooper c5f6259fce Working in the new networkmaps. 2016-02-17 12:25:03 +01:00
artica d912f033c8 Auto-updated build strings. 2016-02-17 00:01:12 +01:00
Arturo Gonzalez dc051c0c09 Thanks god for strict acl. Ticket#3391 2016-02-16 18:06:46 +01:00
Arturo Gonzalez daae8b9088 Fixed problem in tree view with parent nodes and permissions. Ticket#3388 2016-02-16 16:21:21 +01:00
artica 13d5c5f00c Auto-updated build strings. 2016-02-16 00:01:13 +01:00
mdtrooper 69774bc4e2 Some changes to upload 2016-02-15 12:15:16 +01:00
artica f92b92a9d1 Auto-updated build strings. 2016-02-15 00:01:10 +01:00
artica e1e77f1a1b Auto-updated build strings. 2016-02-14 00:01:13 +01:00
artica 5c270c4d69 Auto-updated build strings. 2016-02-13 00:01:17 +01:00
mdtrooper 9d2c2049cf Some debug traces for the jobmate for the next monday. 2016-02-12 17:22:44 +01:00
mdtrooper 37b0e972b3 Working in the actual filters with the old generation method. 2016-02-12 16:28:07 +01:00
mdtrooper f3a161743d Fixed the migration code for the actual filters. 2016-02-12 14:19:31 +01:00
artica 766964be4a Auto-updated build strings. 2016-02-12 00:01:20 +01:00
Arturo Gonzalez 625b4044e0 New maps in progress... (provisional dialog arrows) 2016-02-11 11:28:53 +01:00
Arturo Gonzalez 38f105f041 New maps in progress... (provisional arrows to nodes dialogs) 2016-02-11 10:53:33 +01:00
artica 7e1ea38a40 Auto-updated build strings. 2016-02-11 00:01:18 +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 211f2d0832 Merge branch 'feature/new_networkmap' of https://github.com/pandorafms/pandorafms into feature/new_networkmap 
Conflicts:
	pandora_console/include/javascript/map/MapController.js
 2016-02-10 14:02:43 +01:00
mdtrooper df25018631 Working in the code of new networkmap. 2016-02-10 14:01:10 +01:00
Arturo Gonzalez ce1779d2ff New maps in progress... (node dialog) 2016-02-10 13:49:31 +01:00
Arturo Gonzalez 717b91d9bf New maps in progress... (Added nodes to testing) 2016-02-10 10:14:53 +01:00
Arturo Gonzalez 3867dc11c7 New maps in progress... (dialog position when clicks a node) 2016-02-10 10:06:19 +01:00
artica d22ee75008 Auto-updated build strings. 2016-02-10 00:01:13 +01:00
mdtrooper 64e3488ea5 Added pair of nodes in the testing map. 2016-02-09 16:54:33 +01:00
Arturo Gonzalez ef1d7e22bc New maps in progress... (pop-up window to nodes) 2016-02-09 16:33:36 +01:00
mdtrooper 4c894fd04a Fixed the young javascript code. 2016-02-09 16:18:05 +01:00
mdtrooper 1d6b9dfc19 Working in the new networkmap. 2016-02-09 13:52:03 +01:00
mdtrooper 230e4071b3 Fixed the lost javascript include 2016-02-09 11:03:34 +01:00
m-lopez-f 2ff36cc245 Add lost variable in funtion 2016-02-09 10:22:40 +01:00
m-lopez-f 3315b732f8 Fixed problems with create syntethic module with API. 2016-02-09 10:20:42 +01:00
artica 79f0001249 Auto-updated build strings. 2016-02-09 00:01:15 +01:00
Arturo Gonzalez 372dd1db1f New maps in progress... (js) 2016-02-08 17:03:43 +01:00
mdtrooper fe863f61df Working in the code of new networkmaps. 2016-02-08 13:47:46 +01:00
artica 8ce0298ae1 Auto-updated build strings. 2016-02-08 00:01:11 +01:00
artica 4b96c68af6 Auto-updated build strings. 2016-02-07 00:01:10 +01:00
artica dc741b66ad Auto-updated build strings. 2016-02-06 00:01:12 +01:00
mdtrooper 87b07ee5ef Working the javascript objects for the new maps. 2016-02-05 16:16:41 +01:00
mdtrooper 9307a6e77e Starting with the javascript objects for the new maps. 2016-02-05 15:53:59 +01:00
Arturo Gonzalez be166593cb Fixed sql error when searchs in empty father groups. Ticket#3347 2016-02-05 12:31:20 +01:00
mdtrooper 35159cf1ac Remove a proof concept files. Thanks Arturo for the work. 2016-02-05 12:06:42 +01:00
fermin831 55140d06dd Fixed cron updating problem TICKETS #3329 
In addition, linux agent send crontab token and in data modules, cron
information is displayed grayed
 2016-02-05 09:56:37 +01:00
Arturo Gonzalez 7a862cacc4 Fixed problems with acl strict in group view. Ticket#3347 2016-02-05 09:25:05 +01:00
artica 48363c73d8 Auto-updated build strings. 2016-02-05 00:01:15 +01:00
Arturo Gonzalez 83675ed4c6 New maps in progress... (interface implementation) 2016-02-04 17:40:17 +01:00
mdtrooper ca19d447cb Working in the new features. 2016-02-04 16:59:40 +01:00
Arturo Gonzalez 2c7f0c423c Added map files 2016-02-04 13:11:14 +01:00
Arturo Gonzalez 26887a004d Changed version of d3 library 2016-02-04 13:09:40 +01:00
mdtrooper f90ed7a05b Starting the useful classes for the new networkmaps. 2016-02-04 12:06:45 +01:00
mdtrooper c5baf3670b Add the first version of new map viewer. 2016-02-04 11:45:17 +01:00
mdtrooper 3d704e7932 Working in the networkmap. 2016-02-04 10:43:01 +01:00
Arturo Gonzalez d27765a96a New maps in progress... (copy all items when duplicates a map) 2016-02-04 10:31:37 +01:00
Arturo Gonzalez edd6a99ebb New maps in progress... (generation y visualization mode) 2016-02-04 09:22:13 +01:00
artica 097ce88d08 Auto-updated build strings. 2016-02-04 00:01:15 +01:00
fermin831 2f848cabc3 Solved Oracle escaping inteerval problems in agent view. 2016-02-03 14:11:50 +01:00
mdtrooper f0afd427bb Working in the new networkmap, the view and d3 2016-02-03 11:40:08 +01:00
Arturo Gonzalez f4691f523f Fixed duplicate map 2016-02-03 09:20:31 +01:00
artica 5ef13d3fd1 Auto-updated build strings. 2016-02-03 00:01:17 +01:00
Arturo Gonzalez d65ab71600 New maps in progress... (Creation, edit and list mode) 2016-02-02 16:58:39 +01:00
mdtrooper 4fa47fc11c Fixed the importation types of networkmap. 2016-02-02 15:49:22 +01:00
Arturo Gonzalez a24670d961 New maps in progress... (List, create and edit mode) 2016-02-02 15:36:31 +01:00
mdtrooper 8d54a6762a Added the 'automatic custom graphs' in the template reports in metaconsole. 2016-02-02 14:55:03 +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
artica b689f05ec3 Auto-updated build strings. 2016-02-02 00:01:51 +01:00
m-lopez-f f8753c2545 Fixed again count status module in Group view. Tiquet: #3289 2016-02-01 16:10:34 +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
mdtrooper 2f75655ee3 Working in the migration. 2016-02-01 12:55:35 +01:00
m-lopez-f 9227636655 Fixed problems with count agents and modules in group view. Tiquets: #3289, #3297 
(cherry picked from commit 64dd3e99ad)
 2016-02-01 11:36:58 +01:00
m-lopez-f f766bef9bb Fixed problems with strict users. Tiquet: #3308 2016-02-01 10:13:50 +01:00
artica 94af41f00c Auto-updated build strings. 2016-02-01 00:01:11 +01:00
artica a1826119a6 Auto-updated build strings. 2016-01-31 00:01:12 +01:00
artica 962c53d67f Auto-updated build strings. 2016-01-30 00:01:14 +01:00
Arturo Gonzalez afa06d2715 Fixed bug in tree when shows modules with tag configuration. Ticket#3307 2016-01-29 14:48:41 +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 38aa928c00 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2016-01-29 13:53:14 +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
Arturo Gonzalez 1c44ee0e90 Fixed extra time in Tree View 2016-01-29 11:50:16 +01:00
artica 90a32a11f1 Auto-updated build strings. 2016-01-29 00:01:13 +01:00
Arturo Gonzalez 4444433834 Fixed total count in group_view(meta). Ticket#3295 2016-01-28 14:50:16 +01:00
Arturo Gonzalez 10980a8106 Fixed minor bug with Tree view. 2016-01-28 14:38:23 +01:00
m-lopez-f 1c374acc3f Change refr in visual console. Tiquet: #3277 2016-01-28 11:57:32 +01:00
Arturo Gonzalez 0984a06f25 Fixed agents count in tree view. Ticket#3248 2016-01-28 11:09:09 +01:00
m-lopez-f a837e110d0 Fixed bulk deleted action alerts. Tiquet: #3268 
(cherry picked from commit aac2460c85)
 2016-01-28 09:46:06 +01:00
artica ab33459d52 Auto-updated build strings. 2016-01-28 00:01:20 +01:00