Commit Graph

11634 Commits

Author SHA1 Message Date
Marco Antonio Nina
180bd88709 Merge remote branch 'upstream/master' 2014-10-02 17:07:51 -04:00
Marco Antonio Nina
d3ba2d9a07 Improvement function hashPassword 2014-10-02 17:05:53 -04:00
Marco Antonio Nina
edfba243e7 Improvement change of function hashPassword 2014-10-02 16:31:50 -04:00
Marco Antonio Nina
402e98d0f8 Improvement hashPassword hashType 2014-10-02 15:32:20 -04:00
Julio Cesar Laura Avendaño
64f513af2b Merged in luisfernandosl/processmaker/BUG-440-1 (pull request #848)
BUG 440 "Errores en los web entries..." SOLVED
2014-10-02 15:08:56 -04:00
Luis Fernando Saisa Lopez
d1481f5a81 BUG 378 "Errores en los web entries..." SOLVED 2014-10-02 15:00:30 -04:00
Marco Antonio Nina
bd41c076bf Improvement hashPassword config 2014-10-02 14:56:20 -04:00
Wendy Nestor
21ae6b1130 Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-10-02 12:32:40 -04:00
Erik Amaru Ortiz
929d5471e4 Merged in cochalo/processmaker (pull request #843)
Eliminacion de querys innecesarios
2014-10-02 11:47:10 -04:00
Julio Cesar Laura Avendaño
32a1c1183d Merged in jennydmz/processmaker/PM-241 (pull request #845)
PM-241 Error al restaurar un ws de la version 2.0.45.
2014-10-02 08:56:59 -04:00
jennylee
2878ba09ca PM-241 Error al restaurar un ws de la version 2.0.45.
Se agrego una validacion para q no intente volver la BD a una sola, sino mantenga las 3 BD q maneja originalmente el WS que esta siendo restaurado.
2014-10-01 18:01:17 -04:00
Brayan Osmar Pereyra Suxo
bb72636a36 Eliminacion de querys innecesarios 2014-10-01 17:27:14 -04:00
Wendy Nestor
a3cb5c1ce1 Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-10-01 15:06:33 -04:00
Erik Amaru Ortiz
411fd51f29 Merged in wnestor/processmaker (pull request #827)
Adicion de nuevos escenarios para pruebas con procesos .pmx, en los features report table y web entry
2014-10-01 12:11:33 -04:00
Erik Amaru Ortiz
8f26bd17fe Merged in cochalo/processmaker (pull request #841)
Eliminacion de querys innecesarios
2014-10-01 12:09:59 -04:00
Brayan Osmar Pereyra Suxo
77618e190a Eliminacion de querys innecesarios 2014-10-01 11:36:06 -04:00
Brayan Osmar Pereyra Suxo
1ea570bca0 Eliminacion de querys innecesarios 2014-10-01 11:27:32 -04:00
Wendy Nestor
8c95c44f30 Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-09-30 17:02:40 -04:00
Julio Cesar Laura Avendaño
83d98ec630 Merged in luisfernandosl/processmaker/BUG-14958 (pull request #837)
BUG 14958 "Perfil por creador de proceso" SOLVED
2014-09-30 10:46:11 -04:00
Luis Fernando Saisa Lopez
e1c6f47184 BUG 14958 "Perfil por creador de proceso" SOLVED 2014-09-30 09:47:35 -04:00
Wendy Nestor
cdf1d280ce Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-09-29 16:28:06 -04:00
Freddy Daniel Rojas Valda
8456f94763 Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-09-29 15:50:17 -04:00
Julio Cesar Laura Avendaño
e4c6bbd3c2 Merged in luisfernandosl/processmaker/BUG-378 (pull request #834)
BUG 378 "Upgrading plugins error. The version..." SOLVED
2014-09-29 15:08:42 -04:00
Freddy Daniel Rojas Valda
7b9e7fffeb Se adiciona funcionalidad de lanes y lanesets para project 2014-09-29 14:44:37 -04:00
Wendy Nestor
ebc7f5cbdb Arreglo de sintaxis en case scheduler 2014-09-29 14:21:24 -04:00
Luis Fernando Saisa Lopez
4dbcf0fe0e BUG 378 "Upgrading plugins error. The version..." SOLVED
- Upgrading plugins error. The version never changes. The code is already updated.
- Problema resuelto, en la actualizacion de un plugins, en el listado que se mustra en la columna Version, se mostrara
  la version del plugins actualizado.

  Disponible para la version 2.8 de ProcessMaker.
2014-09-29 13:47:48 -04:00
Richard Yujra
0ea93a6c19 Merge branch 'master' of bitbucket.org:richardnoel/processmaker 2014-09-29 12:07:56 -04:00
Richard Yujra
c14e8e71ba Merged colosa/processmaker into master 2014-09-29 12:06:06 -04:00
Julio Cesar Laura Avendaño
7c9c0f96ae Merged in marcoAntonioNina/processmaker/PM-365 (pull request #833)
PM-365 Upgrade de ls PM2.5 + enterprise 2.0.17 puede dar conflictos IMPROVEMENT
2014-09-29 11:46:28 -04:00
Marco Antonio Nina
aafd2d260c PM-365 Upgrade de ls PM2.5 + enterprise 2.0.17 puede dar conflictos IMPROVEMENT
- The enterprise plugin files cause conflicts.
- A validation was added in function upgrade moving the files to the shared.
2014-09-29 11:38:08 -04:00
Wendy Nestor
b929d4d2d1 Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-09-29 09:09:29 -04:00
Julio Cesar Laura Avendaño
737d817a32 Merged in marcoAntonioNina/processmaker/PM-393 (pull request #832)
PM-393 muetsra un Notice al inicio cuando se realiza... SOLVED
2014-09-29 08:54:53 -04:00
Wendy Nestor
f30d4f309c Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-09-29 08:17:02 -04:00
Marco Antonio Nina
11c721a1ff PM-393 muetsra un Notice al inicio cuando se realiza... SOLVED
- The argument not validated.
- A validation was added in function retore in argument name.
2014-09-26 16:27:16 -04:00
Julio Cesar Laura Avendaño
d50e2af39f Merged in victorsl/processmaker (pull request #831)
BUG-00000 "LDAP Advanced add USR_EMAIL to ComboBox" SOLVED
2014-09-26 15:10:39 -04:00
Victor Saisa Lopez
babf5fc562 BUG-00000 "LDAP Advanced add USR_EMAIL to ComboBox" SOLVED
- LDAP Advanced add USR_EMAIL to ComboBox
2014-09-26 15:02:48 -04:00
Marco Antonio Nina
db80e8a0fa PM-365 Upgrade de ls PM2.5 + enterprise 2.0.17 puede dar conflictos IMPROVEMENT
- The enterprise plugin files cause conflicts.
- A validation was added in function upgrade moving the files to the shared.
2014-09-26 14:18:59 -04:00
Marco Antonio Nina
1bb1cabfad PM-365 Upgrade de ls PM2.5 + enterprise 2.0.17 puede dar conflictos IMPROVEMENT
- The enterprise plugin files cause conflicts.
- A validation was added in function upgrade moving the files to the shared.
2014-09-26 14:15:59 -04:00
Julio Cesar Laura Avendaño
2e3a961f14 Merged in marcoAntonioNina/processmaker (pull request #829)
Improvement data schema
2014-09-26 14:15:00 -04:00
Marco Antonio Nina
4d1ebe3479 Improvement data schema 2014-09-26 14:00:22 -04:00
Marco Antonio Nina
2327b76190 PM-365 Upgrade de ls PM2.5 + enterprise 2.0.17 puede dar conflictos SOLVED
- The enterprise plugin files cause conflicts.
- A validation was added in function upgrade moving the files to the shared.
2014-09-26 13:00:16 -04:00
Wendy Nestor
3abb000efe Adicion de nuevos escenarios para pruebas con procesos .pmx, en los features report table y web entry 2014-09-26 12:22:15 -04:00
Julio Cesar Laura Avendaño
8857413ae0 Merged in jennydmz/processmaker/PM-397 (pull request #826)
PM-397 Arreglar el formulario de creacion/edicion de Inputdocs
2014-09-26 12:03:31 -04:00
Freddy Daniel Rojas Valda
ea211b4c82 Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-09-26 12:00:54 -04:00
jennylee
3cb509b4a0 PM-397 Arreglar el formulario de creacion/edicion de Inputdocs
Se corrigieron los siguientes errores:
 -  Se agrego * en todos los campos requeridos.
 -  Se aumento '*.*' como valor por defecto en el campo 'Allowed file extensions'
 -  Se valido que el campo 'Maximum file size' no permita vacio.
2014-09-26 11:46:11 -04:00
Erik Amaru Ortiz
a56fade470 Merged in cochalo/processmaker (pull request #825)
Correccion de instancia de variable
2014-09-26 11:16:09 -04:00
Brayan Osmar Pereyra Suxo
454bf006b0 Correccion de instancia de variable 2014-09-26 11:03:15 -04:00
Brayan Osmar Pereyra Suxo
8a01bce933 Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-09-26 10:41:04 -04:00
Julio Cesar Laura Avendaño
03a010ec48 Merged in marcoAntonioNina/processmaker/PM-399 (pull request #823)
PM-399 Las funcionalidades del enterprise ya no tiene SOLVED
2014-09-26 10:04:00 -04:00
Julio Cesar Laura Avendaño
608c651523 Merged in luisfernandosl/processmaker/BUG-14958 (pull request #824)
BUG 14958 "Perfil por creador de proceso" SOLVED
2014-09-26 09:01:25 -04:00