pandorafms/pandora_console
Alejandro Gallardo Escobar d7801c2933 Merge remote-tracking branch 'origin/develop' into features/oracle
Conflicts resolved:
	pandora_console/extensions/module_groups.php
	pandora_console/godmode/reporting/graph_builder.graph_editor.php
	pandora_console/operation/events/events_list.php
2015-05-26 10:29:38 +02:00
..
DEBIAN Auto-updated build strings. 2015-05-26 00:02:12 +02:00
attachment Removed the collections dir. The enterprise use 'collection'. TICKET: #1799 2015-02-25 16:08:33 +01:00
extensions Fixed error, when type modules is Asyncronous type, tiquet: #2193 2015-05-25 10:45:21 +02:00
extras Merge remote-tracking branch 'origin/develop' into features/oracle 2015-05-26 10:29:38 +02:00
fonts
general Fixed PHP Warnings and PHP notices (The PHP version 5.3.4 (the PHP version in new CentOS) and uppers are very noisy.) 2015-05-21 12:18:40 +02:00
godmode Merge remote-tracking branch 'origin/develop' into features/oracle 2015-05-26 10:29:38 +02:00
images Added json file icon. Thanks Carla. 2015-05-18 16:23:23 +02:00
include Merge remote-tracking branch 'origin/develop' into features/oracle 2015-05-26 10:29:38 +02:00
mobile Changes on the functionality and the ACL checks. Great improvements on the ACL management 2015-04-09 14:00:37 +02:00
operation Merge remote-tracking branch 'origin/develop' into features/oracle 2015-05-26 10:29:38 +02:00
.gitignore Removed the .bak files and an auto generated file for the chat functionality 2015-05-14 18:19:41 +02:00
AUTHORS
COPYING
ajax.php Fixed bug loading ajax. 2015-04-16 12:37:42 +02:00
index.php Ask for the old password before letting a user renew his password. 2015-05-19 11:38:30 +02:00
install.php Auto-updated build strings. 2015-05-26 00:02:12 +02:00
pandora_console.redhat.spec Auto-updated build strings. 2015-05-26 00:02:12 +02:00
pandora_console.spec Auto-updated build strings. 2015-05-26 00:02:12 +02:00
pandora_console_install
pandora_console_upgrade
pandoradb.data.oracle.sql Fixed a lot of things, like the catastrophic problem with the sequences and the insertion triggers 2015-05-14 12:22:36 +02:00
pandoradb.data.postgreSQL.sql Added the values of the new access bits to the default profiles 2015-04-06 16:03:23 +02:00
pandoradb.oracle.sql Now the PL/SQL function 'INSERT_ID' returns the inserted id properly 2015-05-25 19:52:27 +02:00
pandoradb.postgreSQL.sql Added some missing columns 2015-04-30 20:12:05 +02:00
pandoradb.sql Added some missing columns 2015-04-30 20:12:05 +02:00
pandoradb_data.sql Auto-updated build strings. 2015-05-26 00:02:12 +02:00