Commit Graph

9250 Commits

Author SHA1 Message Date
Erik Amaru Ortiz
be6f2fea00 Merged in cochalo/processmaker (pull request #571)
Arreglo para cron.php
2014-07-01 20:15:40 -04:00
Erik Amaru Ortiz
34e4998cb6 adding pmdynaform version into System Information screen 2014-07-01 16:53:02 -04:00
Fernando Ontiveros
e1a440995d Merged in gproly/processmaker (pull request #572)
change the order of menu items creating projects
2014-07-01 16:27:50 -04:00
Fernando Ontiveros
fd16418987 Merged in darojas/processmaker (pull request #573)
Se quita validacion para que dyn_version no sea requerido
2014-07-01 16:26:49 -04:00
Daniel Rojas
2188a23d3b Se quita validacion para que dyn_version no sea requerido 2014-07-01 16:23:29 -04:00
Roly Rudy Gutierrez Pinto
d8637806cd change the order of menu items creating projects 2014-07-01 16:20:43 -04:00
Brayan Osmar Pereyra Suxo
1d17893c90 Arreglo de cron 2014-07-01 16:13:46 -04:00
Brayan Osmar Pereyra Suxo
373abf6470 Arreglo para cron.php 2014-07-01 15:33:12 -04:00
Fernando Ontiveros
4b39bcb4c8 Merged in darojas/processmaker (pull request #569)
Se adiciona dyn_version en data/mysql/schema.sql. Se adiciona validaciones para OutputDocument, Dynaform y ProcessVariable
2014-07-01 15:21:14 -04:00
Fernando Ontiveros
50c5f3ed33 Merged in cochalo/processmaker (pull request #570)
Adicion de campo DYN_VERSION
2014-07-01 15:17:57 -04:00
Brayan Osmar Pereyra Suxo
119caeefab Adicion de campo DYN_VERSION 2014-07-01 15:10:37 -04:00
Daniel Rojas
f0d48216ba Se adiciona dyn_version en data/mysql/schema.sql 2014-07-01 15:07:23 -04:00
Daniel Rojas
e61a656e0a Se adiciona validaciones para Dynaform 2014-07-01 15:05:45 -04:00
Daniel Rojas
9834a23122 Se adiciona validaciones para Dynaform 2014-07-01 14:54:29 -04:00
Daniel Rojas
a5cbc1380c Se adiciona validaciones para Dynaform 2014-07-01 14:51:20 -04:00
Daniel Rojas
286cc51b55 Se adiciona validaciones para Dynaform 2014-07-01 12:26:55 -04:00
Erik Amaru Ortiz
b98116b463 updating jenkins build file 2014-07-01 11:58:32 -04:00
Daniel Rojas
0236275a66 Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-07-01 11:45:42 -04:00
Daniel Rojas
d44d158752 Se adiciona validaciones para OutputDocument y ProcessVariable 2014-07-01 11:33:37 -04:00
Daniel Rojas
38ad797a51 Se adiciona validaciones para OutputDocument y ProcessVariable 2014-07-01 11:30:44 -04:00
Brayan Osmar Pereyra Suxo
4f8767015a Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-07-01 10:39:16 -04:00
Erik Amaru Ortiz
891bb7efde Merged in victorsl/processmaker (pull request #568)
ProcessMaker-BE "Process Variable - Endpoint execute-query"
2014-07-01 10:04:04 -04:00
Victor Saisa Lopez
3f957f2a93 Merge branch 'master' of bitbucket.org:colosa/processmaker
Conflicts:
	workflow/engine/src/ProcessMaker/BusinessModel/Variable.php
2014-07-01 10:00:27 -04:00
Erik Amaru Ortiz
5727b4f284 Merged in darojas/processmaker (pull request #567)
Se agregan validaciones para process variables -BEHAT basico de process varibles. Fix Dynaform en el campo dyn_version
2014-07-01 09:51:41 -04:00
Daniel Rojas
0f159a4265 Fix Dynaform en el campo dyn_version 2014-07-01 09:36:57 -04:00
Victor Saisa Lopez
b33b393bec Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-07-01 09:10:51 -04:00
Erik Amaru Ortiz
26915cf8ec disabling temporally pdepend task on default build execution for jenkins 2014-06-30 18:48:04 -04:00
Erik Amaru Ortiz
b4a160738e Merge branch 'master' of github.com:colosa/processmaker 2014-06-30 17:40:01 -04:00
Erik Amaru Ortiz
b1aa771c37 updating neoclasic stylesheet, adding left padding to pm main logo 2014-06-30 17:38:48 -04:00
Daniel Rojas
e2751ab73e BEHAT basico de process varibles 2014-06-30 17:12:36 -04:00
Erik Amaru Ortiz
f584f5cf23 update RestContext in saveExportedProcessTo() ... 2014-06-30 17:06:21 -04:00
Victor Saisa Lopez
7cb55323e3 ProcessMaker-BE "Process Variable - Endpoint execute-query"
- Se ha implementado el siguiente Endpoint:
    POST /api/1.0/{workspace}/project/:prj_uid/process-variable/:var_name/execute-query
2014-06-30 16:49:11 -04:00
Daniel Rojas
13689911da Se agregan validaciones para process variables 2014-06-30 16:31:27 -04:00
Victor Saisa Lopez
b3aaa69a6d ProcessMaker-BE "Process Variable - Endpoint execute-query"
- Se ha implementado el siguiente Endpoint:
    POST /api/1.0/{workspace}/project/:prj_uid/process-variable/:var_name/execute-query
2014-06-30 16:26:12 -04:00
Erik Amaru Ortiz
28bbc80de2 updating build file for jenkins 2014-06-30 16:14:25 -04:00
Erik Amaru Ortiz
c5ff9a0483 Updating Behat RestContext, sending logs to file stored in system temporal dir. 2014-06-30 16:05:40 -04:00
Herbert Saal
4576f2812d Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-06-30 13:11:50 -04:00
Herbert Saal
26c5fa9c33 Add change of maborack in tinymce 2014-06-30 13:11:17 -04:00
julceslauhub
f666dafa72 Merge pull request #2481 from Jennydmz/master
BUG_15194: Error inserting data to PM Table.
2014-06-30 12:59:15 -04:00
jennylee
807aecec7b BUG_15194: Error inserting data to PM Table.
The Json has some quotes that was causing troubles, because the stripslashes() function was been applicated before json_decode, so it was been applied twice.

Removing stripslashes() function, this is already added in json_decode().
2014-06-30 11:59:58 -04:00
Julio Cesar Laura Avendaño
fb3fb08a02 Merged in julceslau/processmaker (pull request #565)
Merge code from Github to Bitbucket 2014-06-30 10:45
2014-06-30 10:48:34 -04:00
Julio Cesar Laura
4dd42b14a0 Merge code from Github to Bitbucket 2014-06-30 10:45 2014-06-30 10:46:52 -04:00
Julio Cesar Laura
41fed2b589 Merge remote branch 'upstream/master' 2014-06-30 10:45:43 -04:00
Erik Amaru Ortiz
7651eb58dc Merged in darojas/processmaker (pull request #556)
Se agrega la tabla PROCESS_VARIABLES, Se agregan End points para process variables. Se agrega el campo DYN_VERSION a la tabla DYNAFORM
2014-06-30 09:38:19 -04:00
Daniel Rojas
f0c3c209ef Se agrega el campo DYN_VERSION a la tabla DYNAFORM 2014-06-27 17:00:34 -04:00
Daniel Rojas
2f379b8d86 Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-06-27 16:38:27 -04:00
Daniel Rojas
3479b3261f Se agregan End points para process variables 2014-06-27 16:38:14 -04:00
Erik Amaru Ortiz
6974fbe51b Merged in wnestor/processmaker (pull request #557)
Arreglos en los features file manager, process permissions y se descomento un scenario en pm_group
2014-06-27 16:14:30 -04:00
Erik Amaru Ortiz
fa0e0e1c5a Merged in victorsl/processmaker (pull request #558)
ProcessMaker-BE "DynaForm small fix (DYN_CONTENT)"
2014-06-27 16:13:21 -04:00
Brayan Osmar Pereyra Suxo
eee2cbde7b Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-06-27 16:11:40 -04:00