Commit Graph

11755 Commits

Author SHA1 Message Date
Julio Cesar Laura Avendaño
2bcbbd29e7 Merged in paulis/processmaker/PM-VERACODE-15 (pull request #1794)
I solved some issues with Directory traversal
2015-03-30 11:56:28 -04:00
Julio Cesar Laura Avendaño
f2e8028ed2 Merged in paulis/processmaker/PM-VERACODE-12 (pull request #1772)
I completed Untrusted Initialization
2015-03-30 10:36:38 -04:00
Julio Cesar Laura Avendaño
0c51b219ed Merged in qronald/processmaker (pull request #1817)
change conters in list
2015-03-27 17:44:31 -04:00
Julio Cesar Laura Avendaño
162b0f6a1e Merged in cochalo/processmaker/PM-2008 (pull request #1819)
Correccion de error en community
2015-03-27 17:31:42 -04:00
Brayan Pereyra
bf0ab884a9 Correccion de error en community 2015-03-27 17:26:38 -04:00
Ronald Quenta
642e18d91f Merge branch 'master' of bitbucket.org:qronald/processmaker 2015-03-27 16:35:32 -04:00
Quenta Ronald
13bbc1e8f6 Merged colosa/processmaker into master 2015-03-27 16:31:52 -04:00
Ronald Quenta
50c5d8c43d change conters in list 2015-03-27 16:29:59 -04:00
Julio Cesar Laura Avendaño
f00481ef49 Merged in julceslau/processmaker (pull request #1815)
Temporal fix for the class inputfilter
2015-03-27 16:06:42 -04:00
Julio Cesar Laura
a403a70262 Temporal fix for the class inputfilter 2015-03-27 16:05:24 -04:00
Quenta Ronald
c3277cc678 Merged colosa/processmaker into master 2015-03-27 15:54:20 -04:00
Julio Cesar Laura Avendaño
24888248d2 Merged in cochalo/processmaker/PM-2008 (pull request #1812)
Se adicion la correccion para PARALELOS y SUBPROCESS
2015-03-27 15:02:48 -04:00
Brayan Pereyra
0898b8cc9b Se adicion la correccion para PARALELOS y SUBPROCESS 2015-03-27 14:24:56 -04:00
Julio Cesar Laura Avendaño
307d440485 Merged in mcuiza/processmaker/class-inputfilter (pull request #1807)
Cambios en class.inputfilter.php
2015-03-27 12:53:50 -04:00
Julio Cesar Laura Avendaño
6c3a728dc2 Merged in cochalo/processmaker/MOBILE (pull request #1811)
Correccion de contador en APP_CACHE_VIEW
2015-03-27 12:32:48 -04:00
Brayan Pereyra
8d6d4e596d Correccion de contador en APP_CACHE_VIEW 2015-03-27 12:22:30 -04:00
Quenta Ronald
5794c09749 Merged colosa/processmaker into master 2015-03-27 12:07:25 -04:00
marcelo.cuiza
5d1b73e300 Cambios en class.inputfilter.php 2015-03-27 10:22:22 -04:00
Julio Cesar Laura Avendaño
8804ad5ae2 Merged in cochalo/processmaker/PM-1983 (pull request #1806)
Correccion de conflictos
2015-03-27 09:39:15 -04:00
Brayan Pereyra
088b442feb Correccion de conflictos 2015-03-27 08:55:59 -04:00
Julio Cesar Laura Avendaño
09e658e4ec Merged in julceslau/processmaker (pull request #1805)
Merging changes made by Brayan related to counters
2015-03-27 00:00:56 -04:00
Julio Cesar Laura
bd3a3c40ba Merging changes made by Brayan related to counters 2015-03-26 23:57:28 -04:00
Julio Cesar Laura Avendaño
6c6e43e458 Merged in cochalo/processmaker/PM-1936 (pull request #1781)
Correccion de contadores en tipos de tareas
2015-03-26 22:10:25 -04:00
Julio Cesar Laura Avendaño
b4ddcac6ae Merged in cochalo/processmaker/CONSOLIDATED (pull request #1793)
Correccion de CONSOLIDATED
2015-03-26 17:31:05 -04:00
Paula V. Quispe
576c83d738 I solved some issues with Directory traversal 2015-03-26 16:31:46 -04:00
Brayan Pereyra
8f23263be3 Correccion COMMUNITY 2015-03-26 16:25:20 -04:00
Paula V. Quispe
c595bd10bf I solved some issues with Directory traversal 2015-03-26 16:14:32 -04:00
Paula V. Quispe
1bb9f57152 I solved some issues with Directory traversal 2015-03-26 15:47:31 -04:00
Brayan Pereyra
d647de4d69 Correccion de CONSOLIDATED 2015-03-26 15:03:24 -04:00
Paula V. Quispe
f4664ce34c I solved some issues with Directory traversal 2015-03-26 14:55:51 -04:00
Quenta Ronald
676ad5030b Merged colosa/processmaker into master 2015-03-26 08:20:13 -04:00
Julio Cesar Laura Avendaño
c2d32d4f59 Merged in julceslau/processmaker (pull request #1787)
Adding marks for batch routing error in community version
2015-03-25 22:33:52 -04:00
Julio Cesar Laura
b45ebd0caf Adding marks for batch routing error in community version 2015-03-25 22:30:02 -04:00
Julio Cesar Laura Avendaño
60bbaa94c2 Merged in julceslau/processmaker (pull request #1786)
Revert unnecesary change related to marks for community version
2015-03-25 22:00:52 -04:00
Julio Cesar Laura
bc49527fe3 Revert unnecesary change related to marks for community version 2015-03-25 21:59:16 -04:00
Julio Cesar Laura Avendaño
cf0da4d4fa Merged in cochalo/processmaker/CONSOLIDATED (pull request #1768)
Correccion de CONSOLIDATED
2015-03-25 21:55:31 -04:00
Julio Cesar Laura Avendaño
870ab602f9 Merged in julceslau/processmaker (pull request #1785)
Fix error with marks for community edition
2015-03-25 19:57:03 -04:00
Julio Cesar Laura
51a6497436 Fix error with marks for community edition 2015-03-25 19:55:34 -04:00
Julio Cesar Laura Avendaño
d7606433a1 Merged in julceslau/processmaker (pull request #1784)
Fix error with marks for community edition
2015-03-25 19:47:14 -04:00
Julio Cesar Laura
8cc214da86 Fix error with marks for community edition 2015-03-25 19:46:02 -04:00
Julio Cesar Laura Avendaño
8dbdcad10c Merged in julceslau/processmaker (pull request #1783)
Fix error with marks for community edition
2015-03-25 19:42:45 -04:00
Julio Cesar Laura
3bddad2edc Fix error with marks for community edition 2015-03-25 19:41:14 -04:00
Julio Cesar Laura Avendaño
0745e92f14 Merged in dheeyi/processmaker/PM-1947 (pull request #1769)
PM-1947 Classic/BPMN DESIGNER: La habilitacióe 'Timing Control' usando el checkbox funciona al revéCausa : Definida de esa manera.
2015-03-25 19:10:24 -04:00
Brayan Pereyra
91188de39e Merge branch 'CONSOLIDATED' of bitbucket.org:cochalo/processmaker into CONSOLIDATED 2015-03-25 18:21:08 -04:00
Julio Cesar Laura Avendaño
beb2a15107 Merged in gproly/processmaker/PM-947 (pull request #1779)
PM-947
2015-03-25 18:20:28 -04:00
Brayan Pereyra
c801d0d38f Merge branch 'master' of bitbucket.org:colosa/processmaker into CONSOLIDATED 2015-03-25 18:20:07 -04:00
Brayan Pereyra
1096a75fd8 Validacion de licencia 2015-03-25 18:18:57 -04:00
Brayan Pereyra
fde8667a66 Correccion de contadores en tipos de tareas 2015-03-25 17:09:10 -04:00
Brayan Pereyra
36e6f97cc4 Merge branch 'master' of bitbucket.org:colosa/processmaker into CONSOLIDATED 2015-03-25 16:24:09 -04:00
Roly Rudy Gutierrez Pinto
4581a6efc3 PM-947 2015-03-25 15:57:53 -04:00