Commit Graph

11634 Commits

Author SHA1 Message Date
Wendy Nestor
9d092236ad Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-06-03 09:04:44 -04:00
Daniel Rojas
7d52a1f7cb Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-06-03 08:51:47 -04:00
jonathan quispe
1a69205d31 Merged colosa/processmaker into master 2014-06-02 16:57:53 -04:00
Julio Cesar Laura Avendaño
af1efd2256 Merged in julceslau/processmaker (pull request #515)
Merge code from github.com to bitbucket repo 2014-06-02
2014-06-02 16:25:32 -04:00
Julio Cesar Laura
6ae64971f1 Merge code from github.com to bitbucket repo 2014-06-02 2014-06-02 16:23:05 -04:00
Julio Cesar Laura
47c46083a6 Merge remote branch 'upstream/master' 2014-06-02 16:20:20 -04:00
Julio Cesar Laura
022e2a8248 Merge remote branch 'upstream/master' 2014-06-02 16:19:05 -04:00
Richard Yujra
2eb791a336 Merged colosa/processmaker into master 2014-06-02 15:16:39 -04:00
Marco Antonio Nina
2a1415b7e0 Merge remote branch 'upstream/master' 2014-06-02 14:56:02 -04:00
Victor Saisa Lopez
a94112aabf Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-06-02 14:10:34 -04:00
Erik Amaru Ortiz
ec381248df rake file update 2014-06-02 14:09:33 -04:00
Victor Saisa Lopez
ab887b1325 Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-06-02 14:04:31 -04:00
julceslauhub
f115d60768 Merge pull request #2432 from julceslauhub/master
BUG 15071 Problemas en la extension de un output con la opcion "By clicking on the generated file link=Download the file" SOLVED
2014-06-02 13:48:05 -04:00
Julio Cesar Laura
209b6591b7 BUG 15071 Problemas en la extension de un output con la opcion "By clicking on the generated file link=Download the file" SOLVED
- Missing validation in the dropdown class
- Added validation in the dropdown class to add missing option only when the field is render in view mode
2014-06-02 13:35:25 -04:00
Erik Amaru Ortiz
9a5fe27b0b rake file update 2014-06-02 13:31:44 -04:00
Victor Saisa Lopez
64b1393e4f Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-06-02 12:59:13 -04:00
Daniel Rojas
8a5eef5cf5 Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-06-02 11:28:43 -04:00
Erik Amaru Ortiz
3c264b320e Merged in victorsl/processmaker (pull request #511)
ProcessMaker-BE "Role and Permission (Endpoints)"
2014-06-02 11:27:58 -04:00
Erik Amaru Ortiz
0785c76d51 Merged in wnestor/processmaker (pull request #512)
Culminacion de los behat del feature case tasks
2014-06-02 11:27:27 -04:00
Erik Amaru Ortiz
24cd1e4ece Merged in darojas/processmaker (pull request #514)
Se modifica end point cases tasks
2014-06-02 11:26:47 -04:00
Freddy Daniel Rojas Valda
5aefbbd044 Se modifica end point cases tasks 2014-06-02 11:19:58 -04:00
Freddy Daniel Rojas Valda
e3f441d188 Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-06-02 10:57:26 -04:00
jennylee
3d306b6707 Solving conflicts. 2014-06-02 10:53:51 -04:00
Daniel Rojas
e7401e3126 Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-06-02 09:25:02 -04:00
jonathan quispe
c6693f6297 Merged colosa/processmaker into master 2014-05-30 09:24:57 -04:00
Richard Yujra
fecb9ab8de Merge branch 'master' of bitbucket.org:richardnoel/processmaker 2014-05-30 09:17:33 -04:00
Richard Yujra
f6ee6aac6c Merged colosa/processmaker into master 2014-05-30 09:16:59 -04:00
Victor Saisa Lopez
2e88100c56 Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-05-30 09:11:10 -04:00
Wendy Nestor
52cfe43af2 Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-05-30 09:04:18 -04:00
Marco Antonio Nina
36d1722519 Merge remote branch 'upstream/master' 2014-05-30 08:47:03 -04:00
julceslauhub
b6f057105e Merge pull request #2431 from luisfernandosl/BUG-15080
BUG 15080 "my case forms and documents" no..." SOLVED
2014-05-29 17:17:33 -04:00
Erik Amaru Ortiz
059094027f little tweaks to show pmui and mafe versions on system information section 2014-05-29 17:17:15 -04:00
Erik Amaru Ortiz
29790cbfbd Updating PM Rakefile 2014-05-29 17:16:35 -04:00
julceslauhub
dd5ebcb16e Merge pull request #2430 from Jennydmz/master
BUG-15068 PMFPauseCase dosen`t pause the case whrn using the trigger wiz...
2014-05-29 17:07:09 -04:00
Erik Amaru Ortiz
e383ae49e5 Merged in cochalo/processmaker (pull request #513)
Correccion de label añadiendo TRANSLATIONS
2014-05-29 17:07:01 -04:00
Luis Fernando Saisa Lopez
67ef1e7d4b BUG 15080 "my case forms and documents" no..." SOLVED
- "my case forms and documents" no muestra el formulario.
- Problema resuelto, cuando se realiza el seguimiento de un caso en "my case forms and documents" en Case Tracker, al
  seleccionar un dynaform de la lista el formulario se muestra correctamente.

  Disponible para la version 2.5.3 de ProcessMaker.
2014-05-29 17:01:13 -04:00
jennylee
342436d82f BUG-15068 PMFPauseCase dosen`t pause the case whrn using the trigger wizzard.
The validation for the not required parameter "unpauseDate" was wrong. When this parameter was empty the validation was taking this like this has a date, so it was trying to check the date format, and this was giving an error.

The validation was changed to only let strings of 10 or more characters go into the next validation where the format of the date is checked.
2014-05-29 16:49:33 -04:00
jonathan quispe
103e982dfc Merged colosa/processmaker into master 2014-05-29 16:35:19 -04:00
Brayan Osmar Pereyra Suxo
cf80d23ecf Correccion de espacios 2014-05-29 15:46:55 -04:00
Brayan Osmar Pereyra Suxo
4b9c5df53e Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-05-29 15:39:48 -04:00
Brayan Osmar Pereyra Suxo
8800f47343 Correccion de conflictos 2014-05-29 15:38:10 -04:00
Brayan Osmar Pereyra Suxo
db6c8fb6f8 Correccion de label añadiendo TRANSLATIONS 2014-05-29 15:33:27 -04:00
Wendy Nestor
dfcae28205 Culminacion de los behat del feature case tasks 2014-05-29 15:03:09 -04:00
Victor Saisa Lopez
81d4700e7e ProcessMaker-BE "Role and Permission (Endpoints)"
- Se han implementado los siguientes Endpoints:
    GET    /api/1.0/{workspace}/role/{rol_uid}/permissions?filter={filter}&start={start}&limit={limit}
    GET    /api/1.0/{workspace}/role/{rol_uid}/available-permissions?filter={filter}&start={start}&limit={limit}
    POST   /api/1.0/{workspace}/role/{rol_uid}/permission
    DELETE /api/1.0/{workspace}/role/{rol_uid}/permission/{per_uid}
2014-05-29 13:10:11 -04:00
Victor Saisa Lopez
649f543773 Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-05-29 13:09:12 -04:00
Erik Amaru Ortiz
0b5ff94f21 update getting versions an fixed for fonts dir 2014-05-29 12:59:20 -04:00
Erik Amaru Ortiz
3910464ece Merged in wnestor/processmaker (pull request #510)
Modificacion de sintaxis en el feature project export/import y culminacion de los behat del feature roles
2014-05-29 12:55:16 -04:00
Erik Amaru Ortiz
944918231a Merged in victorsl/processmaker (pull request #509)
ProcessMaker-BE "Role and User (Endpoints)"
2014-05-29 12:54:52 -04:00
julceslauhub
acb7b34880 Merge pull request #2429 from marcoAntonioNina/BUG-14980
BUG-14980 Validacion Date en Pmtables no es respetada SOLVED
2014-05-29 12:01:23 -04:00
jonathan quispe
eae55b9541 Merged colosa/processmaker into master 2014-05-29 10:04:05 -04:00