Commit Graph

18247 Commits

Author SHA1 Message Date
Richard Yujra
154bfaf4c8 Merge branch 'master' of bitbucket.org:richardnoel/processmaker 2015-01-15 14:35:29 -04:00
Richard Yujra
3b554ded83 Merge branch 'master' of bitbucket.org:richardnoel/processmaker 2015-01-15 14:30:00 -04:00
Richard Yujra
ff030687f4 resolved bug 1193 2015-01-15 14:29:05 -04:00
Luis Fernando Saisa Lopez
c33fd019e8 Merge branch 'master' of bitbucket.org:colosa/processmaker into PM-940 2015-01-15 09:11:26 -04:00
Richard Yujra
4c1d5caf8b Merged colosa/processmaker into master 2015-01-14 14:41:37 -04:00
Julio Cesar Laura Avendaño
634f05541c Merged in jennydmz/processmaker/PM-1180 (pull request #1326)
PM-1180 Menu contextual en Designer Tab no se muestra bien en IE
2015-01-14 12:06:49 -04:00
jennylee
7722b805eb PM-1180 Menu contextual en Designer Tab no se muestra bien en IE
Agregando algunas validaciones para controlar si un proceso ya esta abierto o no.
2015-01-14 14:41:17 -04:00
jennylee
4b12095b66 Merge remote branch 'upstream/master' into PM-1180 2015-01-14 14:41:09 -04:00
Julio Cesar Laura Avendaño
00a9354d7b Merged in veronicaaruquipa/processmaker/fixing-broken-features (pull request #1328)
It was fixed the 'error password' verification test in order to start a task with a wrong password.
2015-01-14 12:05:58 -04:00
Richard Yujra
89ffa5ef50 Merged colosa/processmaker into master 2015-01-14 10:58:35 -04:00
Luis Fernando Saisa Lopez
abeb15e12b Merge branch 'master' of bitbucket.org:colosa/processmaker into PM-940 2015-01-14 09:29:55 -04:00
jennylee
e1598437db PM-1180 Menu contextual en Designer Tab no se muestra bien en IE
El problema era el Document Mode, que para q el Diseniador de procesos funcione tenia q ser cambiado obligatoriamente y de forma manual por el usuario a Standards, cosa que hacia que varias cosas en PM se reenderen mal, entre estas: La letra crecia y ya no se visualizaban los labels completos, aparecian dobles scrolls en algunas ventanas y tambien desaparecia el footer de las tablas de los listados tanto en HOME, Designer y Admin.

Por lo tanto se opto por abrir en otro tab el diseador cuando el proceso sea BPMN y el navegador sea IE, esto para que el meta que se seteo en Michelangelo se respete y no sea pisado por el meta de PM, ya que ambos son distintos. PM-> 'IE=8' y Michelangelo-> 'IE=edge'
2015-01-13 17:29:12 -04:00
Julio Cesar Laura Avendaño
c771300aa6 Merged in gproly/processmaker (pull request #1327)
PMDynaform setData
2015-01-13 16:30:17 -04:00
norahmollo
ff322551f2 PM-1215 En IE no funciona el default flow.
DOCTYPE html declarado
2015-01-13 16:09:01 -04:00
Roly Rudy Gutierrez Pinto
fbf4ad1079 PMDynaform setData 2015-01-13 15:17:51 -04:00
m3ik0
ef44e81047 It was fixed the 'error password' verification test in order to start a task with a wrong password. 2015-01-13 14:43:43 -04:00
m3ik0
c821e91b6d Were fixed the negatives tests related to start tasks with bad credentials. 2015-01-13 14:15:29 -04:00
Veronica Aruquipa
9ccd031e50 Merged colosa/processmaker into master 2015-01-13 13:34:33 -04:00
Luis Fernando Saisa Lopez
8f57f05c3b Merge branch 'master' of bitbucket.org:colosa/processmaker into PM-940 2015-01-13 13:18:39 -04:00
Julio Cesar Laura Avendaño
7b2e0c9f17 Merged in darojas/processmaker/PM-1165 (pull request #1325)
PM-1165 "Fix Fatal error: Call to a member function getDynVersion()"
2015-01-13 10:58:46 -04:00
Freddy Daniel Rojas Valda
1b67af5a85 PM-1165 "Fix Fatal error: Call to a member function getDynVersion()" 2015-01-14 10:31:38 -04:00
Richard Yujra
55469caf8e Merge branch 'master' of bitbucket.org:richardnoel/processmaker 2015-01-13 10:46:22 -04:00
Luis Fernando Saisa Lopez
3e1db94d28 Merge branch 'master' of bitbucket.org:colosa/processmaker into PM-940 2015-01-13 08:57:59 -04:00
Julio Cesar Laura Avendaño
0367d71092 Merged in gproly/processmaker (pull request #1322)
PMDynaform
2015-01-12 17:42:56 -04:00
Julio Cesar Laura Avendaño
732e6f6b22 Merged in norah/processmaker/PM-1215 (pull request #1323)
PM-1215 En IE no funciona el default flow
2015-01-12 17:41:59 -04:00
Roly Rudy Gutierrez Pinto
2d915ff264 PMDynaform 2015-01-12 15:58:52 -04:00
Richard Yujra
c4b72fff4a Merged colosa/processmaker into master 2015-01-12 10:54:24 -04:00
Julio Cesar Laura Avendaño
7a4139315c Merged in gproly/processmaker (pull request #1321)
PMDynaform
2015-01-12 10:31:07 -04:00
Julio Cesar Laura Avendaño
0737a7761a Merged in veronicaaruquipa/processmaker/fixing-broken-features (pull request #1320)
Were added the right input data inside the the features
2015-01-12 10:27:42 -04:00
Roly Rudy Gutierrez Pinto
dd8df0b82c PMDynaform 2015-01-12 09:46:10 -04:00
Veronica Aruquipa
c25da6cadd Merged master into fixing-broken-features 2015-01-09 15:51:47 -04:00
Veronica Aruquipa
9397254133 Merged colosa/processmaker into master 2015-01-09 15:51:22 -04:00
m3ik0
92e86f62cb Were added the right input data. 2015-01-09 15:45:24 -04:00
Julio Cesar Laura Avendaño
dacaf2ff9f Merged in darojas/processmaker/PM-1165 (pull request #1319)
PM-1165 "Se agrega funcion doGetSteps, para obtener los pasos evaluados"
2015-01-09 12:25:50 -04:00
Freddy Daniel Rojas Valda
4ca3d127e4 PM-1165 "Se agrega funcion doGetSteps, para obtener los pasos evaluados" 2015-01-10 12:05:27 -04:00
Freddy Daniel Rojas Valda
3d4c29e510 PM-1165 "Fix value type for del_index" 2015-01-10 11:20:08 -04:00
Freddy Daniel Rojas Valda
0bf53febec PM-1165 "Se agrega funcion doGetSteps, para obtener los pasos evaluados" 2015-01-10 11:17:20 -04:00
Freddy Daniel Rojas Valda
282303d8ac PM-1165 "Se agrega funcion doGetSteps, para obtener los pasos evaluados" 2015-01-10 10:12:08 -04:00
Julio Cesar Laura Avendaño
4b2e55516c Merged in veronicaaruquipa/processmaker/fixing-broken-features (pull request #1317)
The oauth2 tests troubles were solved putting the right token generated and put the correct input data.
2015-01-09 11:44:15 -04:00
m3ik0
ffd924db55 Merge branch 'fixing-broken-features' of https://bitbucket.org/veronicaaruquipa/processmaker into fixing-broken-features 2015-01-09 10:31:53 -04:00
m3ik0
37acfe2047 Merge branch 'master' of https://bitbucket.org/veronicaaruquipa/processmaker into fixing-broken-features 2015-01-09 10:30:09 -04:00
m3ik0
0f67aae686 In order to fix the token generation were re ordered some fragments of code. 2015-01-09 10:29:52 -04:00
m3ik0
2601141788 Were removed the unnecessary comments 2015-01-09 10:20:42 -04:00
m3ik0
730ca62524 The oauth2 tests troubles were solved putting the right token generated and put the correct input data. 2015-01-09 09:58:52 -04:00
Veronica Aruquipa
4636f16608 Merged master into fixing-broken-features 2015-01-09 09:37:46 -04:00
Veronica Aruquipa
4302f62c5f Merged colosa/processmaker into master 2015-01-09 09:37:02 -04:00
Julio Cesar Laura Avendaño
f510e1f54c Merged in darojas/processmaker/PM-1165 (pull request #1315)
PM-1165 "Se modifica funcion doPutCaseVariables, se envia dynaform id. Se agrega funcion doPutExecuteTriggers, para ejecucion de triggers"
2015-01-08 17:44:56 -04:00
Freddy Daniel Rojas Valda
7807f3da17 PM-1165 "Se modifica funcion doPutCaseVariables, se envia dynaform id. Se agrega funcion doPutExecuteTriggers, para ejecucion de triggers" 2015-01-09 16:31:28 -04:00
Freddy Daniel Rojas Valda
0735d3ef33 PM-1165 "Se modifica funcion doPutCaseVariables, se envia dynaform id. Se agrega funcion doPutExecuteTriggers, para ejecucion de triggers" 2015-01-09 15:33:23 -04:00
Freddy Daniel Rojas Valda
bf99195495 PM-1165 "Se modifica funcion doPutCaseVariables, se envia dynaform id. Se agrega funcion doPutExecuteTriggers, para ejecucion de triggers" 2015-01-09 15:28:20 -04:00