20 Commits

Author SHA1 Message Date
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
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
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