Commit Graph

11634 Commits

Author SHA1 Message Date
Wendy Nestor
870d584662 Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-04-11 09:52:28 -04:00
Erik Amaru Ortiz
4caa427a52 Merged in wnestor/processmaker (pull request #386)
Avaces en categories, departments, case variables y case tracker y archivos movidos un nivel abajo del directorio admin setup
2014-04-11 09:52:02 -04:00
Marco Antonio Nina
8ce35d5ccc Merge remote branch 'upstream/master' 2014-04-11 09:00:56 -04:00
Daniel Rojas
4217479e14 Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-04-10 15:08:58 -04:00
Wendy Nestor
c4a027f532 Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-04-10 15:02:08 -04:00
Marco Antonio Nina
ad8b713de4 Merge remote branch 'upstream/master' 2014-04-10 14:37:59 -04:00
Julio Cesar Laura Avendaño
286fd93e0c Merged in marcoAntonioNina/processmaker (pull request #388)
Add file translation Mafe
2014-04-10 14:30:29 -04:00
Julio Cesar Laura
d10c84be97 Merge remote branch 'upstream/master' 2014-04-10 14:30:28 -04:00
Marco Antonio Nina
99ce85f02c Add file translation Mafe 2014-04-10 14:26:06 -04:00
Julio Cesar Laura
1bf49c0e2b Merge remote branch 'upstream/master' 2014-04-10 14:13:56 -04:00
julceslauhub
db49cadd64 Merge pull request #2322 from julceslauhub/master
BUGS 14025 and 14476 IMPROVEMENTS
2014-04-10 13:54:21 -03:00
Julio Cesar Laura
f0988abb99 BUGS 14025 and 14476 IMPROVEMENETS 2014-04-10 12:52:13 -04:00
Marco Antonio Nina
0c28857ab0 Add file translation Mafe 2014-04-10 12:30:51 -04:00
Wendy Nestor
c1d1a4657c Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-04-10 10:48:06 -04:00
Wendy Nestor
52424c1e4c Archivos movidos un nivel abajo 2014-04-10 10:32:54 -04:00
Erik Amaru Ortiz
2bc77b625d Merged in victorsl/processmaker (pull request #385)
ProcessMaker-BE "Calendar cambios"
2014-04-10 10:24:42 -04:00
Brayan Osmar Pereyra Suxo
941c7ae37c Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-04-10 10:24:39 -04:00
Erik Amaru Ortiz
546f048bd8 Merged in darojas/processmaker (pull request #383)
Se modifica Upgrade para Files Manager (utilizando la funcion glob)
2014-04-10 10:23:36 -04:00
Erik Amaru Ortiz
23cb168968 Merged in cochalo/processmaker (pull request #384)
Correccion de datos GET en MULTIPART
2014-04-10 10:22:52 -04:00
Julio Cesar Laura
570d6f77b3 Merge remote branch 'upstream/master' 2014-04-10 09:37:31 -04:00
Marco Antonio Nina
d4c2700c75 Merge remote branch 'upstream/master' 2014-04-10 08:49:42 -04:00
Victor Saisa Lopez
08fdc2db58 ProcessMaker-BE "Calendar cambios"
- El atributo STATUS ya no es requerido
- Se modificaron el formato de respuesta de las fechas, esto segun "ADMIN > Settings > Environment > Global Date Format"
- Se cambiaron el formato de los dias a: 1, 2, 3, 4, 5, 6, 7, 0 (0 es el valor que indica todos los dias)
- Se hizo los cambios necesarios en el archivo PHPUnit implicado
2014-04-09 17:01:47 -04:00
Wendy Nestor
9ecf38eac5 ävaces en categories, departments, case variables y case tracker 2014-04-09 16:52:10 -04:00
Brayan Osmar Pereyra Suxo
9727303d36 Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-04-09 16:38:46 -04:00
Freddy Daniel Rojas Valda
13e5488318 Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-04-09 12:21:01 -04:00
Daniel Rojas
70179babbb Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-04-09 12:17:49 -04:00
Brayan Osmar Pereyra Suxo
3079a414c0 Correccion de datos GET en MULTIPART 2014-04-09 11:40:36 -04:00
Daniel Rojas
0099b9c699 Se modifica Upgrade para Files Manager (utilizando la funcion glob) 2014-04-09 11:26:22 -04:00
Erik Amaru Ortiz
9f5759779d Merged in cochalo/processmaker (pull request #382)
Arreglo de datos GET en MULTIPART
2014-04-09 11:02:15 -04:00
Brayan Osmar Pereyra Suxo
d0a1b4859c Arreglo de datos GET en MULTIPART 2014-04-09 10:52:53 -04:00
julceslauhub
7feaef97f3 Merge pull request #2321 from norahmollo/BUG-14476-C
Bug 14476 Condition Editor is not working inside Dynaform Design Preview
2014-04-09 11:08:17 -03:00
norahmollo
d5fa6270af Correccion 2014-04-09 10:00:16 -04:00
Julio Cesar Laura
bac69abbd1 Merge remote branch 'upstream/master' 2014-04-09 09:45:42 -04:00
Erik Amaru Ortiz
3b0f5fafa6 little update, on case that a error occurs while importing existing bpmn process 2014-04-09 09:18:53 -04:00
Erik Amaru Ortiz
a6f7a330f7 little fix, remove a debug die() class 2014-04-09 08:48:04 -04:00
Marco Antonio Nina
1cc83738fb Merge remote branch 'upstream/master' 2014-04-09 08:27:00 -04:00
Freddy Daniel Rojas Valda
d5aa019589 Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-04-08 13:24:37 -04:00
Erik Amaru Ortiz
7f46be1ec8 Merged in victorsl/processmaker (pull request #381)
ProcessMaker-BE "Estandarizando mensajes de error"
2014-04-08 13:19:02 -04:00
Erik Amaru Ortiz
bbdfca1d92 Merged in darojas/processmaker (pull request #379)
Se elimina la clase Cases que se creo por error. Se agregan validaciones en Input Documents y Cases. Se agregan unit test para OUTPUT DOCUMENTS, PROCESS CATEGORY, INPUTDOCUMENTS y se agregan validaciones para OUTPUT DOCUMENTS y PROCESS CATEGORY.
2014-04-08 13:17:06 -04:00
Victor Saisa Lopez
e1a55649dc ProcessMaker-BE "Estandarizando mensajes de error"
- Estandarizando mensajes de error
2014-04-08 13:08:30 -04:00
Daniel Rojas
184e4b6d62 Se agregan validaciones en Input Documents y Cases 2014-04-08 12:50:16 -04:00
julceslauhub
e9e67b518a Merge pull request #2320 from julceslauhub/master
BUG-14476 Condition Editor is not working inside Dynaform Design Preview IMPROVEMENT
2014-04-08 13:22:32 -03:00
Julio Cesar Laura
b472c46b2f BUG-14476 Condition Editor is not working inside Dynaform Design Preview IMPROVEMENT 2014-04-08 12:19:21 -04:00
julceslauhub
59e042e198 Merge pull request #2319 from julceslauhub/master
BUG-14476 Condition Editor is not working inside Dynaform Design Preview SOLVED
2014-04-08 13:11:07 -03:00
Julio Cesar Laura
756a94c62a BUG-14476 Condition Editor is not working inside Dynaform Design Preview SOLVED
- The session variable $_SESSION['CURRENT_DYN_UID'] is unset before apply the conditional show and hide routines

- It has been created a session variable $_SESSION['CONDITION_DYN_UID'] its value is the same as $_SESSION['CURRENT_DYN_UID'] for apply the script code
2014-04-08 12:08:11 -04:00
Daniel Rojas
df5ea3ae23 Se elimina la clase Cases que se creo por error 2014-04-08 11:34:49 -04:00
Freddy Daniel Rojas Valda
e56e2f8646 Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-04-08 11:11:58 -04:00
Julio Cesar Laura
30324c5081 Merge remote branch 'upstream/master' 2014-04-08 09:48:27 -04:00
Daniel Rojas
f399e00d9b Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-04-08 09:45:41 -04:00
Erik Amaru Ortiz
03a41399cd Merged in cochalo/processmaker (pull request #380)
Correcion de limit en cases list
2014-04-08 09:40:30 -04:00