tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-08-18 08:18:49 +02:00
Code Issues Packages Projects Releases Wiki Activity
38,458 Commits 34 Branches 30 Tags
Commit Graph

2176 Commits

Author SHA1 Message Date
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
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
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
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
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
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
mdtrooper
1d936ad230 First version of scroll and pan of new networkmap but it is buggy. 2016-02-18 16:51:03 +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
mdtrooper
6dbf6e18f2 Working in the new networkmap. 2016-02-17 18:31:46 +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
mdtrooper
9376e9aa6d Merge branch 'develop' into feature/new_networkmap 2016-02-10 14:54: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
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
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
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