Commit Graph

18243 Commits

Author SHA1 Message Date
Victor Saisa Lopez
55d7a7a075 Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-07-28 08:44:11 -04:00
Erik Amaru Ortiz
5487aa27c0 Merged in darojas/processmaker (pull request #623)
Se cambia var_accepted_values a LongVarchar en VARIABLES
2014-07-25 16:42:07 -04:00
Daniel Rojas
e7e345e014 Se cambia var_accepted_values a LongVarchar en VARIABLES 2014-07-25 16:26:39 -04:00
Victor Saisa Lopez
7a6462e588 Merge branch 'master' of bitbucket.org:colosa/processmaker
Conflicts:
	workflow/engine/src/ProcessMaker/Project/Adapter/WorkflowBpmn.php
2014-07-25 11:56:22 -04:00
eriknyk
07f6c824d5 Fix little error, on asignationof '[participants]' 2014-07-25 11:46:03 -04:00
eriknyk
624a2d4ff1 Fix for warning while create projects without a diagram element like evets, etc 2014-07-25 11:39:47 -04:00
Victor Saisa Lopez
f1edbc7e87 Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-07-25 11:23:11 -04:00
eriknyk
e1ef3d58ce solving remove project problem 2014-07-25 10:50:20 -04:00
Victor Saisa Lopez
5b4b571f0f ProcessMaker-BE "Proceso -----> Generar BPMN (Endpoint)"
- Se ha implementado el siguiente Endpoint:
    POST /api/1.0/{workspace}/project/process/{pro_uid}/generate-bpmn
2014-07-24 17:18:48 -04:00
Victor Saisa Lopez
31e9f0e198 Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-07-24 09:05:07 -04:00
julceslauhub
587e491459 Merge pull request #2515 from Jennydmz/master
Fixing Notice in fields handler by an empty variable usage.
2014-07-23 17:07:11 -04:00
jennylee
afba4f5fc6 Fixing Notice in fields handler by an empty variable usage. 2014-07-23 12:52:51 -04:00
julceslauhub
8c7a49b22c Merge pull request #2514 from marcoAntonioNina/master
Improvement Plugin EnhancedLogin
2014-07-23 12:43:37 -04:00
Marco Antonio Nina
09c83fc7bb Improvement Plugin EnhancedLogin
- A validation was added validation for login.
2014-07-23 12:35:31 -04:00
Julio Cesar Laura Avendaño
78514df709 Merged in gproly/processmaker (pull request #619)
solved the problem of incompatibility between TemplatePower.php and BackBone
2014-07-23 12:21:07 -04:00
Marco Antonio Nina
16b66055e4 Improvement Plugin EnhancedLogin
- A validation was added validation for login.
2014-07-23 12:12:50 -04:00
julceslauhub
06d9860d11 Merge pull request #2512 from Jennydmz/master
BUG-15384 Issue in the field check-box from Dynaform with the label.
2014-07-23 11:39:28 -04:00
Roly Rudy Gutierrez Pinto
2a3e8e79cc solved the problem of incompatibility between TemplatePower.php and BackBone 2014-07-23 11:23:29 -04:00
jennylee
ca204e22ec BUG-15384 Issue in the field check-box from Dynaform with the label.
When a label in a required field has a line break, a js error happens.

When the eval function is applied to the label's string, the line break is taked as the conclusion of the string, and js searchs " (double quotes) which closes the string without finding it and giving the error: "SintaxError: unterminated string literal"

So I use the replace function to change the break line to a simple space, this solves the problem and the error does not happend again.
2014-07-23 11:02:39 -04:00
Victor Saisa Lopez
bd64b13582 Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-07-23 09:20:48 -04:00
Marco Antonio Nina
15de9859ec Improvement Plugin EnhancedLogin
- A validation was added validation for login.
2014-07-23 09:20:31 -04:00
eriknyk
89338a7759 Improvement on Rakefile, now a commit log file is generated for each PM libinto /workflow/public_html/lib directory 2014-07-22 19:19:56 -04:00
Erik Amaru Ortiz
c7bfec65fc Merged in cochalo/processmaker (pull request #618)
Adicion en importacion
2014-07-22 17:26:49 -04:00
Erik Amaru Ortiz
dff690408e Merged in darojas/processmaker (pull request #617)
Se quita la validacion para evn_name en BpmnWorkflow. Este campo no sera requerido. Cambios en Behat
2014-07-22 17:08:59 -04:00
Brayan Osmar Pereyra Suxo
e472b6846d Adicion en importacion 2014-07-22 16:57:24 -04:00
Victor Saisa Lopez
1276258457 Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-07-22 16:25:04 -04:00
Brayan Osmar Pereyra Suxo
23e1529459 Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-07-22 16:12:41 -04:00
Daniel Rojas
621dfed30a Se quita el tests para la validacion para evn_name en project. 2014-07-22 16:06:58 -04:00
Daniel Rojas
9cd5e1a3a4 Se quita la validacion para evn_name en BpmnWorkflow. Siendo este campo no se requerido. 2014-07-22 16:00:41 -04:00
Erik Amaru Ortiz
66d5ca7f66 Merged in darojas/processmaker (pull request #614)
Se modifica el end point /project/{prj_uid}/dynaform/{dyn_uid}/fields
2014-07-22 15:08:47 -04:00
eriknyk
7ad638b98d Improvements, adding error raising to handle break the build if something fails 2014-07-22 15:06:57 -04:00
Brayan Osmar Pereyra Suxo
d2fcabbbc0 Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-07-22 14:40:21 -04:00
julceslauhub
6d70e67ad7 Merge pull request #2509 from luisfernandosl/BUG-13239
BUG 13239 "Al crearte un field con caracter..." SOLVED
2014-07-22 13:42:35 -04:00
julceslauhub
03760e8cc5 Merge pull request #2510 from julceslauhub/master
Update .po file 2014-07-22
2014-07-22 13:26:44 -04:00
Julio Cesar Laura
07b5034247 Update .po file 2014-07-22 2014-07-22 13:24:22 -04:00
jonathan quispe
d169136015 Merged colosa/processmaker into master 2014-07-22 10:23:07 -04:00
Victor Saisa Lopez
c607ad6893 Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-07-22 09:07:18 -04:00
julceslauhub
5174f4df07 Merge pull request #2508 from Jennydmz/master
BUG-15198 Text field con query en modo view sigue ejecutando el query.
2014-07-22 08:58:22 -04:00
Fernando Ontiveros
e8403738f7 Merged in gproly/processmaker (pull request #616)
Submit implementation
2014-07-21 17:54:25 -04:00
Roly Rudy Gutierrez Pinto
23edb3ef78 Submit implementation 2014-07-21 17:52:30 -04:00
Luis Fernando Saisa Lopez
373da58a50 BUG 13239 "Al crearte un field con caracter 'ñe visualiza un error en la pestañreview" SOLVED
- Al crearte un field con caracter 'ñe visualiza un error en la pestañreview
- Problema resuelto, se agrega validacion para las teclas en la validacion de los campos con el atributo "NodeName"
  en el archivo form.js

  Disponible para la version 2.5.3 de ProcessMaker.
2014-07-21 17:05:15 -04:00
Daniel Rojas
408ca5f870 Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-07-21 16:55:50 -04:00
Brayan Osmar Pereyra Suxo
f3f508965e Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-07-21 16:49:49 -04:00
jonathan quispe
cf1e9d2119 Merged colosa/processmaker into master 2014-07-21 16:48:22 -04:00
Richard Yujra
f02a8d73b5 Merge remote branch 'upstream/master' 2014-07-21 16:23:13 -04:00
Fernando Ontiveros
0bbbbaf4e0 Merged in gproly/processmaker (pull request #615)
FormDesigner implements view Desktop, Tablet, Smartphone.
2014-07-21 16:10:51 -04:00
Daniel Rojas
b1abbc247c Se modifica validacion en el end point /project/{prj_uid}/dynaform/{dyn_uid}/fields 2014-07-21 15:46:42 -04:00
Roly Rudy Gutierrez Pinto
34f10a5c56 FormDesigner implements view Desktop, Tablet, Smartphone. 2014-07-21 15:37:35 -04:00
Daniel Rojas
173dc36469 Se modifica validacion en el end point /project/{prj_uid}/dynaform/{dyn_uid}/fields 2014-07-21 15:23:23 -04:00
Daniel Rojas
c3540be38f Se modifica el end point /project/{prj_uid}/dynaform/{dyn_uid}/fields 2014-07-21 15:13:06 -04:00