Commit Graph

11513 Commits

Author SHA1 Message Date
Arturo Gonzalez 437d7b539f Fixed error in tree view (meta and strict user with tags). Ticket3437 2016-03-02 15:25:40 +01:00
mdtrooper c4dc71e4f7 Some changes for the async javascript for several arrows 2016-03-02 14:30:52 +01:00
artica d0aaaff782 Auto-updated build strings. 2016-03-02 00:01:24 +01:00
fermin831 5dcb313522 Cron bug and crontab and alert template is sended in win32 TICKETS #3355 2016-03-01 19:13:40 +01:00
Arturo Gonzalez b206f2a5d3 Added a second pair of cats to test with two arrows. 2016-03-01 17:09:38 +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
fermin831 d3260a8c2b Solved open ACL reports problems 2016-03-01 10:17:21 +01:00
Arturo Gonzalez 5f7d65eba1 New maps in progress... (document arrows code) 2016-03-01 09:45:13 +01:00
artica 4c642d007d Auto-updated build strings. 2016-03-01 00:01:22 +01:00
mdtrooper b741209002 The arrow in parts. 2016-02-29 16:12:17 +01:00
mdtrooper 84f50f291c The arrow in parts. 2016-02-29 15:41:22 +01:00
mdtrooper 6590a64929 Some work in the example file cats.html 2016-02-29 15:14:25 +01:00
mdtrooper 2da646006f I love the cats with potatoes and carrots. 2016-02-29 09:23:43 +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
KIKUCHI Koichiro b794f69327 Fixed %preun script fails when pandora_server or tentalce_server not running 2016-02-26 23:51:00 +09:00
KIKUCHI Koichiro 1a084c1b38 Fixed package dependencies.
- Requires perl(HTML::Entities).
 - Remove perl-Socket6 dependency, not directly used in Pandroa FMS.
   (It's required by and installed as dependency of perl-IO-Socket-INET6 )
 - Requires perl(Sys::Syslog) instead of using 'weak dependency' of perl-Sys-Syslog.
 - Replace all perl package dependencies by perl(Foo::Bar) style.
   (for more rhel compliant manner)

  Tested on: 6.0, 7.2
2016-02-26 23:50:40 +09:00
mdtrooper a93a7c67ff It is my cat and I 'play' with him as I wish 2016-02-26 15:05:48 +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
m-lopez-f 3609fe218f Fixed problems with Agent custom instalations. Tiquet: #3419 2016-02-25 11:49:56 +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