Commit Graph

14726 Commits

Author SHA1 Message Date
Marco Antonio Nina Mena
332b368ab7 Merged colosa/processmaker into master 2015-06-16 10:04:31 -04:00
Victor Saisa Lopez
68a4aff54a Merge branch 'master' of bitbucket.org:colosa/processmaker into PM-2576 2015-06-16 08:42:14 -04:00
Dante Loayza
9ca3a7981c Merged master into dashboards2 2015-06-15 17:29:52 -04:00
Julio Cesar Laura Avendaño
5b6dc0667e Merged in gproly/processmaker/PM-2930-2895 (pull request #2346)
PM-2930-2895 MSSQL (http://php.net/manual/en/intro.mssql.php)
2015-06-15 17:22:01 -04:00
Paula V. Quispe
0cc89a62f9 PM-2973: Fourth migration ldapAdvanced 2015-06-15 17:12:59 -04:00
Julio Cesar Laura Avendaño
cd2e74dc3a Merged in dheeyi/processmaker/PM-2879 (pull request #2338)
PM-2879 Improve Case Tracker UX
2015-06-15 16:48:14 -04:00
Victor Saisa Lopez
6456106913 Merge branch 'master' of bitbucket.org:colosa/processmaker 2015-06-15 16:06:52 -04:00
Ronald Quenta
13ee3c6f2d Merge branch 'master' of bitbucket.org:qronald/processmaker 2015-06-15 15:34:52 -04:00
Ronald Quenta
7596424f35 Merge remote branch 'pm/master' 2015-06-15 15:34:30 -04:00
Quenta Ronald
d9573e3eef Merged colosa/processmaker into master 2015-06-15 15:33:32 -04:00
Ronald Quenta
c6338995e0 add method jsonr in get json definitions 2015-06-15 15:32:29 -04:00
Victor Saisa Lopez
d363690c3d PM-2917 "Case Scheduler issues" SOLVED
Issue:
    Case Scheduler issues
Cause:
    No se considero ciertas combinaciones de configuracion para: Daily, Monthly
Solution:
    - Se mejoro los metodos/algoritmos involucrados para la "generacion de la siguiente fecha de ejecucion"
    - Se reviso todas las opciones de configuracion: Daily, Weekly, Monthly, One time only, Every
2015-06-15 13:34:17 -04:00
Victor Saisa Lopez
1ff0ca9c72 Merge branch 'master' of bitbucket.org:colosa/processmaker into PM-2917 2015-06-15 13:24:59 -04:00
Roly Rudy Gutierrez Pinto
cd8c8ef9cc PM-2930-2895 MSSQL (http://php.net/manual/en/intro.mssql.php)
These functions allow you to access MS SQL Server database. 
This extension is not available anymore on Windows with PHP 5.3 or later. 
SQLSRV, an alternative extension for MS SQL connectivity is available from 
Microsoft: » http://msdn.microsoft.com/en-us/sqlserver/ff657782.aspx.
Alternatively to use the mssql functions in Windows, use php_dblib.dll (FreeTDS) http://www.freetds.org/
e.g. php.ini setting
extension=php_dblib.dll
php_dblib.dll (FreeTDS) use ':' as the delimiter in all installations.
2015-06-15 12:53:25 -04:00
Julio Cesar Laura Avendaño
4786272544 Merged in dheeyi/processmaker/PM-2934 (pull request #2342)
PM-2934
2015-06-15 12:43:45 -04:00
Victor Saisa Lopez
c947b1bb33 Merge branch 'master' of bitbucket.org:colosa/processmaker into PM-2917 2015-06-15 11:45:06 -04:00
dheeyi
d37e76b6e5 PM-2934 Validacion en el listado de variables a la creacion de un ReportTable 2015-06-15 11:42:53 -04:00
Julio Cesar Laura Avendaño
7a86be0ca4 Merged in paulis/processmaker/PM-2939 (pull request #2339)
PM-2939: Actions by email plugin and feature working together
2015-06-15 11:24:05 -04:00
Julio Cesar Laura Avendaño
570acadcdd Merged in paulis/processmaker/PM-2938 (pull request #2336)
PM-2938: Batch routing - Consolidated cases plugin and feature working together
2015-06-15 11:22:42 -04:00
Paula V. Quispe
2a82e14fed PM-2939: I catch and show the error 2015-06-15 10:17:14 -04:00
Marco Antonio Nina Mena
998145954b Merge remote-tracking branch 'upstream/dashboards2' into dashboards2 2015-06-15 09:50:20 -04:00
Marco Antonio Nina Mena
224e93d0de Merged colosa/processmaker into master 2015-06-15 09:20:49 -04:00
Paula V. Quispe
89ddab8a30 I deleted some lines 2015-06-15 09:11:38 -04:00
Victor Saisa Lopez
37915efb00 Merge branch 'master' of bitbucket.org:colosa/processmaker 2015-06-15 08:54:06 -04:00
Victor Saisa Lopez
01ee9799bf Merge branch 'master' of bitbucket.org:colosa/processmaker into PM-2917 2015-06-15 08:52:03 -04:00
dheeyi
63895d5117 Merge branch 'master' of bitbucket.org:dheeyi/processmaker into PM-2647 2015-06-14 18:18:40 -04:00
dheeyi
ac6ee0eb75 Merge remote branch 'upstream/master' into PM-2647 2015-06-14 18:18:22 -04:00
Paula V. Quispe
1f08900b71 PM-2939: Actions by email plugin and feature working together 2015-06-12 17:30:18 -04:00
Paula V. Quispe
f350f27386 PM-2938: I solved the issue when deschecked the option [Enable consolidate for this task] 2015-06-12 16:49:52 -04:00
dheeyi
601747e7b0 PM-2879
Improve Case Tracker UX
2015-06-12 16:34:35 -04:00
dheeyi
e074485c54 PM-2879
Improve Case Tracker UX
2015-06-12 16:29:10 -04:00
Quenta Ronald
b23ecc2ba9 Merged colosa/processmaker into master 2015-06-12 15:34:22 -04:00
Paula V. Quispe
52bf21289d PM-2938: I deleted the validacion in Ok windows 2015-06-12 15:32:55 -04:00
Paula V. Quispe
1aec306dbe PM-2938: I correct some issues 2015-06-12 15:27:01 -04:00
dheeyi
e4ec763c4e Merge remote branch 'upstream/master' into PM-2879 2015-06-12 14:53:48 -04:00
dheeyi
a6af3fe2e3 Merge remote branch 'upstream/master' 2015-06-12 14:48:22 -04:00
Julio Cesar Laura Avendaño
6b4af36ece Merged in paulis/processmaker/PM-2815-PM (pull request #2313)
PM-2815: I added minutes in Assigment rules > timing control
2015-06-12 14:42:59 -04:00
Ronald Quenta
1734c92375 Merge remote branch 'pm/master' 2015-06-12 14:11:57 -04:00
Quenta Ronald
aa139350c9 Merged colosa/processmaker into master 2015-06-12 14:10:33 -04:00
Dante
8d5ebb0d00 suggested times for tasks 2015-06-12 12:00:28 -04:00
Julio Cesar Laura Avendaño
54c4a24916 Merged in gproly/processmaker/IMPROVEMENT (pull request #2332)
IMPROVEMENT
2015-06-12 11:35:51 -04:00
Roly Rudy Gutierrez Pinto
28aa6afa42 IMPROVEMENT 2015-06-12 11:32:29 -04:00
Dante Loayza
27648de24b Merged master into dashboards2 2015-06-12 10:25:51 -04:00
Dante
ec1710781f Integration to TimeSeries Comparison in dashboard view page 2015-06-12 10:24:35 -04:00
Victor Saisa Lopez
5abc524709 Merge branch 'master' of bitbucket.org:colosa/processmaker into PM-2917 2015-06-12 10:12:32 -04:00
Dante Loayza
7988dcf5af Merged in marcoAntonioNina/processmaker/dashboards2 (pull request #2331)
Add field average and sdv on Task properties
2015-06-12 09:55:12 -04:00
Marco Antonio Nina Mena
424a1d529e Merged colosa/processmaker into master 2015-06-12 09:46:38 -04:00
Marco Antonio Nina Mena
49b475bcf3 Add field average and sdv on Task properties 2015-06-12 09:46:14 -04:00
Julio Cesar Laura Avendaño
134ffa6e77 Merged in luisfernandosl/processmaker/PM-2880 (pull request #2324)
PM-2880 "Separar Templates y Process Files..." SOLVED
2015-06-12 08:43:16 -04:00
Paula V. Quispe
68d92c465b PM-2938: Show only 1 cases menu [Batch Routing] 2015-06-11 18:42:58 -04:00