Commit Graph

11577 Commits

Author SHA1 Message Date
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 5ffc2cfa37 Merge branch 'feature/new_networkmap' of https://github.com/pandorafms/pandorafms into feature/new_networkmap
Conflicts:
	pandora_console/include/javascript/map/MapController.js
	pandora_console/include/javascript/map/NetworkmapController.js
2016-03-21 10:28:41 +01:00
mdtrooper 42ecb787cf Some work. 2016-03-21 10:25:41 +01:00
Arturo Gonzalez 2e04732f75 New maps in progress... (Document the code) 2016-03-21 08:53:52 +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 2d310a7163 Changed Time to in working time to 00:00:00 TICKETS #3480 2016-03-17 15:52:35 +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
mdtrooper f0d4ae7a9c Upload lost files 2016-03-17 10:47:02 +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
fermin831 744b60cbd1 Solved config token homedir_filetransfer duplication TICKETS #3475 2016-03-16 18:49:17 +01:00
mdtrooper 32d96a3099 Working in the minimap, paint nodes. 2016-03-16 15:59:44 +01:00
fermin831 b0ac5b78d8 Split a delete query to avoid deadlocks TICKETS #3446 2016-03-16 15:59:37 +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
Axel 983b515e35 Update README.md
Fixed README.md to Slack
2016-03-15 17:13:40 +01:00
Axel 4cf983d24b Update README.md
Modified the description
2016-03-15 17:11:39 +01:00
Vanessa Gil d20bd1f007 Updated chat options. 2016-03-15 17:09:27 +01:00
mdtrooper c21c710598 Start to code the minimap. 2016-03-15 17:05:37 +01:00
Vanessa Gil d265cca3bd Add chat options. 2016-03-15 16:47:40 +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