Commit Graph

18243 Commits

Author SHA1 Message Date
ricardo
7d5a4394d4 0017680: "processmaker workspace-restore" tries to restore when no workspace is specified SOLVED
al colocar el comando de restore sin un workspace daba un error poco entendible
se soluciono agregando una condicion con la cual si al ingresar el comando sin especificar el nombre del workspace votara un mensaje diciendo que falta especificar el workspace
2015-06-29 13:57:30 -04:00
marcelo.cuiza
d32cee26be email event
remove php warning trace
2015-06-29 12:52:18 -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
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
dheeyi
4ba3decd29 Merge branch 'master' of bitbucket.org:dheeyi/processmaker 2015-06-29 08:56:50 -04:00
william barra
a96528d0cd Merged colosa/processmaker into master 2015-06-29 08:56:19 -04:00
dheeyi
77c6d87573 Merge remote branch 'upstream/master' 2015-06-29 08:56:10 -04:00
Victor Saisa Lopez
dba774b5bd Merge branch 'master' of bitbucket.org:colosa/processmaker into PM-2576 2015-06-29 08:51:07 -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
Victor Saisa Lopez
1da8e8a82b Merge branch 'master' of bitbucket.org:colosa/processmaker into PM-2576 2015-06-26 13:57:19 -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
Marco Antonio Nina Mena
23c458f323 Merged colosa/processmaker into master 2015-06-26 09:44:25 -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
Victor Saisa Lopez
d19c1f1063 Merge branch 'master' of bitbucket.org:colosa/processmaker into PM-2576 2015-06-25 15:49:51 -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
dheeyi
87b60c250a Merge remote branch 'upstream/master' 2015-06-25 12:23:45 -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
william barra
f563dd8b18 Merged colosa/processmaker into master 2015-06-24 08:56:02 -04:00
dheeyi
e90b495c35 Merge branch 'master' of bitbucket.org:dheeyi/processmaker 2015-06-24 08:55:38 -04:00
dheeyi
3bd416a71b Merge remote branch 'upstream/master' 2015-06-24 08:54:58 -04:00
Marco Antonio Nina Mena
4c94dd7276 Merged colosa/processmaker into master 2015-06-24 08:46:08 -04:00
Victor Saisa Lopez
4951ed8e75 Merge branch 'master' of bitbucket.org:colosa/processmaker into PM-2576 2015-06-24 08:41:30 -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