Commit Graph

8515 Commits

Author SHA1 Message Date
Ronald Quenta
20b0d1c717 Merge remote branch 'pm/master' 2015-06-26 13:52:15 -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
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
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
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
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
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
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
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
Julio Cesar Laura
2a20e92d56 PM-2914 La función RouteCase no puede probarse desde ADMIN/WEB SERVICES TEST SOLVED 2015-06-19 15:31:29 -04:00
Julio Cesar Laura
673ce17e3f PM-2876 0017471 Change text from "ProcessMaker Dev Tools/User Applications" to "User Applications" SOLVED 2015-06-19 15:07:50 -04:00
Paula V. Quispe
31ac6beee1 PM-1124: I added marcas 2015-06-19 11:44:02 -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
ff3f0c4be0 PM-2973: I solved a notice 2015-06-18 14:12:23 -04:00
dheeyi
d89c7b7a2b PM-803
Se puede crear un PMTable con fields con los caracteres & %
2015-06-18 13:14:34 -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 Loayza
4288190b45 Merged in marcoAntonioNina/processmaker/dashboards2 (pull request #2364)
NDD-75 El inbox da error de filterStatus
2015-06-18 10:44:47 -04:00
Marco Antonio Nina Mena
98d79f4906 NDD-75 El inbox da error de filterStatus
- se valido para no depender solo de la licencia y version de PM.
2015-06-18 10:40:56 -04:00
Dante
38f8468163 Merge branch 'dashboards2' of bitbucket.org:colosa/processmaker into dashboards2 2015-06-18 10:26:35 -04:00
Dante
e8258b2e63 NDD70, 66, 73 2015-06-18 10:25:57 -04:00
Marco Antonio Nina Mena
232a89fb0d Merge branch 'dashboards2' of bitbucket.org:colosa/processmaker into dashboards2 2015-06-18 10:16:11 -04:00
Dante Loayza
a3c3d00f72 Merged in marcoAntonioNina/processmaker/dashboards2 (pull request #2360)
Delete graphic task status
2015-06-18 10:15:02 -04:00
Marco Antonio Nina Mena
2e0198622d NND-74 Agregar un total queue
- Se agrego la columna en usr_reporting, schema.xml, schema.sql
2015-06-18 10:09:38 -04:00