3940 Commits

Author SHA1 Message Date
artica
51e76a0289 Auto-updated build strings. 2015-06-03 00:01:12 +02:00
Alejandro Gallardo Escobar
8fbe1175b5 Merge remote-tracking branch 'origin/develop' into features/oracle
Conflicts resolved:
	pandora_console/DEBIAN/control
	pandora_console/DEBIAN/make_deb_package.sh
	pandora_console/include/config_process.php
	pandora_console/pandoradb.data.oracle.sql
2015-06-02 18:08:46 +02:00
artica
bdda81b436 Auto-updated build strings. 2015-06-02 00:01:10 +02:00
artica
306c7f016a Auto-updated build strings. 2015-06-01 00:01:09 +02:00
artica
528c9f79f0 Auto-updated build strings. 2015-05-31 00:01:09 +02:00
artica
e4c9b07266 Auto-updated build strings. 2015-05-30 00:01:11 +02:00
mdtrooper
5c7b230e9b Merge some changes and fixed from the 'develop' branch. 2015-05-29 14:16:39 +02:00
artica
16fa2ec329 Auto-updated build strings. 2015-05-29 00:01:13 +02:00
artica
70cc8fbc8f Auto-updated build strings. 2015-05-28 00:01:10 +02:00
artica
eacb7300de Auto-updated build strings. 2015-05-27 00:01:14 +02:00
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
artica
c0bc11e50a Auto-updated build strings. 2015-05-26 00:02:12 +02:00
artica
f51a36fd3d Auto-updated build strings. 2015-05-25 00:01:11 +02:00
artica
94e24f461a Auto-updated build strings. 2015-05-24 00:01:10 +02:00
artica
37361f53ae Auto-updated build strings. 2015-05-23 00:01:13 +02:00
artica
0ea32ce1dc Auto-updated build strings. 2015-05-22 00:01:13 +02:00
artica
bb934257e6 Auto-updated build strings. 2015-05-21 00:01:13 +02:00
artica
0dc669178b Auto-updated build strings. 2015-05-20 00:01:17 +02:00
Alejandro Gallardo Escobar
137acdb232 Merge remote-tracking branch 'origin/develop' into features/oracle
Conflicts resolved:
	pandora_console/include/functions_reporting.php
2015-05-19 19:16:35 +02:00
artica
2896fb5324 Auto-updated build strings. 2015-05-19 00:01:15 +02:00
artica
94fc0c72bb Auto-updated build strings. 2015-05-18 00:01:11 +02:00
artica
26c2e22b1c Auto-updated build strings. 2015-05-17 00:01:09 +02:00
artica
dd60a6ad3f Auto-updated build strings. 2015-05-16 00:01:10 +02:00
artica
c1fffcfc4f Auto-updated build strings. 2015-05-15 00:01:15 +02:00
Alejandro Gallardo Escobar
d212fd5543 Merge remote-tracking branch 'origin/develop' into features/oracle 2015-05-14 11:09:37 +02:00
artica
d199846972 Auto-updated build strings. 2015-05-14 00:01:11 +02:00
artica
7d8fe9508b Auto-updated build strings. 2015-05-13 00:01:15 +02:00
artica
d771989313 Auto-updated build strings. 2015-05-12 00:01:12 +02:00
artica
1cc02b9013 Auto-updated build strings. 2015-05-11 00:01:11 +02:00
artica
a815e04f07 Auto-updated build strings. 2015-05-10 00:01:12 +02:00
artica
7c6934ff39 Auto-updated build strings. 2015-05-09 00:01:11 +02:00
artica
3973044aa1 Auto-updated build strings. 2015-05-08 00:01:13 +02:00
artica
4b7047d9a8 Auto-updated build strings. 2015-05-07 00:01:14 +02:00
mdtrooper
0ec32cc826 Fixed the PHP Warnings about the re-start the session.
(cherry picked from commit 1a035873dc79d04ffbf155a874e3eeed8eaa8c20)
2015-05-06 18:43:10 +02:00
artica
6f308321d4 Auto-updated build strings. 2015-05-06 00:01:12 +02:00
artica
5dc2b6be17 Auto-updated build strings. 2015-05-05 00:01:14 +02:00
Alejandro Gallardo Escobar
b78dbf1c0d Merge remote-tracking branch 'origin/develop' into features/oracle 2015-05-04 16:44:40 +02:00
artica
b9ace11dda Auto-updated build strings. 2015-05-04 00:01:09 +02:00
artica
8c2851cf7f Auto-updated build strings. 2015-05-03 00:01:08 +02:00
artica
88bb073bca Auto-updated build strings. 2015-05-02 00:01:10 +02:00
artica
2ef016b06e Auto-updated build strings. 2015-05-01 00:01:12 +02:00
artica
0ce49f40b4 Auto-updated build strings. 2015-04-30 00:01:15 +02:00
Alejandro Gallardo Escobar
4008b12add Error fixes related with the improved oracle compatibility 2015-04-29 15:31:46 +02:00
artica
fd00915457 Auto-updated build strings. 2015-04-29 00:01:11 +02:00
artica
3ee1cfacd9 Auto-updated build strings. 2015-04-28 00:01:15 +02:00
artica
9ef920de5f Auto-updated build strings. 2015-04-27 00:01:09 +02:00
artica
5e6c70b9d0 Auto-updated build strings. 2015-04-26 00:01:08 +02:00
artica
576aed5356 Auto-updated build strings. 2015-04-25 00:01:14 +02:00
artica
7dbf60d4ef Auto-updated build strings. 2015-04-24 00:01:13 +02:00
artica
13b7d4a414 Auto-updated build strings. 2015-04-23 00:01:12 +02:00