Commit Graph

2516 Commits

Author SHA1 Message Date
m-lopez-f f88c2b4ce1 Only charge firts task when is console and not metaconsole 2015-06-29 10:43:03 +02:00
m-lopez-f 1b4ae0d26e Merge to feature/Newview 2015-06-29 10:39:05 +02:00
m-lopez-f 806962f2e5 Add new firts task and change text in other 2015-06-29 10:33:01 +02:00
m-lopez-f 06b56d80c8 Add new view when no have data in this view
(cherry picked from commit 15fb6f20a4)
2015-06-26 14:52:50 +02:00
m-lopez-f 15fb6f20a4 Add new view when no have data in this view 2015-06-26 14:52:01 +02:00
m-lopez-f 70db852326 Merge branch 'feature/NewView' into develop 2015-06-26 12:22:14 +02:00
m-lopez-f ba091112f6 Change visual and login page 2015-06-26 12:21:25 +02:00
m-lopez-f 440687c0d7 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-06-26 11:46:58 +02:00
m-lopez-f 964b17644a Change visual 2015-06-26 11:20:08 +02:00
m-lopez-f 58ea3ebb6b Change visual 2015-06-26 08:49:51 +02:00
Alejandro Gallardo Escobar 7fac872fb8 Merge remote-tracking branch 'origin/develop' into features/oracle 2015-06-25 16:17:32 +02:00
Alejandro Gallardo Escobar 4e8c85ec10 Fixes to the 'key' column of the 'tupdate_settings' table 2015-06-25 16:16:01 +02:00
m-lopez-f 94c742bfbe Merge from Develop 2015-06-25 10:40:35 +02:00
m-lopez-f 5b4214277b Changed of visual 2015-06-25 10:07:53 +02:00
mdtrooper d0a0b11440 Fixed call a oracle function.
(cherry picked from commit 66f982d22f)
2015-06-23 15:30:10 +02:00
mdtrooper 8b518ae9b2 Fixed the masive operations for modules when the name has white spaces. TICKET: #2328
(cherry picked from commit 737e085a81)
2015-06-23 12:16:07 +02:00
Alejandro Gallardo Escobar 4f9f8d2449 Fixed the title of the locked button dialog 2015-06-23 12:07:18 +02:00
mdtrooper 447c4ccd6d Some fixes in the code. 2015-06-22 16:10:15 +02:00
m-lopez-f 2754bfeeb0 Fixed inserts paths in DB. Tiquet: #2325 2015-06-22 10:30:57 +02:00
Alejandro Gallardo Escobar 3b037caf32 Merge remote-tracking branch 'origin/develop' into features/oracle 2015-06-18 20:02:01 +02:00
mdtrooper d8e9a2406d Some fixes in the visual console. 2015-06-17 19:14:25 +02:00
mdtrooper 062817ca09 Some fixes in the visual console. 2015-06-17 17:37:23 +02:00
mdtrooper f1185c6db9 Some fixes in the visual console. 2015-06-17 17:36:41 +02:00
mdtrooper b2e31d9ca2 Some fixes in the visual console. 2015-06-17 17:04:14 +02:00
mdtrooper 6faa522187 Some fixes in the visual console. 2015-06-17 17:03:05 +02:00
mdtrooper bf0e89be3a Some fixes in the visual console. 2015-06-17 16:45:21 +02:00
mdtrooper ab032aa17a Some fixes in the visual console. 2015-06-17 15:55:16 +02:00
mdtrooper 43e8edc049 Some fixes in the visual console. 2015-06-17 12:42:52 +02:00
mdtrooper b7c6998fda Some fixes in the visual console. 2015-06-17 12:18:52 +02:00
mdtrooper ff1a35cb92 Some fixes in the javascript visualmap. 2015-06-16 18:02:58 +02:00
mdtrooper 5e026a03e1 Some fixes. 2015-06-16 17:44:15 +02:00
m-lopez-f ff1186ee57 Changed visual of console 2015-06-16 16:09:50 +02:00
Alejandro Gallardo Escobar e5685dfe07 Fixed errors for oracle databases 2015-06-16 15:39:27 +02:00
Alejandro Gallardo Escobar c437797ef7 Fixes for oracle 2015-06-16 15:07:33 +02:00
mdtrooper 72ee6158fa Fixes for the Oracl€. 2015-06-16 14:42:17 +02:00
mdtrooper fad6a1e52d Fixes for the Oracl€. 2015-06-15 17:43:02 +02:00
m-lopez-f 9544dec1ac Change visual of console 2015-06-15 15:50:28 +02:00
m-lopez-f 2f5596ed9e Merge branch 'develop' into feature/NewView 2015-06-15 13:23:12 +02:00
m-lopez-f 9e528d0459 Change visual of console 2015-06-12 15:50:46 +02:00
Alejandro Gallardo Escobar 05f27a4bdc Fixed an error retrieving data with oracle 2015-06-12 14:25:43 +01:00
mdtrooper 8cf8a65bd3 Fixes for the Oracl€. 2015-06-12 14:39:18 +02:00
mdtrooper 9789eca1e1 Added the feature to set module charts painting with lines or area. TICKET: #1849 2015-06-11 21:24:14 +02:00
mdtrooper 37a7cf6cf2 Some fixes in the code. 2015-06-11 20:17:54 +02:00
mdtrooper a364542454 Sort and structure the code and result form with a huge fields of visual pandora setup. 2015-06-11 19:08:57 +02:00
Alejandro Gallardo Escobar 5963f47432 Removed some jQuery.ajax() timeouts 2015-06-11 18:39:02 +02:00
Alejandro Gallardo Escobar 11d50f06ba Removed some jQuery.ajax() 'timeout: 10000' and 'async: false' properties 2015-06-11 12:08:14 +02:00
Alejandro Gallardo Escobar e2281d6bc8 Debug trace removed 2015-06-11 12:07:27 +02:00
Alejandro Gallardo Escobar bcfd0237bb Improvements on the oracle compatibitily 2015-06-10 17:44:20 +02:00
Alejandro Gallardo Escobar b02d381205 Merge branch 'features/oracle' of https://github.com/pandorafms/pandorafms into features/oracle 2015-06-10 15:41:27 +02:00
Alejandro Gallardo Escobar 25dde2c836 Fixes to improve the oracle compatibility 2015-06-10 15:40:59 +02:00