Commit Graph

5499 Commits

Author SHA1 Message Date
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
artica 72116628c9 Auto-updated build strings. 2016-03-23 00:01:14 +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
Hirofumi Kosaka 4efc510e6c Fixed a bug that custom "interval values" had not been used as default
module interval (you can add custom ones at 'visual styles' configuration).
2016-03-22 13:26:52 +09:00
artica 2b583ae7fc Auto-updated build strings. 2016-03-22 00:01:24 +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
artica 0482b830a3 Auto-updated build strings. 2016-03-21 00:01:11 +01:00
artica dd2a89e22b Auto-updated build strings. 2016-03-20 00:01:12 +01:00
artica eb0e33e3d0 Auto-updated build strings. 2016-03-19 00:01:31 +01:00
mdtrooper 4f4f8538a4 Some changes for arrows. 2016-03-18 16:58:50 +01:00
mdtrooper 135ae1dd16 Mixed the networkmap level 2 and level 3 2016-03-18 16:19:33 +01:00
Arturo Gonzalez 3a4f0ef9cd New maps in progress... (Fixed error) 2016-03-18 08:57:52 +01:00
Arturo Gonzalez 527c7d0edc New maps in progress... (networkmap arrows use system) 2016-03-18 08:50:12 +01:00
artica 211df32f7b Auto-updated build strings. 2016-03-18 00:01:21 +01:00
Arturo Gonzalez 3e313c8c43 New maps in progress... (Works in the fantastic arrows... thx mdtrooper) 2016-03-17 17:42:54 +01:00
fermin831 278255ff51 Solved a SLA problem on no-init modules TICKETS #3479 2016-03-17 14:25:01 +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
Arturo Gonzalez 894bbd2c9e New maps in progress... (mdtrooper i love you <3) 2016-03-17 11:44:07 +01:00
mdtrooper 5cc89d968c Fixed the minimap. 2016-03-17 11:40:38 +01:00
fermin831 ec21d8a6d3 Changed Poling time to Time available in Availability reports TICKETS #3285 2016-03-17 10:59:17 +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
artica bd30f23487 Auto-updated build strings. 2016-03-17 00:01:21 +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
artica 9d2b97dca0 Auto-updated build strings. 2016-03-16 00:01:26 +01:00
mdtrooper c21c710598 Start to code the minimap. 2016-03-15 17:05:37 +01:00
fermin831 f397b657f1 Added new server_keepalive column to have individual keepalive TICKETS #3273 2016-03-15 16:02:27 +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
m-lopez-f 368a96222e Fixed problems with dashboard performance when include users maps. Tiquet: #3438
(cherry picked from commit e3e549cbe8)
2016-03-15 09:26:24 +01:00
Arturo Gonzalez b87e5e6a87 New maps in progress... (document the code) 2016-03-15 08:50:57 +01:00
artica e1783604a6 Auto-updated build strings. 2016-03-15 00:01:20 +01:00
fermin831 5cf268e986 Fixed some fails in SLA operation due to Working time improvement #3470 2016-03-14 15:53:43 +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
fermin831 1aed97cbd4 Removed unwanted trace 2016-03-14 12:03:45 +01:00
mdtrooper 21a1f1cc60 Some work in the resize 2016-03-14 11:32:00 +01:00
fermin831 38e7a4277f Modified SLA to work only in working time properly. TICKETS #3370
Graphs are modified to show without having consideration of working time
2016-03-14 10:57:03 +01:00
artica 9a22c0ed2a Auto-updated build strings. 2016-03-14 00:01:13 +01:00
artica 178629ad3e Auto-updated build strings. 2016-03-13 00:01:13 +01:00
artica 1e967cb5ae Auto-updated build strings. 2016-03-12 00:01:23 +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
artica 50e3f6bebe Auto-updated build strings. 2016-03-11 00:01:26 +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 a1de142e98 New maps in progress... (Edit node dialog, 1.0 version) 2016-03-10 15:22:56 +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
m-lopez-f 2502c26077 Fixed error in php with acl enterprise. Tiquet: #3457 2016-03-10 10:47:02 +01:00
artica 663afaeae3 Auto-updated build strings. 2016-03-10 00:01:27 +01:00
m-lopez-f 4af3b2b1aa Fixed problems with order data in custom graphs
(cherry picked from commit 093d9ad313)
2016-03-09 16:01:20 +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 9ee921f9c1 Move the styles to the pandora.css 2016-03-09 11:45:48 +01:00
mdtrooper aefff3041f Merge branch 'develop' into feature/new_networkmap
Conflicts:
	pandora_console/include/constants.php
2016-03-09 11:15:17 +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
artica 7acc42500a Auto-updated build strings. 2016-03-09 00:01:24 +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
artica ee9d6c75fe Auto-updated build strings. 2016-03-08 00:01:22 +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 2063d975f0 Fixed problem with strict acl and group view. 2016-03-07 13:56:59 +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
artica fda3be4831 Auto-updated build strings. 2016-03-07 00:01:17 +01:00
artica df4c57d610 Auto-updated build strings. 2016-03-06 00:01:13 +01:00
artica ada95bfff9 Auto-updated build strings. 2016-03-05 00:01:20 +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
artica e1d69a5af8 Auto-updated build strings. 2016-03-04 00:01:28 +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
fbsanchez ee35f9aa35 Erased Projection for text from graphs 2016-03-03 13:28:51 +01:00
m-lopez-f afdf047bcd Fixed problems with resize dashboard when containt map by user. Tiquet: #3373 2016-03-03 13:15:43 +01:00
m-lopez-f a33c69d5cf Fixed problems with custom graphs. Ticket: #3413 2016-03-03 10:18:20 +01:00
Arturo Gonzalez a82966af5a Fixed problems with strict acl in tactical view. Ticket#3440 2016-03-03 09:33:54 +01:00
artica e4e4d1c2c9 Auto-updated build strings. 2016-03-03 00:01:23 +01:00
mdtrooper ad134b7161 The first version of arrows but it is buggy. 2016-03-02 15:44:01 +01:00
Arturo Gonzalez 437d7b539f Fixed error in tree view (meta and strict user with tags). Ticket3437 2016-03-02 15:25:40 +01:00
artica d0aaaff782 Auto-updated build strings. 2016-03-02 00:01:24 +01:00
mdtrooper 834d3c3e5b Some work in the new networkmaps 2016-03-01 16:37:10 +01:00
Arturo Gonzalez 68b8570db0 Fixed problem with strict acl 2016-03-01 15:49:29 +01:00
Arturo Gonzalez 2479852e39 Fixed php error in tactical view when user hace strict acl. Ticket#3411 2016-03-01 13:48:03 +01:00
Arturo Gonzalez fe18999778 Changed data in saml login 2016-03-01 11:55:18 +01:00
artica 4c642d007d Auto-updated build strings. 2016-03-01 00:01:22 +01:00
artica 1277eb494a Auto-updated build strings. 2016-02-29 00:01:13 +01:00
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