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 |
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 |
|
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 |
|
mdtrooper
|
aa8ce714d8
|
Fixed the cached svgs.
|
2016-03-04 15:20:27 +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 |
|
Arturo Gonzalez
|
437d7b539f
|
Fixed error in tree view (meta and strict user with tags). Ticket3437
|
2016-03-02 15:25:40 +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 |
|
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 |
|
Arturo Gonzalez
|
fcc42ce5a3
|
New maps in progress... (new ajax and class files for nodes)
|
2016-02-24 10:00:01 +01:00 |
|
mdtrooper
|
5f7eee5bc8
|
Fixed the zoom controller, thanks to R.Novoa
|
2016-02-23 16:48: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 |
|
mdtrooper
|
d12eb3f8ea
|
Add tiny improvement
|
2016-02-22 13:18:54 +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
|
400620a11f
|
New maps in progress... (tooltipster css files added)
|
2016-02-22 11:48:42 +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 |
|
mdtrooper
|
5659589e01
|
Fixed the bug in the generation nodes.
|
2016-02-18 16:49:11 +01:00 |
|
Arturo Gonzalez
|
b20828c85d
|
New maps in progress... (Added css reference to TOOLTIPSTER!)
|
2016-02-18 15:33:24 +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 |
|
mdtrooper
|
fb3b4d8a6f
|
Some fixes, thanks Arturo.
|
2016-02-17 15:36:44 +01:00 |
|
mdtrooper
|
c5f6259fce
|
Working in the new networkmaps.
|
2016-02-17 12:25:03 +01:00 |
|
Arturo Gonzalez
|
dc051c0c09
|
Thanks god for strict acl. Ticket#3391
|
2016-02-16 18:06:46 +01:00 |
|
Arturo Gonzalez
|
daae8b9088
|
Fixed problem in tree view with parent nodes and permissions. Ticket#3388
|
2016-02-16 16:21:21 +01:00 |
|
mdtrooper
|
69774bc4e2
|
Some changes to upload
|
2016-02-15 12:15:16 +01:00 |
|
mdtrooper
|
9d2c2049cf
|
Some debug traces for the jobmate for the next monday.
|
2016-02-12 17:22:44 +01:00 |
|
mdtrooper
|
37b0e972b3
|
Working in the actual filters with the old generation method.
|
2016-02-12 16:28:07 +01:00 |
|
mdtrooper
|
9376e9aa6d
|
Merge branch 'develop' into feature/new_networkmap
|
2016-02-10 14:54:08 +01:00 |
|
Arturo Gonzalez
|
5a908d8c02
|
New maps in progress... (Added fields to creation)
|
2016-02-10 14:17:08 +01:00 |
|
mdtrooper
|
df25018631
|
Working in the code of new networkmap.
|
2016-02-10 14:01:10 +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 |
|
mdtrooper
|
230e4071b3
|
Fixed the lost javascript include
|
2016-02-09 11:03:34 +01:00 |
|
mdtrooper
|
fe863f61df
|
Working in the code of new networkmaps.
|
2016-02-08 13:47:46 +01:00 |