Julio Cesar Laura
61e6975a0d
Merge remote branch 'upstream/master'
2014-03-14 14:18:42 -04:00
Luis Fernando Saisa Lopez
75f0697093
BUG 13974 "Error in triggers in lines of code commented" SOLVED
...
- Error in triggers in lines of code commented.
- Problema Resuelto, Se valida el Script del triggers quitando todo los comnetarios que existe en el codigo antes de ser
ejecutado, el cambio se lo realizo en el metodo "setScript($sScript = '')".
2014-03-14 14:10:22 -04:00
Wendy Nestor
f74f230866
Merge branch 'master' of bitbucket.org:colosa/processmaker
2014-03-14 13:34:31 -04:00
Erik Amaru Ortiz
0eb31ffa27
removing rest routines from sysGeneric
2014-03-14 13:12:48 -04:00
Erik Amaru Ortiz
2809ab9f0e
Fix for classloader
2014-03-14 13:03:53 -04:00
Erik Amaru Ortiz
2277e8a715
FIX, a problem was detected using array_multisort called from call_user_func
...
It is PHP version bug, that it is already fixed on PHP Vers 5.4.x
so we made a fix, solving that issue just for php 5.3.x with a limitation, that is can be used to sort with a limit of 5 columns to sort be those fields.
2014-03-14 12:57:50 -04:00
Julio Cesar Laura
913b905918
Merge remote branch 'upstream/master'
2014-03-14 12:37:14 -04:00
Daniel Rojas
88e7eb862d
Merge branch 'master' of bitbucket.org:colosa/processmaker
2014-03-14 12:35:34 -04:00
Erik Amaru Ortiz
dad40d77f6
Updating classloading for normal and Rest, requests
2014-03-14 11:57:27 -04:00
Wendy Nestor
92fbaa6a5e
Reorganizacion de carpetas y avance de los behat para ordenamiento
2014-03-14 11:50:12 -04:00
Julio Cesar Laura
9ef8023b1a
Merge remote branch 'upstream/master'
2014-03-14 08:55:13 -04:00
Daniel Rojas
b932d0fd2a
Merge branch 'master' of bitbucket.org:colosa/processmaker
2014-03-14 08:46:33 -04:00
Freddy Daniel Rojas Valda
682baa7c68
Merge branch 'master' of bitbucket.org:colosa/processmaker
2014-03-14 08:41:06 -04:00
Erik Amaru Ortiz
8e9b30f706
Removing XmlForm and Smarty class dependency
2014-03-13 18:45:57 -04:00
erik ao
fbdd88e085
Merged in cochalo/processmaker (pull request #300 )
...
Adicion para validar eliminacion de dynaform con dependencias
2014-03-13 17:35:15 -04:00
Erik Amaru Ortiz
99a512d15c
Removing DBArray dependency in class Task
2014-03-13 17:34:36 -04:00
Erik Amaru Ortiz
aad2ed0c17
Adding ArrayUtil::sort method, to sort associative arrays by keys
2014-03-13 17:33:19 -04:00
Brayan Osmar Pereyra Suxo
0fe7c83114
Adicion para validar eliminacion de dynaform con dependencias
2014-03-13 17:18:21 -04:00
Daniel Rojas
23f269a7e7
Merge branch 'master' of bitbucket.org:colosa/processmaker
2014-03-13 17:07:07 -04:00
Freddy Daniel Rojas Valda
7e9327f427
Merge branch 'master' of bitbucket.org:colosa/processmaker
2014-03-13 17:07:05 -04:00
Julio Cesar Laura Avendaño
ce9796e2f5
Merged in julceslau/processmaker (pull request #299 )
...
Add validation when change dynaform in dynaform's editor and return to new process map
2014-03-13 17:05:24 -04:00
Julio Cesar Laura
17a8830592
Merge remote branch 'upstream/master'
2014-03-13 17:04:36 -04:00
Julio Cesar Laura
6304295356
Add validation when change dynaform in dynaform's editor and return to new process map
2014-03-13 17:02:58 -04:00
Freddy Daniel Rojas Valda
448ecc2707
Merge branch 'master' of bitbucket.org:colosa/processmaker
2014-03-13 16:45:46 -04:00
Daniel Rojas
70135bf2e7
Merge branch 'master' of bitbucket.org:colosa/processmaker
2014-03-13 16:45:12 -04:00
Fernando Ontiveros
adbbbb0296
Merge branch 'master' of bitbucket.org:colosa/processmaker
2014-03-13 16:32:22 -04:00
Fernando Ontiveros
f14b0aa744
remove relative date in build-log.html
2014-03-13 16:32:13 -04:00
Freddy Daniel Rojas Valda
d26635b27c
Merge branch 'master' of bitbucket.org:colosa/processmaker
2014-03-13 16:22:52 -04:00
Daniel Rojas
2f6eede69d
Merge branch 'master' of bitbucket.org:colosa/processmaker
2014-03-13 16:11:56 -04:00
Erik Amaru Ortiz
def52653ed
removing old files
2014-03-13 16:08:21 -04:00
Freddy Daniel Rojas Valda
ad792e0b5d
Merge branch 'master' of bitbucket.org:colosa/processmaker
2014-03-13 14:11:06 -04:00
Daniel Rojas
6e0829aefd
Merge branch 'master' of bitbucket.org:colosa/processmaker
2014-03-13 14:10:30 -04:00
Omar
1a8b7fa6c7
Merge branch 'master' of bitbucket.org:colosa/processmaker
2014-03-13 13:34:00 -04:00
Erik Amaru Ortiz
aa556e7b20
FIX, removing duplicated function an adding its reference for backward compatibility
2014-03-13 13:22:37 -04:00
Erik Amaru Ortiz
0b6263308c
adding php ini set config by env.ini configuration for Rest env
2014-03-13 12:57:01 -04:00
Freddy Daniel Rojas Valda
cbcb4f7f10
Merge branch 'master' of bitbucket.org:colosa/processmaker
2014-03-13 12:09:50 -04:00
Daniel Rojas
356737064c
Merge branch 'master' of bitbucket.org:colosa/processmaker
2014-03-13 11:52:04 -04:00
Erik Amaru Ortiz
7c134e3c45
FIX: Removing blank line on first line of sysGeneric.php
2014-03-13 11:49:03 -04:00
Erik Amaru Ortiz
b6a7122bb7
Update for new application bootstrap, default redirect handling was added
2014-03-13 10:23:50 -04:00
Omar
cfa7d44cca
Merge branch 'master' of bitbucket.org:colosa/processmaker
2014-03-13 09:03:03 -04:00
Daniel Rojas
d55d1a3a8b
Merge branch 'master' of bitbucket.org:colosa/processmaker
2014-03-13 08:45:47 -04:00
Freddy Daniel Rojas Valda
580776f793
Merge branch 'master' of bitbucket.org:colosa/processmaker
2014-03-13 08:45:17 -04:00
Erik Amaru Ortiz
b4d32fcb58
Merge branch 'performance'
...
Conflicts:
workflow/public_html/sysGeneric.php
2014-03-12 18:33:22 -04:00
Erik Amaru Ortiz
3026937e08
Adding more improvements to increase performance, by now, it is just affecting for API Rest Requests
2014-03-12 18:20:35 -04:00
erik ao
2a31116e9c
Merged in herbertsg/processmaker (pull request #296 )
...
Add configuration options display_errors, error_reporting in env.ini
2014-03-12 18:17:40 -04:00
erik ao
232eac24eb
Merged in wnestor/processmaker (pull request #298 )
...
Modificacion a step
2014-03-12 17:09:12 -04:00
Wendy Nestor
25b18f154a
Modificacion a step
2014-03-12 17:08:13 -04:00
erik ao
141458529d
Merged in wnestor/processmaker (pull request #297 )
...
modificacion en step
2014-03-12 17:04:43 -04:00
Wendy Nestor
90306ca094
modificacion en step
2014-03-12 17:02:59 -04:00
Herbert Saal
c9a1f8985a
Remove var_dump function
2014-03-12 16:19:06 -04:00
