danteloayza
d4ecc6c1a4
conflicts resolution
2015-03-30 11:00:04 -04:00
Dante Loayza
ad805f9038
Merged in jennydmz/processmaker/dashbFixAppDel (pull request #1820 )
...
Fixing conflicts
2015-03-27 18:03:43 -04:00
jennylee
93700de426
Fixing conflicts
2015-03-27 17:56:11 -04:00
Dante Loayza
648b1de248
Merged in jennydmz/processmaker/dashbFixAppDel (pull request #1818 )
...
Adding the new changes in AppDelegation.php
2015-03-27 17:30:59 -04:00
jennylee
e39b6bdd54
lasts corrections
2015-03-27 17:25:06 -04:00
jennylee
9325a1ec99
Adding the new changes in AppDelegation.php
2015-03-27 17:10:11 -04:00
danteloayza
052ddc3759
hash license features update
2015-03-26 19:13:46 -04:00
Dante Loayza
afa9a896bf
Merged in jennydmz/processmaker/dash2Model (pull request #1803 )
...
Adding the model of the db
2015-03-26 19:01:41 -04:00
danteloayza
e537424a82
mysql schema
2015-03-26 18:58:59 -04:00
jennylee
d08457420a
Adding the model of the db
2015-03-26 18:58:43 -04:00
danteloayza
b4318bb90d
users.js update
2015-03-26 18:46:58 -04:00
Dante Loayza
4bdc2258a1
Merged in jennydmz/processmaker/dash2Conf (pull request #1799 )
...
Resolving conflicts
2015-03-26 18:21:00 -04:00
jennylee
f6788b35d5
Resolving conflicts
2015-03-26 18:14:51 -04:00
danteloayza
cff0e2c6e1
Non conflict files
2015-03-26 17:37:32 -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
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
Julio Cesar Laura Avendaño
1ad0369e0a
Merged in paulis/processmaker/PM-VERACODE-13 (pull request #1775 )
...
I solved the credentials management
2015-03-25 13:29:07 -04:00
Julio Cesar Laura Avendaño
7d0f2679ab
Merged in paulis/processmaker/PM-1939 (pull request #1767 )
...
I solved the issue PM-1939 PM-1940
2015-03-25 13:00:57 -04:00
Julio Cesar Laura Avendaño
8d9c892e9c
Merged in richardnoel/processmaker (pull request #1774 )
...
PM-1672 upload file to [pmDynaform]
2015-03-25 12:30:56 -04:00
Paula V. Quispe
a2a1d0a891
I solved the credentials management
2015-03-25 12:27:06 -04:00
Richard Yujra
3cda403d06
PM-1672 upload file to [pmDynaform]
2015-03-25 12:20:48 -04:00
Richard Yujra
9e2633ba11
Merged colosa/processmaker into master
2015-03-25 12:10:53 -04:00
Brayan Pereyra
71ac0d1657
CORRECCION CONSOLIDATED
2015-03-24 20:35:25 -04:00
Julio Cesar Laura Avendaño
f5a0e75618
Merged in victorsl/processmaker/PM-1913 (pull request #1756 )
...
PM-1913 "0017035: Change error message for REST endpoint..." SOLVED
2015-03-24 19:19:33 -04:00
Julio Cesar Laura Avendaño
c94c17bbea
Merged in victorsl/processmaker/PM-1851 (pull request #1762 )
...
PM-1851 "ADMIN > Logs > Audit Log: Implementar un criterio..." SOLVED
2015-03-24 18:49:55 -04:00
dheeyi
1ef21eeb8c
PM-1947 Classic/BPMN DESIGNER: La habilitacióe 'Timing Control' usando el checkbox funciona al revéCausa : Definida de esa manera.
...
Solucion : Revertir la interpretacion de esa propiedad.
2015-03-24 18:27:21 -04:00
Brayan Pereyra
4f1112c990
Correccion de CONSOLIDATED
2015-03-24 17:42:50 -04:00
Brayan Pereyra
34fee16fef
Correccion de CONSOLIDATED
2015-03-24 17:42:13 -04:00
Paula V. Quispe
8759fcbd6c
I solved the issue PM-1939 pm-1940
2015-03-24 17:41:18 -04:00
Julio Cesar Laura Avendaño
18e42a42ed
Merged in dheeyi/processmaker/PM-1758 (pull request #1760 )
...
PM-1758 Classic Designer > DYNAFORMS > Condition editor: Al abrir el 'CONDITIONAL EDITOR' dentro de un Dynaform la ventana del navegaor de IE sufre una transformación causando la desaparición del menú principal y la cabecera
2015-03-24 17:23:35 -04:00
Julio Cesar Laura Avendaño
a0f073141f
Merged in gproly/processmaker/PM-947 (pull request #1766 )
...
PM-947
2015-03-24 17:22:28 -04:00
Roly Rudy Gutierrez Pinto
996dd83c26
PM-947
2015-03-24 16:15:19 -04:00
dheeyi
536e55383c
PM-1758 Classic Designer > DYNAFORMS > Condition editor: Al abrir el 'CONDITIONAL EDITOR' dentro de un Dynaform la ventana del navegaor de IE sufre una transformacióausando la desaparicióel menúncipal y la cabecera
...
Causa : Definida de esa manera
Solocion : Readecuar propiedades a ese estilo.
2015-03-24 15:48:57 -04:00
Julio Cesar Laura Avendaño
5234de3135
Merged in julceslau/processmaker (pull request #1763 )
...
Updating translation.en file for PM 3.0 RC2
2015-03-24 15:17:37 -04:00
