Commit Graph

18243 Commits

Author SHA1 Message Date
Daniel Rojas
33e65331a7 Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-04-07 09:03:27 -04:00
Julio Cesar Laura
0adf018278 Merge remote branch 'upstream/master' 2014-04-07 09:01:42 -04:00
Daniel Rojas
54f16d72cc Se modifica test unit para CASES 2014-04-04 16:58:11 -04:00
Daniel Rojas
1a0a3d827f Se agrega test unit para OUTPUT DOCUMENT. Se agrega una linea en la respuesta de upload. 2014-04-04 16:40:12 -04:00
Marco Antonio Nina
4bc609d774 Merge remote branch 'upstream/master' 2014-04-04 11:40:08 -04:00
Luis Fernando Saisa Lopez
1ae64752d8 BUG 14093 "User is able to delete groups and..." SOLVED
- User is able to delete groups and it is being used by a process.
- Problema resuelto, cuando se elimina a un grupo por ADMIN>USERS>GROUPS por un usuario, este grupo puede ser eliminado
  sin restriccion aunque el grupo este asignado a una tarea lo cual no es correcto.

  Se hace una validacion que verifica si el grupo esta asignado a una tarea, el grupo NO puede ser eliminado, se eliminara
  el grupo cuando este no este asignado a ninguna tarea.

  Disponible para la version 2.5.3 de ProcessMaker.
