pandorafms/pandora_console
Alejandro Gallardo Escobar 5fb3e94203 Merge branch 'feature/NewTreeView' of https://github.com/pandorafms/pandorafms into feature/NewTreeView
Conflicts resolved:
	pandora_console/include/ajax/tree.ajax.php
2014-12-18 14:48:18 +01:00
..
DEBIAN Auto-updated build strings. 2014-12-13 00:01:12 +01:00
attachment F*cking git and the empty folders, added a .gitignore into the downloads directory 2014-10-29 17:12:47 +01:00
extensions Removed the un used field label_color. 2014-11-19 16:30:00 +01:00
extras Merge branch 'feature/ticket#1579-TwoFactorAuthentication' into develop 2014-12-15 15:06:29 +01:00
fonts 2014-06-03 Sergio Martin <sergio.martin@artica.es> 2014-06-03 16:59:55 +00:00
general Revert "Fixed some paths" 2014-12-11 18:49:04 +01:00
godmode Merge branch 'feature/ticket#1579-TwoFactorAuthentication' into develop 2014-12-15 15:06:29 +01:00
images Now the tree images will be in the images folder. The operation/tree folder will be removed when this feature ends 2014-12-16 12:59:45 +01:00
include Merge branch 'feature/NewTreeView' of https://github.com/pandorafms/pandorafms into feature/NewTreeView 2014-12-18 14:48:18 +01:00
mobile Added the double auth functionality to the mobile version 2014-12-15 13:47:33 +01:00
operation Minor fixes 2014-12-18 14:43:45 +01:00
AUTHORS 2010-04-21 Sancho Lerena <slerena@artica.es> 2010-04-21 17:52:08 +00:00
COPYING 2011-06-16 Sancho Lerena <slerena@artica.es> 2011-06-16 19:26:45 +00:00
ajax.php Fixed the lost hash user in the links from metaconsole to the nodes. 2014-11-25 11:07:41 +01:00
index.php Fixed the 2 step login 2014-12-12 12:38:08 +01:00
install.php Auto-updated build strings. 2014-12-13 00:01:12 +01:00
pandora_console.redhat.spec Auto-updated build strings. 2014-12-13 00:01:12 +01:00
pandora_console.spec Auto-updated build strings. 2014-12-13 00:01:12 +01:00
pandora_console_install 2014-08-14 Koichiro Kikuchi <koichiro@rworks.jp> 2014-08-14 00:22:48 +00:00
pandora_console_upgrade 2011-03-29 Raul Mateos <raulofpandora@gmail.com> 2011-03-29 08:45:21 +00:00
pandoradb.data.oracle.sql Small changes to support the Z/OS extension. 2014-12-12 12:56:21 +01:00
pandoradb.data.postgreSQL.sql Small changes to support the Z/OS extension. 2014-12-12 12:56:21 +01:00
pandoradb.oracle.sql Merge branch 'feature/ticket#1579-TwoFactorAuthentication' into develop 2014-12-15 15:06:29 +01:00
pandoradb.postgreSQL.sql Merge branch 'feature/ticket#1579-TwoFactorAuthentication' into develop 2014-12-15 15:06:29 +01:00
pandoradb.sql Merge branch 'feature/ticket#1579-TwoFactorAuthentication' into develop 2014-12-15 15:06:29 +01:00
pandoradb_data.sql Auto-updated build strings. 2014-12-13 00:01:12 +01:00