fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,226 Commits 1 Branch 0 Tags
b98116b463dfdc79f86ee05483e39a88f5948604
Commit Graph

9226 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Erik Amaru Ortiz
b98116b463 updating jenkins build file 2014-07-01 11:58:32 -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
Julio Cesar Laura Avendaño
b14ea752c9 Merged in julceslau/processmaker (pull request #564) 
Minor changes in 'Get Started' screen
 2014-06-27 15:49:05 -04:00
Julio Cesar Laura
d7d0967f68 Minor changes in 'Get Started' screen 2014-06-27 15:47:26 -04:00
Julio Cesar Laura
afb22be2c1 Minor changes in 'Get Started' screen 2014-06-27 15:45:56 -04:00
Victor Saisa Lopez
0157f694ea ProcessMaker-BE "DynaForm small fix (DYN_CONTENT)" 
- DynaForm small fix (DYN_CONTENT)
 2014-06-27 14:48:00 -04:00
Victor Saisa Lopez
58c82213f8 Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-06-27 14:45:09 -04:00
Fernando Ontiveros
e8b63a422a Merged in gproly/processmaker (pull request #562) 
rake pmDynaform
 2014-06-27 14:16:28 -04:00
Julio Cesar Laura Avendaño
4084591497 Merged in marcoAntonioNina/processmaker (pull request #560) 
Improvement define variable __usernameLoggedDE__ for control of session
 2014-06-27 14:14:33 -04:00
Roly Rudy Gutierrez Pinto
548062c6de rake pmDynaform 2014-06-27 13:43:49 -04:00
Fernando Ontiveros
9846e855e4 Merged in gproly/processmaker (pull request #561) 
composer
 2014-06-27 13:32:15 -04:00
Roly Rudy Gutierrez Pinto
550df05a58 composer 2014-06-27 13:29:58 -04:00
Marco Antonio Nina
e8f74a24f9 The option "Edit with classic editor" was removed. 2014-06-27 12:13:30 -04:00
julceslauhub
33137ffa96 Merge pull request #2480 from norahmollo/14302 
BUG-14302 Problemas en la sincronizacion de estados entre AD y PM.
 2014-06-27 09:46:15 -04:00
Victor Saisa Lopez
c6c14a1840 Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-06-27 09:14:33 -04:00
Marco Antonio Nina
ad4bd75bda Merge branch 'master' of bitbucket.org:marcoAntonioNina/processmaker 2014-06-27 08:49:28 -04:00
Marco Antonio Nina
e13a9ec2b0 Merge remote branch 'upstream/master' 2014-06-27 08:48:55 -04:00
Marco Antonio Nina
a8eb218b17 Improvement define variable __usernameLoggedDE__ for control of session 2014-06-27 08:47:09 -04:00
norahmollo
e6bf5c94f9 BUG-14302 Problemas en la sincronizacion de estados entre AD y PM. 
Los cambios realizados en cuanto al estado del usuario no se ven reflejados en ProcessMaker en forma correcta.
 2014-06-26 17:13:26 -04:00
Julio Cesar Laura Avendaño
c25574cf2b Merged in julceslau/processmaker (pull request #559) 
Merging code from github to bitbucket 2014-06-26
 2014-06-26 16:56:16 -04:00
Julio Cesar Laura
356af18e41 Merging code from github to bitbucket 2014-06-26 2014-06-26 16:52:48 -04:00
Julio Cesar Laura
a0a6e37f97 Merge remote branch 'upstream/master' 2014-06-26 16:51:24 -04:00
julceslauhub
553bf33ae6 Merge pull request #2479 from marcoAntonioNina/BUG-15276 
BUG-15276 Error al ejecutar un triggers despues de... SOLVED
 2014-06-26 16:08:15 -04:00