17573 Commits

Author	SHA1	Message	Date
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
Arturo Gonzalez	db66113fb1	Fixed group view with strict user. Ticket#3391	2016-02-18 09:20:14 +01:00
Hirofumi Kosaka	1ca151fa03	Fixed get_plugins API that had returned values in wrong order if updated from ver 4.x.	2016-02-18 16:58:01 +09:00
artica	bdaf4689eb	Auto-updated build strings.	2016-02-18 00:01:17 +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
Arturo Gonzalez	a3a38c9bb6	New login method (saml). Ticket#3393	2016-02-17 13:05:22 +01:00
mdtrooper	c5f6259fce	Working in the new networkmaps.	2016-02-17 12:25:03 +01:00
artica	d912f033c8	Auto-updated build strings.	2016-02-17 00:01:12 +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
artica	13d5c5f00c	Auto-updated build strings.	2016-02-16 00:01:13 +01:00
mdtrooper	69774bc4e2	Some changes to upload	2016-02-15 12:15:16 +01:00
artica	f92b92a9d1	Auto-updated build strings.	2016-02-15 00:01:10 +01:00
artica	e1e77f1a1b	Auto-updated build strings.	2016-02-14 00:01:13 +01:00
artica	5c270c4d69	Auto-updated build strings.	2016-02-13 00:01:17 +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	f3a161743d	Fixed the migration code for the actual filters.	2016-02-12 14:19:31 +01:00
artica	766964be4a	Auto-updated build strings.	2016-02-12 00:01:20 +01:00
Arturo Gonzalez	625b4044e0	New maps in progress... (provisional dialog arrows)	2016-02-11 11:28:53 +01:00
Arturo Gonzalez	38f105f041	New maps in progress... (provisional arrows to nodes dialogs)	2016-02-11 10:53:33 +01:00
artica	7e1ea38a40	Auto-updated build strings.	2016-02-11 00:01:18 +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	211f2d0832	Merge branch 'feature/new_networkmap' of https://github.com/pandorafms/pandorafms into feature/new_networkmap ... Conflicts: pandora_console/include/javascript/map/MapController.js	2016-02-10 14:02:43 +01:00
mdtrooper	df25018631	Working in the code of new networkmap.	2016-02-10 14:01:10 +01:00
Arturo Gonzalez	ce1779d2ff	New maps in progress... (node dialog)	2016-02-10 13:49:31 +01:00
Arturo Gonzalez	717b91d9bf	New maps in progress... (Added nodes to testing)	2016-02-10 10:14:53 +01:00
Arturo Gonzalez	3867dc11c7	New maps in progress... (dialog position when clicks a node)	2016-02-10 10:06:19 +01:00
artica	d22ee75008	Auto-updated build strings.	2016-02-10 00:01:13 +01:00
mdtrooper	64e3488ea5	Added pair of nodes in the testing map.	2016-02-09 16:54:33 +01:00
Arturo Gonzalez	ef1d7e22bc	New maps in progress... (pop-up window to nodes)	2016-02-09 16:33:36 +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
m-lopez-f	2ff36cc245	Add lost variable in funtion	2016-02-09 10:22:40 +01:00
m-lopez-f	3315b732f8	Fixed problems with create syntethic module with API.	2016-02-09 10:20:42 +01:00
artica	79f0001249	Auto-updated build strings.	2016-02-09 00:01:15 +01:00
Arturo Gonzalez	372dd1db1f	New maps in progress... (js)	2016-02-08 17:03:43 +01:00
mdtrooper	fe863f61df	Working in the code of new networkmaps.	2016-02-08 13:47:46 +01:00
artica	8ce0298ae1	Auto-updated build strings.	2016-02-08 00:01:11 +01:00
artica	4b96c68af6	Auto-updated build strings.	2016-02-07 00:01:10 +01:00
artica	dc741b66ad	Auto-updated build strings.	2016-02-06 00:01:12 +01:00
mdtrooper	87b07ee5ef	Working the javascript objects for the new maps.	2016-02-05 16:16:41 +01:00
mdtrooper	9307a6e77e	Starting with the javascript objects for the new maps.	2016-02-05 15:53:59 +01:00
Arturo Gonzalez	be166593cb	Fixed sql error when searchs in empty father groups. Ticket#3347	2016-02-05 12:31:20 +01:00
mdtrooper	35159cf1ac	Remove a proof concept files. Thanks Arturo for the work.	2016-02-05 12:06:42 +01:00
fermin831	55140d06dd	Fixed cron updating problem TICKETS #3329 ... In addition, linux agent send crontab token and in data modules, cron information is displayed grayed	2016-02-05 09:56:37 +01:00