2014-04-04 10:42:33 -04:00
Erik Amaru Ortiz
9787a0157b Temporarily disabled category api alias 2014-04-04 10:31:21 -04:00
Richard Yujra
a2d55b70e5 Merge remote branch 'upstream/master' 2014-04-04 10:30:39 -04:00
Marco Antonio Nina
97a57d3e9f Merge remote branch 'upstream/master' 2014-04-04 08:47:57 -04:00
erik ao
391484481c Merged in victorsl/processmaker (pull request #371)
ProcessMaker-BE "Calendar (PHPUnit)"
2014-04-03 17:10:57 -04:00
Victor Saisa Lopez
55d9c25d48 ProcessMaker-BE "Calendar (PHPUnit)"
- Small fix, method replaced: setUp() by setUpBeforeClass()
2014-04-03 15:46:49 -04:00
erik ao
6f7aead069 Merged in victorsl/processmaker (pull request #370)
ProcessMaker-BE "Calendar (PHPUnit)"
2014-04-03 15:09:29 -04:00
Victor Saisa Lopez
af95a42e7b ProcessMaker-BE "Calendar (PHPUnit)"
- PHPUnit for ../ProcessMaker/BusinessModel/Calendar.php
2014-04-03 13:03:32 -04:00
Erik Amaru Ortiz
51692159e8 Updating phpunit execution task on build.xml for jenkins, disabling colors 2014-04-03 12:59:26 -04:00
Erik Amaru Ortiz
aad2968335 Updating phpunit execution task on build.xml for jenkins 2014-04-03 12:49:06 -04:00
erik ao
a2f8b17d6c Merged in cochalo/processmaker (pull request #369)
Correcion en error de body en MULTIPART
2014-04-03 12:36:03 -04:00
erik ao
a9c8186b8e Merged in wnestor/processmaker (pull request #368)
Errores de sintaxis en fetures cases actions y process permisssions
2014-04-03 12:32:02 -04:00
Brayan Osmar Pereyra Suxo
5b576b43fa Correcion en error de body en MULTIPART 2014-04-03 12:24:20 -04:00
Brayan Osmar Pereyra Suxo
7449f3e34a Arreglo de conflictos 2014-04-03 12:20:34 -04:00
Brayan Osmar Pereyra Suxo
ef70d65ffc Correcion en error de body en MULTIPART 2014-04-03 12:17:47 -04:00
Erik Amaru Ortiz
a43c1d36c4 Updating build.xml and phpunit.xml to add and run API unit tests suite 2014-04-03 12:06:52 -04:00
Wendy Nestor
709db90062 Errores de sintaxis en fetures cases actions y process permisssions 2014-04-03 11:57:35 -04:00
Erik Amaru Ortiz
1847ed4549 Updating phpunit execution task on build.xml for jenkins 2014-04-03 11:19:48 -04:00
erik ao
e9618fd3bc Merged in wnestor/processmaker (pull request #367)
error de sintaxis en output document cases
2014-04-03 11:15:29 -04:00
Wendy Nestor
193c090451 error de sintaxis en output document cases 2014-04-03 11:09:54 -04:00
erik ao
bd5ffdd3b4 Merged in wnestor/processmaker (pull request #366)
Error de sintaxis en case note
2014-04-03 10:41:20 -04:00
Wendy Nestor
3160985f33 Error de sintaxis en case note 2014-04-03 10:35:17 -04:00
Erik Amaru Ortiz
4db659ff8b Updating phpunit execution task on build.xml for jenkins 2014-04-03 10:31:06 -04:00
erik ao
cd135a9477 Merged in wnestor/processmaker (pull request #365)
Arreglos en cases actions, case note, case variables y output document
2014-04-03 10:27:15 -04:00
Wendy Nestor
3e2420bc55 Arreglos en cases actions, case note, case variables y output document 2014-04-03 10:22:37 -04:00
erik ao
6d7777f655 Merged in darojas/processmaker (pull request #364)
Se agrega test unit para PROCESS CATEGORY
2014-04-03 10:11:14 -04:00
Daniel Rojas
20fadab8d9 Se agrega test unit para PROCESS CATEGORY 2014-04-03 09:14:39 -04:00
Marco Antonio Nina
02b993b03d Merge remote branch 'upstream/master' 2014-04-03 08:47:31 -04:00
Wendy Nestor
e564861a67 Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-04-03 08:43:16 -04:00
erik ao
fb2c900317 Merged in wnestor/processmaker (pull request #363)
Avance de los features cases actions y cases list
2014-04-03 08:40:20 -04:00
Wendy Nestor
6f7a085875 Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-04-02 21:56:57 -04:00
Erik Amaru Ortiz
a50bb11e5c Routine to cache api.ini file to .php file to improve the performace to API Responses 2014-04-02 18:08:34 -04:00
Erik Amaru Ortiz
adee81e1ac Moving Extension\Restler\UploadFormat class 2014-04-02 17:23:31 -04:00
Wendy Nestor
1a70103cff Avance de los features cases actions y cases list 2014-04-02 17:17:44 -04:00
norahmollo
c4bc0e6222 BUG-14387 Error en el contador de casos del inbox
Se verifico una diferencia entre la consulta que muestra los casos y la consulta que cuenta los casos.
2014-04-02 17:03:43 -04:00
Daniel Rojas
ce0dae6a01 Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-04-02 17:03:08 -04:00
Erik Amaru Ortiz
8b823af4ae Refactoring of classes that where in workflow/engine/src , now all of them have a unique parent namespace \ProcessMaker 2014-04-02 17:02:02 -04:00
norahmollo
ab071ef7fa Merge remote branch 'upstream/master' into BUG-14387 2014-04-02 16:59:49 -04:00
Brayan Osmar Pereyra Suxo
1659d68aeb Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-04-02 16:59:26 -04:00
Daniel Rojas
7f5d9ca048 Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-04-02 16:54:07 -04:00
Erik Amaru Ortiz
4d59bc2d5a Refactoring of classes that where in workflow/engine/src , now all of them have a unique parent namespace \ProcessMaker 2014-04-02 16:51:28 -04:00
Brayan Osmar Pereyra Suxo
6b0b83167f Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-04-02 16:50:13 -04:00
Daniel Rojas
7bc831c4e9 Se agrega test unit para PROCESS CATEGORY. Se modifican respuestas de PROCESS CATEGORY. 2014-04-02 16:35:31 -04:00
Brayan Osmar Pereyra Suxo
f291359bcf Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-04-02 16:06:27 -04:00
erik ao
59769103fb Merged in wnestor/processmaker (pull request #359)
eliminacion archivo de la carpeta public html
2014-04-02 15:55:46 -04:00