fernando/luos
1
0
Fork 0
Code Releases Activity
18,243 Commits 1 Branch 0 Tags
246d92a145ec00a9f28801cd26361e6c7e05ab45
Commit Graph

18243 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
jennylee
4629ff8add Fixing a merge error 2015-04-17 10:48:39 -04:00
dheeyi
a5897ecfa2 Merge remote branch 'upstream/master' into PM-2313 2015-04-17 10:47:51 -04:00
Marco Antonio Nina Mena
0dda090597 Merge branch 'master' of bitbucket.org:marcoAntonioNina/processmaker into dashboards2 2015-04-17 10:34:43 -04:00
Dante Loayza
c844438322 Merged master into dashboards2 2015-04-17 10:30:23 -04:00
Julio Cesar Laura Avendaño
e8de49fe69 Merged in victorsl/processmaker/PM-2112 (pull request #1941) 
PM-2112 "Fix: 0016986: REST endpoint PUT /{workspace}/oauth2/token sets.." SOLVED
 2015-04-17 10:22:39 -04:00
Marco Antonio Nina Mena
988afc93f9 Merged colosa/processmaker into master 2015-04-17 10:13:12 -04:00
Julio Cesar Laura Avendaño
22c1077942 Merged in victorsl/processmaker/DEL_RISK_DATE (pull request #1938) 
PM-2320 "Fix: Add DEL_RISK_DATE field in tables Delegation..." SOLVED
 2015-04-17 10:07:58 -04:00
Victor Saisa Lopez
4af53d2768 PM-2112 "Fix: 0016986: REST endpoint PUT /{workspace}/oauth2/token sets.." SOLVED 
Issue:
    Fix: 0016986: REST endpoint PUT /{workspace}/oauth2/token sets the HTTP status to 200 (OK) when error
Cause:
    Al obtener un "access token" con informacion erronea, no se define correctamente el response de error
Solution:
    Se revierte el 1er cambio y se aplica un "exit(0);", ya que el status code se sobre escribia
 2015-04-17 10:04:59 -04:00
jonathan quispe
fb9132eeb0 Merged colosa/processmaker into master 2015-04-17 09:44:55 -04:00
Quenta Ronald
280df9d685 Merged colosa/processmaker into master 2015-04-17 09:36:00 -04:00
Marco Antonio Nina Mena
9a1ebafbd5 Merge branch 'master' of bitbucket.org:marcoAntonioNina/processmaker into dashboards2 2015-04-17 09:09:59 -04:00
Marco Antonio Nina Mena
28f865c23c Merged colosa/processmaker into master 2015-04-17 09:09:13 -04:00
dheeyi
3d4723e5aa Merge remote branch 'upstream/master' 2015-04-17 08:53:24 -04:00
Julio Cesar Laura Avendaño
77ad903336 Merged in cochalo/processmaker/PM-2335 (pull request #1936) 
PM-2335 Adicion de login al hacer enter en password
 2015-04-17 08:45:38 -04:00
Dante Loayza
de7f0722c4 Merged in marcoAntonioNina/processmaker/dashboards2 (pull request #1940) 
Validation division by zero
 2015-04-16 17:17:53 -04:00
Marco Antonio Nina Mena
bcc752ad43 delete print 2015-04-16 17:11:17 -04:00
Dante Loayza
dd6312a829 Merged master into dashboards2 2015-04-16 17:04:12 -04:00
Marco Antonio Nina Mena
f620b0453a Validation division by zero 2015-04-16 16:41:04 -04:00
marcelo.cuiza
ff86ff1743 PM-2314,PM-2331 
PM-2314,En ADMIN > Plugins > Enterprise features el status del actionByEmail y el pmConsolidatedCL es "Install now" y este deberíestar como Installed y estas opciones ya deberí estar instaladas
PM-2331,Admin/Plugins/Enterprise Features -> Eliminar columna de status en listado de features

Dentro el tab "Enterprise features" se quito la columna status (PM-2331),
Se agregaran los new features al ejecutar en consola ./processmaker databa-upgrade(PM-2314),
 2015-04-16 16:33:15 -04:00
Victor Saisa Lopez
6de4559f1d PM-2320 "Fix: Add DEL_RISK_DATE field in tables Delegation..." SOLVED 
Issue:
    El nuevo campo DEL_RISK_DATE no refleja la fecha correcta
Cause:
    No se tiene de manera completa la formula para el calculo
    de la fecha
Solution:
    Se a completado la formula
 2015-04-16 16:04:16 -04:00
marcelo.cuiza
bd638dde23 PM-2314,PM-2331 
PM-2314,En ADMIN > Plugins > Enterprise features el status del actionByEmail y el pmConsolidatedCL es "Install now" y este deberíestar como Installed y estas opciones ya deberí estar instaladas
PM-2331,Admin/Plugins/Enterprise Features -> Eliminar columna de status en listado de features

Dentro el tab "Enterprise features" se quito la columna status (PM-2331),
Se agregaran los new features al ejecutar en consola ./processmaker databa-upgrade(PM-2314),
 2015-04-16 14:54:27 -04:00
Brayan Pereyra
bece913f0b Adicion de login al hacer enter en password 2015-04-16 14:51:10 -04:00
Marco Antonio Nina Mena
b0091f8f2b Merge branch 'master' of bitbucket.org:marcoAntonioNina/processmaker into dashboards2 2015-04-16 14:03:37 -04:00
Marco Antonio Nina Mena
a1d3d082c8 Merged colosa/processmaker into master 2015-04-16 14:03:10 -04:00
Julio Cesar Laura Avendaño
7a3f41bcaf Merged in paulis/processmaker/PM-TIMINGCONTROL (pull request #1935) 
I reverted the issue PM-1947 and I changed the label
 2015-04-16 13:59:26 -04:00
Victor Saisa Lopez
d6cefad6eb Merge branch 'master' of bitbucket.org:colosa/processmaker into PM-2039 2015-04-16 13:22:18 -04:00
Paula V. Quispe
94831f8a17 I updated the label in timing control 2015-04-16 13:08:25 -04:00
dheeyi
d789277ab4 Merge remote branch 'upstream/master' into PM-2104 2015-04-16 13:07:30 -04:00
Julio Cesar Laura Avendaño
0d08e798b1 Merged in mcuiza/processmaker/PM-2111 (pull request #1921) 
PM-2111 - 0016768: CTL+SPACE doesn't display a list of functions when editing a trigger in the BPMN Designer
 2015-04-16 13:03:33 -04:00
Brayan Pereyra
36c361c557 PM-2333 Al adicionar una activity ya creado a un lane duplica el mismo 2015-04-16 12:25:15 -04:00
Quenta Ronald
42ce2532a1 Merged colosa/processmaker into master 2015-04-16 12:23:12 -04:00
Dante Loayza
ec7a128831 Merged in marcoAntonioNina/processmaker/dashboards2 (pull request #1933) 
Add percentage Total in Status Indicator
 2015-04-16 12:17:19 -04:00
Marco Antonio Nina Mena
a4fc86868b Add percentage Total in Status Indicator 2015-04-16 12:12:53 -04:00
Paula V. Quispe
a4aba45c61 I reverted the issue PM-1947 2015-04-16 10:55:19 -04:00
jonathan quispe
573b881b60 Merged colosa/processmaker into master 2015-04-16 09:33:32 -04:00
dheeyi
128689f114 Merge remote branch 'upstream/master' 2015-04-16 09:23:34 -04:00
Dante Loayza
f4c4b96e94 Merged master into dashboards2 2015-04-16 08:45:32 -04:00
Marco Antonio Nina Mena
1677ddc894 Merge branch 'master' of bitbucket.org:marcoAntonioNina/processmaker into dashboards2 2015-04-16 08:43:37 -04:00
Marco Antonio Nina Mena
414df9e6dc Merged colosa/processmaker into master 2015-04-16 08:42:54 -04:00
Victor Saisa Lopez
e391de3dde Merge branch 'master' of bitbucket.org:colosa/processmaker into PM-2039 2015-04-16 08:42:22 -04:00
Julio Cesar Laura Avendaño
b2b421f039 Merged in cochalo/processmaker/PM-2293 (pull request #1932) 
PM-2293 PM-2296: Se agrego validacion para guardar una tarea
 2015-04-16 08:39:51 -04:00
Julio Cesar Laura Avendaño
f85e8323ce Merged in cochalo/processmaker/PM-1915 (pull request #1927) 
PM-1915: Adicion de field delStatus para indicar el hilo pausado
 2015-04-16 08:38:42 -04:00
Marco Antonio Nina Mena
c52630b43f Merge remote-tracking branch 'upstream/dashboards2' into dashboards2 2015-04-16 08:38:20 -04:00
Julio Cesar Laura Avendaño
1338515142 Merged in cochalo/processmaker/PM-2256 (pull request #1924) 
PM-2256: Se valido la existencia de la variable utilizada
 2015-04-16 08:37:08 -04:00
Marco Antonio Nina Mena
9c942ab698 Merge branch 'master' of bitbucket.org:marcoAntonioNina/processmaker into dashboards2 2015-04-16 08:31:13 -04:00
Julio Cesar Laura Avendaño
c1fa846910 Merged in victorsl/processmaker/DEL_RISK_DATE (pull request #1929) 
PM-2320 "Add DEL_RISK_DATE field in tables Delegation..." SOLVED
 2015-04-15 17:48:15 -04:00
Julio Cesar Laura Avendaño
551144a9e4 Merged in jonathanquispe/processmaker (pull request #1902) 
update changes in login.html merging
 2015-04-15 17:33:27 -04:00
Quenta Ronald
89d5cbc0db Merged colosa/processmaker into master 2015-04-15 17:11:03 -04:00
jonathan
077cf4d19b remove licenseexpired 2015-04-15 17:06:49 -04:00
dheeyi
033a866edf PM-2216 DesignerBPMN>Triggers>PMFunctions : El trigger wizard paussedCase no contruye bien los datos que se le envian. 
Causa : Definida asi.
Solució Se modifico definicion inicial.
 2015-04-15 17:00:16 -04:00