fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,404 Commits 1 Branch 0 Tags
be738fb6f73d153bf9b56d186bba2876ee141e33
Commit Graph

13404 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Herbert Saal
be738fb6f7 README.md edited online with Bitbucket 2015-06-29 14:53:31 +00: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
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
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
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
Dante Loayza
8918981c4c Merged in marcoAntonioNina/processmaker/PM-2298 (pull request #2374) 
Improvement fullName and labels - Audilog Kpi
 2015-06-22 15:33:43 -04:00
Marco A. Nina Mena
9f999a2cb5 Improvement fullName and labels - Audilog Kpi 2015-06-22 15:30:10 -04:00
Dante Loayza
9810c28260 Merged in marcoAntonioNina/processmaker/PM-2298 (pull request #2373) 
Improvement fullName and labels - Audilog Kpi
 2015-06-22 15:22:13 -04:00
Marco A. Nina Mena
205313a43f Improvement fullName and labels - Audilog Kpi 2015-06-22 15:19:48 -04:00
Dante Loayza
30cdad60ab Merged in marcoAntonioNina/processmaker/dashboards2 (pull request #2372) 
Improvement tooltip
 2015-06-22 14:09:54 -04:00
Marco A. Nina Mena
a858a59a62 Improvement tooltip 2015-06-22 14:06:56 -04:00
Marco A. Nina Mena
e125d66957 Merge remote-tracking branch 'upstream/dashboards2' into dashboards2 2015-06-22 13:58:37 -04:00
Dante
b8d6b0ed8f tool tips correction 2015-06-22 13:52:06 -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
Julio Cesar Laura Avendaño
b3d1b8b266 Merged in paulis/processmaker/PM-2938 (pull request #2357) 
PM-2938: I solved a notice
 2015-06-22 12:37:38 -04:00
marcelo.cuiza
176597ce1d Merge branch 'master' of bitbucket.org:colosa/processmaker into email_event 2015-06-22 11:14:33 -04:00
Dante Loayza
f0838d6dd7 Merged master into dashboards2 2015-06-22 10:13:54 -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
Marco Antonio Nina Mena
221a2516ae Merged colosa/processmaker into master 2015-06-22 08:39:12 -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
8242385998 Merged in cochalo/processmaker/BUG-17427 (pull request #2318) 
BUG-17427 HTML Editor available for multiple Textarea controls in Dynaforms
 2015-06-19 16:32:04 -04:00
Julio Cesar Laura Avendaño
88a0d2b884 Merged in cochalo/processmaker/BUG-17552 (pull request #2323) 
BUG-17552 Dependatnt checkgroups into grids
 2015-06-19 16:31:20 -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