Commit Graph

827 Commits

Author SHA1 Message Date
m-lopez-f ac6c5ca06e Fixed problems with clippy styles
(cherry picked from commit e314332320)
2016-06-27 13:08:46 +02:00
Alejandro Gallardo Escobar 49d243b487 Fixed the error which prevented the opening of the QR dialog on the public console section
(cherry picked from commit 4cd2e7750b)
2016-06-09 17:01:22 +02:00
Alejandro Gallardo Escobar 4b4c3f5c6a Fix to print the user lines into the visual maps. Ticket #3746
(cherry picked from commit caac294f6e)
2016-06-02 15:16:09 +02:00
fermin831 10fb47d2fd Enlarged the text on plugins fields Tickets #3739 2016-05-31 15:32:47 +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
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
mdtrooper cc67922d5c Fixes in the interface text in the arrows. 2016-05-17 15:42:00 +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
mdtrooper cdc14c2582 Working in the refresh holding area. 2016-05-17 12:22:15 +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 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
mdtrooper f16a6a812e Working in the fixes of A-M-M-A arrows. 2016-05-13 16:04:32 +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 aedce995ab Starting to fixed the arrows with interfaces. 2016-05-11 12:05:40 +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 1a3b977224 Show a tooltip to help when there is a relationship action. 2016-05-10 12:48:55 +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
mdtrooper 08d1cece5c Some fixes. 2016-05-09 09:51:20 +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 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
mdtrooper 0690e303e9 Some fixes for two or more networkmaps in enterprise dashboard 2016-05-03 17:26:30 +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 c335394a7b New maps in progress... (Fixed error in delete node) 2016-04-25 15:09:51 +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 0f4dfa5d1d Working in the ajax calls for the enterprise code. 2016-04-21 13:12:19 +02:00
mdtrooper e7f53d2f79 Working in the ajax actions. 2016-04-20 17:28:49 +02:00
Arturo Gonzalez 4b6d917bb4 New maps in progress... (Added arrows GMA, GMM, AG, GG and PA arrows [modulegroup-agent, groupmodule-module, agent-group, group-group, policy-agent] 2016-04-20 11:41:59 +02:00
Arturo Gonzalez cd64345368 New maps in progress... (Added policies and groups tooltips) 2016-04-20 10:48:06 +02:00
Arturo Gonzalez b3dbcdad17 New maps in progress... (Added drag, delete and select functions to policie and group node) 2016-04-20 09:16:16 +02:00
Arturo Gonzalez 2831607723 New maps in progress... (Fixed fake arrows and non necessary tooltips) 2016-04-18 13:40:44 +02:00
Arturo Gonzalez 3cae98989c New maps in progress... (Fixed node select when "show modules" and "show module groups" are enable) 2016-04-18 10:50:36 +02:00
Arturo Gonzalez bc0cd7f570 New maps in progress... (Fixed "delete modules" and "delete modulegroups" when "show modules" and "show module groups" are enable 2016-04-18 10:45:34 +02:00
Arturo Gonzalez 89c2d16159 New maps in progress... (Added thigs to arrows code) 2016-04-18 09:35:49 +02:00
Arturo Gonzalez f312f6d416 New maps in progress... (Added AM arrows when "show modules" is enable and "show module groups" is disable 2016-04-18 09:31:33 +02:00
Arturo Gonzalez 3d61418519 New maps in progress... (Fixed status in module nodes when "show modules" is disabled) 2016-04-15 12:17:18 +02:00
mdtrooper 4c04e19cf8 Fixed the minimap when there is nothing nodes. 2016-04-14 15:21:06 +02:00
Arturo Gonzalez eea071486c New maps in progress... (Added AG and GM arrows) 2016-04-14 12:51:30 +02:00
Arturo Gonzalez 9524521d5d New maps in progress... (Added arrwos AG) 2016-04-14 11:57:40 +02:00
Arturo Gonzalez a2b5491a27 New maps in progress... (Added groupmodule-module arrows and agent-modulegroup arrows) 2016-04-14 09:55:24 +02:00
Arturo Gonzalez 10a08b9a17 New maps in progress... (Added Agent-module arrow and agent-modulegroup arrow) 2016-04-14 09:52:22 +02:00
Arturo Gonzalez 7a35b6412e New maps in progress... (fixed "move modulegroups") 2016-04-14 09:34:05 +02:00
Arturo Gonzalez 008d243f85 New maps in progress... (Fixed module dragg and show) 2016-04-13 13:11:52 +02:00
mdtrooper 74805b0862 Fixed the painting other shapes instead the circle. 2016-04-11 16:18:46 +02:00
mdtrooper 0142f609df Working in the update nodes action. 2016-04-11 16:08:06 +02:00
Arturo Gonzalez 2e30bb183f New maps in progress... (Fixed error in node enterfaces text) 2016-04-11 13:50:01 +02:00
Arturo Gonzalez c409b3d4ea New maps in progress... (Fixed error in node interface text) 2016-04-11 13:08:42 +02:00
Arturo Gonzalez 6d8daae60c New maps in progress... (document the code) 2016-04-08 14:26:42 +02:00
mdtrooper 7550cafbbc Some changes in the edition of nodes. 2016-04-08 14:04:58 +02:00
mdtrooper ce7ef13440 Added click event into the minimap. 2016-04-08 13:04:09 +02:00
Arturo Gonzalez df75eb1b98 New maps in progress... (Arrows order implemented) 2016-04-08 11:55:09 +02:00
mdtrooper 611b91eade Fixed the relationship of arrows in networkmaps. 2016-04-08 10:32:30 +02:00
mdtrooper 2f122f89a7 Some fixes in the creation relationships. 2016-04-08 10:03:05 +02:00
mdtrooper bf59e5b17b Fixed the deletion arrows in networkmap. 2016-04-07 16:36:45 +02:00
mdtrooper 479e67dfa4 Working in the arrows. 2016-04-07 16:05:42 +02:00
mdtrooper ff598940e1 Some work in the networkmap. 2016-04-07 15:14:29 +02:00
mdtrooper 3b85e3c80f Fixed somethings in the arrows. 2016-04-07 14:20:27 +02:00
mdtrooper 1edc4674e2 Fixed the optimized arrows drag and drop. 2016-04-07 12:41:05 +02:00
Arturo Gonzalez 09f156cd8c New maps in progress... (Edit node in progress) 2016-04-07 12:24:24 +02:00
mdtrooper e289699c48 Some changes for working with hudge maps. 2016-04-07 12:07:34 +02:00
mdtrooper d7e33527a2 Working in the arrow refresh 2016-04-06 17:16:48 +02:00
mdtrooper dff1b8593c Working in the arrows. 2016-04-06 13:30:24 +02:00
mdtrooper fafe3b4eae Working in the arrows. 2016-04-06 13:11:00 +02:00
mdtrooper f7deed5508 Uploaded lost changes. 2016-04-06 13:00:11 +02:00
mdtrooper 8a6d1509f0 Working in the update nodes. 2016-04-06 12:53:43 +02:00
mdtrooper e4a2c3c7fb Working in the update status of nodes. 2016-04-06 12:23:17 +02:00
Arturo Gonzalez 725a4925a7 New maps in progress... (Fixed error in nodes dialog) 2016-04-06 10:17:11 +02:00
mdtrooper 6b60d36094 Improve the colors. 2016-04-05 14:38:22 +02:00
mdtrooper 20a5b55977 Fixed the dragging. 2016-04-05 14:12:52 +02:00
mdtrooper 8bb0e5e194 Working in the networkmap nodes. 2016-04-05 13:19:02 +02:00
mdtrooper 7229b5ecd9 Working in the networkmap nodes. 2016-04-05 12:36:01 +02:00
mdtrooper e6fbb6d41d Starting to set the aspect to networkmap node. 2016-04-04 20:21:36 +02:00
mdtrooper fdfc46d827 Finish add fictional point. 2016-04-04 17:52:26 +02:00
mdtrooper 304928b2ec Working in the events for the fictional nodes. 2016-04-04 13:58:54 +02:00
mdtrooper a2cbc4d867 Organize the code. 2016-04-04 13:53:37 +02:00
mdtrooper 989cc2cc92 Fixed the unused param in the method init_events. 2016-04-04 13:45:13 +02:00
mdtrooper b9000bb285 Starting with the fictional point. 2016-04-04 13:43:05 +02:00
mdtrooper 48ac039334 Fixed the delete nodes. 2016-04-01 13:36:24 +02:00
mdtrooper 094c3d5cdb Fixed somethings in the selection box. 2016-04-01 12:52:46 +02:00
mdtrooper 408a68e6ab Fixed somethings in the selection box. 2016-04-01 12:21:40 +02:00
mdtrooper 651b405c42 Fixed somethings in the selection box. 2016-04-01 11:54:31 +02:00
mdtrooper 496313b2ec Merge branch 'feature/new_networkmap' of https://github.com/pandorafms/pandorafms into feature/new_networkmap 2016-04-01 11:36:45 +02:00
mdtrooper a879803322 Finish the relationship. 2016-04-01 11:36:22 +02:00
Arturo Gonzalez 6e6317cb8d New maps in progress... (Fixed returned data in a node status function) 2016-03-31 16:48:30 +02:00
mdtrooper ed3cb1b50c Working in the relationships. 2016-03-31 15:08:44 +02:00
mdtrooper 17dee83d57 Working in the relationships. 2016-03-31 12:35:10 +02:00
mdtrooper 415589ec95 Added several delete nodes. 2016-03-30 16:12:35 +02:00
mdtrooper 7d66ba2dde Working in the context menu and several nodes selected. 2016-03-30 15:49:17 +02:00
Arturo Gonzalez 3e399356d3 New maps in progress... (Fixed "delete arrows" with new data) 2016-03-30 12:45:47 +02:00
Arturo Gonzalez 07928af596 New maps in progress... (Document the code) 2016-03-30 10:38:41 +02:00
mdtrooper 090563a119 Working in the selected nodes and dragging. 2016-03-29 13:33:50 +02:00
mdtrooper ae53eea7ab Working in the selected nodes and dragging. 2016-03-29 13:26:55 +02:00
mdtrooper 86b084b2e4 Working in the selected nodes and zoom. 2016-03-29 12:35:49 +02:00
Arturo Gonzalez b10e11d2a9 New maps in progress... (AMA arrows) 2016-03-29 12:09:26 +02:00
mdtrooper 1ec80e5a71 Working in the select nodes. 2016-03-29 11:59:11 +02:00
mdtrooper b9d22ec356 Working in the select nodes. 2016-03-29 11:04:57 +02:00
Arturo Gonzalez 02c28e0148 New maps in progress... (Arrows type AMA = agent->module->agent) 2016-03-29 10:36:43 +02:00
mdtrooper 1b7c1efe4b Select box runs fine with any zoom level and or panning. 2016-03-29 09:30:20 +02:00
mdtrooper 44b7c30ac0 Some changes 2016-03-28 19:54:59 +02:00
mdtrooper 18902546c0 Some fixes in the reset zoom when the selection rectangle is running. 2016-03-28 19:42:21 +02:00
mdtrooper 2ae5eb6021 Another changes 2016-03-28 19:16:19 +02:00
mdtrooper 0d618e3dbd Some changes 2016-03-28 19:13:27 +02:00
mdtrooper f3f302eae2 Starting with the multiple selection. 2016-03-28 16:33:07 +02:00
mdtrooper f75348a387 Fixed the lost self vars. 2016-03-28 14:51:24 +02:00
mdtrooper 79d9467fdd Upload lost changes from the last week. 2016-03-28 14:49:13 +02:00
Arturo Gonzalez f0fafb27e9 New maps in progress... (Fixed error) 2016-03-28 12:04:55 +02:00
Arturo Gonzalez 38e7056df9 New maps in progress... (Init multiple selection) 2016-03-28 11:39:41 +02:00
mdtrooper e5b6cf40dc Fixed the bug in the re-rotate title intefaces into arrows. 2016-03-23 17:24:07 +01:00
mdtrooper c8a54582f8 Re rotate the title of interfaces into the arrows in some cases (it is buggy.) 2016-03-23 17:18:16 +01:00
mdtrooper ee431b369d Starting with the title of interfaces in the arrows. 2016-03-23 15:47:05 +01:00
mdtrooper 47501c8600 Working with the interfaces in the arrows 2016-03-23 14:49:22 +01:00
mdtrooper bb01f00e8a Fixed a position of interface in the arrow 2016-03-23 13:14:16 +01:00
mdtrooper 58a0f51f01 Working in the AMMA arrows. 2016-03-23 12:03:35 +01:00
mdtrooper 3d59f58453 Clean code. 2016-03-23 11:53:39 +01:00
mdtrooper c20f8ff465 Working in the drag and drop of arrows. 2016-03-23 11:35:21 +01:00
mdtrooper 37e99d9421 Working in the arrows. 2016-03-22 15:57:29 +01:00
mdtrooper 62a37ebbf8 Some changes 2016-03-22 14:39:56 +01:00
Arturo Gonzalez ddbc922fad New maps in progress... (Document the code) 2016-03-22 12:48:28 +01:00
Arturo Gonzalez 62f4c058f4 New maps in progress... (Fixed arrow status balls) 2016-03-22 12:36:48 +01:00
mdtrooper 848b8cf9a1 Added drag in the items of minimap. 2016-03-22 10:24:55 +01:00
mdtrooper 304d5b8cbc Fixed my last commit, sorry. 2016-03-22 09:56:19 +01:00
mdtrooper d017ace822 Merge branch 'feature/new_networkmap' of https://github.com/pandorafms/pandorafms into feature/new_networkmap
Conflicts:
	pandora_console/include/javascript/map/MapController.js
2016-03-22 09:51:24 +01:00
mdtrooper 6e0ddb5b18 Uploaded lost svg files from yesterday. 2016-03-22 09:48:44 +01:00
Arturo Gonzalez 2e26ac4bfc New maps in progress... (Fixed minimap relation) 2016-03-21 17:27:24 +01:00
mdtrooper 11c75259d3 Working in the paint arrows A-M-M-A 2016-03-21 17:03:14 +01:00
mdtrooper 800756b9ac Working in the arrows A-M-A 2016-03-21 15:34:33 +01:00
mdtrooper 92703f13c2 Some work in arrows. 2016-03-21 13:13:09 +01:00
mdtrooper 027a2977b6 Clean code. 2016-03-21 12:37:36 +01:00
mdtrooper 4bd2821c6b Some work in arrows. 2016-03-21 12:26:17 +01:00
mdtrooper 42ecb787cf Some work. 2016-03-21 10:25:41 +01:00
mdtrooper 4f4f8538a4 Some changes for arrows. 2016-03-18 16:58:50 +01:00
Arturo Gonzalez 3e313c8c43 New maps in progress... (Works in the fantastic arrows... thx mdtrooper) 2016-03-17 17:42:54 +01:00
mdtrooper 4678ef2d39 Clean code of the paint arrows. 2016-03-17 13:00:44 +01:00
mdtrooper 7fafc0e01e Working in the mass selection nodes with rectangle. 2016-03-17 12:39:28 +01:00
mdtrooper e8f6935fef Fixed the minimap. 2016-03-17 12:28:11 +01:00
mdtrooper 5cc89d968c Fixed the minimap. 2016-03-17 11:40:38 +01:00
Arturo Gonzalez 56cadb2037 New maps in progress... (Node details finished) 2016-03-17 10:44:43 +01:00
Arturo Gonzalez 9d2dff71e3 New maps in progress... (node details) 2016-03-17 10:31:18 +01:00
Arturo Gonzalez 12565ada17 New maps in progress... (Node detail) 2016-03-17 08:51:45 +01:00
mdtrooper 32d96a3099 Working in the minimap, paint nodes. 2016-03-16 15:59:44 +01:00
mdtrooper b69b20bedf Working in the minimap. 2016-03-16 15:34:54 +01:00
Arturo Gonzalez 5098f1a74f Revert "New maps in progress... (fixed resize error)"
This reverts commit 5fbf085fef.
2016-03-16 12:37:34 +01:00
Arturo Gonzalez 5fbf085fef New maps in progress... (fixed resize error) 2016-03-16 12:32:45 +01:00
Arturo Gonzalez e6d0982296 New maps in progress... (Fixed resize with negative numbers) 2016-03-16 12:10:14 +01:00
mdtrooper c21c710598 Start to code the minimap. 2016-03-15 17:05:37 +01:00
Arturo Gonzalez bd50ca25be New maps in progress... (Tooltips fixed) 2016-03-15 13:22:04 +01:00
Arturo Gonzalez dc171c45f2 New maps in progress... (Works in negative size when resize a element) 2016-03-15 10:08:57 +01:00
mdtrooper 3d52c3e842 Fixed the resizing element and arrows 2016-03-15 10:06:36 +01:00
mdtrooper 1a80e7c10c Fixed the drag a resized element 2016-03-15 09:49:49 +01:00
mdtrooper 0593e75476 Working in the minimap. 2016-03-15 09:46:15 +01:00
Arturo Gonzalez b87e5e6a87 New maps in progress... (document the code) 2016-03-15 08:50:57 +01:00
mdtrooper cb248b6a92 Some work in the resize 2016-03-14 14:26:19 +01:00
mdtrooper 1fc3b7497b Some work in the resize 2016-03-14 12:52:09 +01:00
mdtrooper 27e53d9576 Some work in the resize 2016-03-14 12:42:07 +01:00
mdtrooper 8f8a267e33 Some work in the resize 2016-03-14 12:35:33 +01:00
mdtrooper 21a1f1cc60 Some work in the resize 2016-03-14 11:32:00 +01:00
mdtrooper 2359b955db Working in the resize action. 2016-03-11 13:14:59 +01:00
mdtrooper fd0995af96 Working in the resize action. 2016-03-11 12:44:52 +01:00
Arturo Gonzalez 95b13bf3aa New maps in progress... (map editor dialog version 1.0) 2016-03-10 16:12:54 +01:00
Arturo Gonzalez 1a792c4d42 New maps in progress... (edit node dialog() 2016-03-10 14:54:31 +01:00
mdtrooper 9befc1c65e Uploaded some code about resize action 2016-03-10 12:42:25 +01:00
Arturo Gonzalez 9ceb3c15e4 New maps in progress... (Preliminar edit node table) 2016-03-10 11:06:52 +01:00
Arturo Gonzalez 1330fd5a5f New maps in progress... (Changed jquery each to javascript native each and more fixes) 2016-03-09 13:17:27 +01:00
Arturo Gonzalez ed3b3e7094 New maps in progress... (Delete node added!!) 2016-03-09 12:32:58 +01:00
mdtrooper d9c813969c Working in the selection. 2016-03-09 11:11:14 +01:00
mdtrooper 2a833fbc73 https://bugzilla.mozilla.org/show_bug.cgi?id=1254159 2016-03-09 11:07:30 +01:00
Arturo Gonzalez 73b16c177e New maps in progress... (test context menus) 2016-03-08 17:09:40 +01:00
Arturo Gonzalez 39a9ef4c28 New maps in progress... (contextual menus) 2016-03-08 17:04:09 +01:00
Arturo Gonzalez 92afe7614d New maps in progress... (Node context menu tests) 2016-03-08 15:40:11 +01:00
mdtrooper 1b60dbb7ad https://bugzilla.mozilla.org/show_bug.cgi?id=1254159 2016-03-08 15:37:20 +01:00
Arturo Gonzalez fd34c4198c New maps in progress (document the js file) 2016-03-08 13:21:53 +01:00
Arturo Gonzalez c990dac63b New maps in progress... (click control) 2016-03-08 13:02:51 +01:00
mdtrooper 3f6e8d15fb Fixed some things in the arrows. 2016-03-07 15:22:43 +01:00
mdtrooper b6aba10c9b Fixed some things in the arrows. 2016-03-07 14:51:58 +01:00
Arturo Gonzalez ab1d7f99fc New maps in progress... (Fixing arrow position) 2016-03-07 11:05:31 +01:00
Arturo Gonzalez c75929d840 New maps in progress... (Fixing arrow position) 2016-03-07 10:48:03 +01:00
Arturo Gonzalez b3e015740e New maps in progress... (Fixing arrow position) 2016-03-07 09:47:35 +01:00
mdtrooper 843d398c0b Fixed the arrow code. 2016-03-04 17:04:19 +01:00
mdtrooper aa8ce714d8 Fixed the cached svgs. 2016-03-04 15:20:27 +01:00
Arturo Gonzalez 5be789038e New maps in progress... (Fixed arrow body position) 2016-03-04 10:41:21 +01:00
mdtrooper ba17caf0ec Some fixes in the arrows. 2016-03-03 15:38:15 +01:00
mdtrooper c6f65455e7 Some fixes in the arrows. 2016-03-03 15:08:05 +01:00
mdtrooper ad134b7161 The first version of arrows but it is buggy. 2016-03-02 15:44:01 +01:00
mdtrooper 834d3c3e5b Some work in the new networkmaps 2016-03-01 16:37:10 +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 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