Commit Graph

4217 Commits

Author SHA1 Message Date
Luis Fernando Saisa Lopez
e9f33757a9 PM 1459 "Script Task" SOLVED 2015-06-29 17:19:59 -04:00
Roly Rudy Gutierrez Pinto
1678fb8279 PM-2907 2015-06-29 16:51:59 -04:00
Ronald Quenta
f75520a22b Merge branch 'master' of bitbucket.org:qronald/processmaker 2015-06-29 14:45:32 -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
ricardo
8a5d44a8c7 0017676: Change warning message in the output of the "processmaker workspace-restore" command.SOLVED
al realizar el comando ./processmaker workspace-restore daba un mensaje que no era lo suficientemente claro
se soluciono haciendo el cambio del texto en el archivo class.wsTools.php y corrigiendo con backslash para el uso de variables
2015-06-29 11:27:34 -04: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
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
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
marcelo.cuiza
e72277f964 endpoints, running cases, export, import, files manager issues 2015-06-25 14:31:38 -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
ce0274df93 refactorizacion del endpoitn route-case y adicion de un nuevo endpoint 2015-06-24 14:36:06 -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
dheeyi
a7f518fb08 PM-2214
DesignerBPMN>Triggers>PMFunctions : La funcion predefinida orderGrid() no funciona
2015-06-23 12:04:19 -04:00
Marco A. Nina Mena
9f999a2cb5 Improvement fullName and labels - Audilog Kpi 2015-06-22 15:30:10 -04:00
Marco A. Nina Mena
205313a43f Improvement fullName and labels - Audilog Kpi 2015-06-22 15:19:48 -04:00
Julio Cesar Laura Avendaño
2713b6f1e7 Merged in paulis/processmaker/PM-2923 (pull request #2366)
PM-2923: I used refreshTotal only when the userUid isn't empty (Self service)
2015-06-22 12:40:42 -04:00
Julio Cesar Laura Avendaño
fbd199a69a Merged in paulis/processmaker/PM-2973 (pull request #2369)
PM-2973: classic, despues de derivar no actualiza la data de la grilla
2015-06-22 12:38:59 -04:00
marcelo.cuiza
176597ce1d Merge branch 'master' of bitbucket.org:colosa/processmaker into email_event 2015-06-22 11:14:33 -04:00
Marco A. Nina Mena
9d250c7291 Merge branch 'master' of bitbucket.org:marcoAntonioNina/processmaker into dashboards2 2015-06-22 08:47:38 -04:00
Paula V. Quispe
18eff11129 PM-2973 2015-06-19 18:01:40 -04:00
Paula V. Quispe
39efbba12b PM-2973: I solve some issues 2015-06-19 17:24:16 -04:00
Julio Cesar Laura Avendaño
0414de96da Merged in cochalo/processmaker/BUG-17411 (pull request #2319)
BUG-17411 Output document generados con smarty para codigo en template
2015-06-19 16:30:53 -04:00
Paula V. Quispe
7db09b642a PM-2035: I added some validations 2015-06-19 16:28:56 -04:00
Paula V. Quispe
7398b624ee PM-1124: I added the new features in array 2015-06-19 15:46:21 -04:00
Paula V. Quispe
5f4fedbaaa PM-1060: I added marcas 2015-06-19 15:42:55 -04:00
Dante
4e9e58e935 taking account of queue time for indicators 2015-06-19 10:20:47 -04:00
marcelo.cuiza
42f9c23e61 Merge branch 'master' into email_event 2015-06-18 18:47:13 -04:00
Paula V. Quispe
7679bff3d9 PM-2935: I solved some issue with Batch routing 2015-06-18 18:32:54 -04:00
marcelo.cuiza
1af7b5865e email_event backend 2015-06-18 18:12:35 -04:00
Paula V. Quispe
b7b4a1d14b PM-2923: Self service value based in Subprocess doesn't work 2015-06-18 16:35:47 -04:00
Paula V. Quispe
9a184c4c60 PM-2923: I used refreshTotal only when the userUid isn't empty (Self service) 2015-06-18 11:14:53 -04:00
Dante
8955b60d36 resolution of integration conflicts with PM Final mods 2015-06-18 08:46:57 -04:00
Dante Loayza
31f1d8a80f Merged master into dashboards2 2015-06-17 17:22:00 -04:00
dheeyi
b658b0d2d0 PM-2647
Designer > BPMN Designer > Porcess Supervisors > Steps: Estandarizar la ventana al nuevo diseñue se solicito para el diseñr BPMN
2015-06-17 15:32:41 -04:00
Paula V. Quispe
859eb80db2 PM-1124: I changed the class name 2015-06-17 14:16:55 -04:00
Paula V. Quispe
987f140c2a PM-1124: I changed the class name 2015-06-17 13:56:25 -04:00
Paula V. Quispe
99981a00be PM-1124: I changed the class name 2015-06-17 13:54:52 -04:00
Julio Cesar Laura Avendaño
1efc67a0f7 Merged in victorsl/processmaker/PM-2917 (pull request #2356)
PM-2917 "Case Scheduler issues" SOLVED
2015-06-17 12:30:33 -04:00