Commit Graph

13428 Commits

Author SHA1 Message Date
Quenta Ronald
7d2f3cebd9 Merged colosa/processmaker into master 2015-06-30 09:28:36 -04:00
Julio Cesar Laura Avendaño
7659655378 Merged in mcuiza/processmaker/PM-3034 (pull request #2386)
PM-3034
2015-06-30 08:58:45 -04:00
Quenta Ronald
8b1c57395e Merged colosa/processmaker into master 2015-06-30 08:35:10 -04:00
Julio Cesar Laura Avendaño
bc0cf966c6 Merged in luisfernandosl/processmaker/PM-1459 (pull request #2388)
PM 1459 "Script Task" SOLVED
2015-06-29 17:43:07 -04:00
Luis Fernando Saisa Lopez
e9f33757a9 PM 1459 "Script Task" SOLVED 2015-06-29 17:19:59 -04:00
marcelo.cuiza
1ebe374878 PM-3034
No se puede ejecutar procesos con asignacion ValueBased y self service value based

Causa: la variable se seteaba con el valor que tenia en el formulario y no con el que se le daba en el trigger.
Solucion: se modifico el orden para hacer merge de los arrays
2015-06-29 16:35:27 -04:00
Julio Cesar Laura Avendaño
d60b3a265c Merged in mcuiza/processmaker/email_event_solved (pull request #2384)
email event
2015-06-29 15:03:37 -04:00
Julio Cesar Laura Avendaño
84f57168d2 Merged in qronald/processmaker (pull request #2377)
refactorizacion del endpoitn route-case y adicion de un nuevo endpoint
2015-06-29 15:00:22 -04:00
Ronald Quenta
f75520a22b Merge branch 'master' of bitbucket.org:qronald/processmaker 2015-06-29 14:45:32 -04:00
Quenta Ronald
1c50651062 Merged colosa/processmaker into master 2015-06-29 14:44:34 -04:00
Ronald Quenta
10ef839471 fix in wsBase, add field del_index in list, fix in execute trigger 2015-06-29 14:44:04 -04:00
marcelo.cuiza
d32cee26be email event
remove php warning trace
2015-06-29 12:52:18 -04:00
Herbert Saal
be738fb6f7 README.md edited online with Bitbucket 2015-06-29 14:53:31 +00:00
Quenta Ronald
b9e6e06361 Merged colosa/processmaker into master 2015-06-29 09:06:15 -04:00
Julio Cesar Laura Avendaño
dab95735d5 Merged in dashboards2 (pull request #2370)
KPIs Inbox, queue time modifications
2015-06-26 17:32:35 -04:00
Ronald Quenta
20b0d1c717 Merge remote branch 'pm/master' 2015-06-26 13:52:15 -04:00
Quenta Ronald
4d94acbcce Merged colosa/processmaker into master 2015-06-26 13:48:50 -04:00
Julio Cesar Laura Avendaño
1a68783356 Merged in mcuiza/processmaker/email_event_solved (pull request #2380)
Email Event
2015-06-26 13:44:44 -04:00
Julio Cesar Laura Avendaño
9c294ab11c Merged in dheeyi/processmaker/PM-3019 (pull request #2376)
PM-3019 0017664: File manager Template it does not allow to edit PM 3.0.0.4
2015-06-26 09:42:54 -04:00
Julio Cesar Laura Avendaño
bf0d88af15 Merged in paulis/processmaker/PM-1124 (pull request #2353)
SSO without plexel
2015-06-26 09:32:51 -04:00
Dante
60ea36a601 calendar calculate correction 2015-06-25 18:08:10 -04:00
Dante Loayza
43218d85c6 Merged master into dashboards2 2015-06-25 17:41:26 -04:00
marcelo.cuiza
362a6f63c1 correccion en schema.xml 2015-06-25 17:37:06 -04:00
marcelo.cuiza
8eaf4fbcbb email_event_solved
Conflicts:
	workflow/engine/config/schema.xml
2015-06-25 16:57:18 -04:00
marcelo.cuiza
b1a62f2b9f email_event 2015-06-25 16:41:28 -04:00
marcelo.cuiza
4be1a3dbd6 email_event 2015-06-25 16:31:04 -04:00
marcelo.cuiza
5180199058 solving conflicts 2015-06-25 15:59:34 -04:00
marcelo.cuiza
0fb6241bd9 solving conflicts 2015-06-25 15:35:29 -04:00
Julio Cesar Laura Avendaño
9be6a80824 Merged in luisfernandosl/processmaker/PM-1459 (pull request #2379)
PM 1459 "ProcessMaker-MA: Script Task Definition (endpoints)" SOLVED
2015-06-25 15:13:37 -04:00
marcelo.cuiza
e72277f964 endpoints, running cases, export, import, files manager issues 2015-06-25 14:31:38 -04:00
Luis Fernando Saisa Lopez
73321af284 PM 1459 "ProcessMaker Backend: Script Task (endpoints)" SOLVED
> ProcessMaker Backend" Script Task (endpoints)"

  - Se han implementado los siguientes Endpoints:
      GET    /api/1.0/{workspace}/project/{prj_uid}/script-tasks
      GET    /api/1.0/{workspace}/project/{prj_uid}/script-task/{scrtas_uid}
      GET    /api/1.0/{workspace}/project/{prj_uid}/script-task/activity/{act_uid}
      POST   /api/1.0/{workspace}/project/{prj_uid}/script-task
      PUT    /api/1.0/{workspace}/project/{prj_uid}/script-task/{scrtas_uid}
      DELETE /api/1.0/{workspace}/project/{prj_uid}/script-task/{scrtas_uid}

  - Se agrego la funcionalidad necesaria en el DESIGNER
  - Exportar/Importar, se incluyen los registros de la tabla SCRIPT_TASK
  - Eliminar Projecto, se eliminan los registros de la tabla SCRIPT_TASK
  - Runing case
2015-06-25 13:54:32 -04:00
Luis Fernando Saisa Lopez
047d9428f5 Merge branch 'master' of bitbucket.org:colosa/processmaker into PM-1459 2015-06-25 12:02:15 -04:00
Julio Cesar Laura Avendaño
f17a612c93 Merged in paulis/processmaker/PM-1060 (pull request #2361)
PM-1060: LdapAdvanced Feature in core
2015-06-25 10:58:10 -04:00
Luis Fernando Saisa Lopez
287365537b PM 1459 "ProcessMaker-MA: Script Task Definition (endpoints)" SOLVED
> ProcessMaker-MA "Script Task Definition (endpoints)"

  - Se han implementado los siguientes Endpoints:
      GET    /api/1.0/{workspace}/project/{prj_uid}/script-tasks
      GET    /api/1.0/{workspace}/project/{prj_uid}/script-task/{scrtas_uid}
      GET    /api/1.0/{workspace}/project/{prj_uid}/script-task/activity/{act_uid}
      POST   /api/1.0/{workspace}/project/{prj_uid}/script-task
      PUT    /api/1.0/{workspace}/project/{prj_uid}/script-task/{scrtas_uid}
      DELETE /api/1.0/{workspace}/project/{prj_uid}/script-task/{scrtas_uid}

  - Se agrego la funcionalidad necesaria en el DESIGNER
  - Exportar/Importar, se incluyen los registros de la tabla SCRIPT_TASK
  - Eliminar Projecto, se eliminan los registros de la tabla SCRIPT_TASK
  - Runing case
2015-06-24 18:28:20 -04:00
Ronald Quenta
bbe1200ff7 refactor endpoint get assignment users 2015-06-24 17:30:08 -04:00
Ronald Quenta
5df0f95751 Merge branch 'master' of bitbucket.org:qronald/processmaker 2015-06-24 14:36:27 -04:00
Ronald Quenta
ce0274df93 refactorizacion del endpoitn route-case y adicion de un nuevo endpoint 2015-06-24 14:36:06 -04:00
dheeyi
361c372329 PM-3019
0017664: File manager Template it does not allow to edit PM 3.0.0.4
2015-06-24 14:32:03 -04:00
Ronald Quenta
e0d18f6342 Merge remote branch 'pm/master' 2015-06-24 11:29:11 -04:00
Quenta Ronald
0971c3768e Merged colosa/processmaker into master 2015-06-24 11:27:27 -04:00
dheeyi
e90b495c35 Merge branch 'master' of bitbucket.org:dheeyi/processmaker 2015-06-24 08:55:38 -04:00
william barra
f563dd8b18 Merged colosa/processmaker into master 2015-06-24 08:56:02 -04:00
dheeyi
3bd416a71b Merge remote branch 'upstream/master' 2015-06-24 08:54:58 -04:00
Julio Cesar Laura Avendaño
5ad4469e12 Merged in dheeyi/processmaker/PM-2647 (pull request #2328)
PM-2647 Designer > BPMN Designer > Porcess Supervisors > Steps: Estandarizar la ventana al nuevo diseñue se solicito para el diseñr BPMN
2015-06-24 08:39:40 -04:00
Julio Cesar Laura Avendaño
6bdab37475 Merged in dheeyi/processmaker/PM-803 (pull request #2367)
PM-803 Se puede crear un PMTable con fields con los caracteres & %
2015-06-24 08:38:41 -04:00
Julio Cesar Laura Avendaño
3f78604a29 Merged in dheeyi/processmaker/PM-2214 (pull request #2375)
PM-2214
2015-06-24 08:37:48 -04:00
dheeyi
d9320a9d15 PM-803
Se puede crear un PMTable con fields con los caracteres & %
2015-06-23 14:14:25 -04:00
dheeyi
ba475d3b26 Merge remote branch 'upstream/master' into PM-803 2015-06-23 12:52:31 -04:00
dheeyi
a7f518fb08 PM-2214
DesignerBPMN>Triggers>PMFunctions : La funcion predefinida orderGrid() no funciona
2015-06-23 12:04:19 -04:00
dheeyi
0cd2fd15e1 Merge remote branch 'upstream/master' 2015-06-23 12:00:12 -04:00