fernando/luos
1
0
Fork 0
Code Releases Activity
12,184 Commits 1 Branch 0 Tags
df39cd5ab43441ec41da0aaf5efeaa1c54a3ab8d
Commit Graph

12184 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dante
df39cd5ab4 confflict correction in insert part 2 2015-04-20 11:16:45 -04:00
Dante
ba371efd3f confflict correction in insert 2015-04-20 11:13:03 -04:00
Dante
d7f6f7c35e Merge branch 'dashboards2' of bitbucket.org:colosa/processmaker into dashboards2 2015-04-20 11:07:35 -04:00
Dante Loayza
7180966f7e insert.sql deleted online with Bitbucket to resolve confflicts 2015-04-20 15:06:49 +00:00
Dante
279101d91d resolve sync confflict 2015-04-20 11:03:40 -04:00
Dante
48f325062d Merge branch 'dashboards2' of bitbucket.org:colosa/processmaker into dashboards2 2015-04-20 10:56:37 -04:00
Dante
1b247c89c3 styles corrections 2015-04-20 10:52:16 -04:00
Dante Loayza
fc4fb0b335 Merged in marcoAntonioNina/processmaker/dashboards2 (pull request #1954) 
Add value default process
 2015-04-17 17:36:33 -04:00
Marco Antonio Nina Mena
828d9cc241 Add value default process 2015-04-17 17:34:26 -04:00
Dante Loayza
e1c9b9c325 Merged master into dashboards2 2015-04-17 16:34:25 -04:00
Dante
9c81335aba scroll image 2015-04-17 16:31:29 -04:00
Dante
eaf09ed4d7 view integration corrections 2015-04-17 16:10:51 -04:00
Julio Cesar Laura Avendaño
47d00305ba Merged in dheeyi/processmaker/PM-2313 (pull request #1943) 
PM-2313 0017153: Always dropping database when creating a new site from install/newSite. Causa : Fue definida asi, y siempre hacia drop de bases de datos.
 2015-04-17 16:01:14 -04:00
Dante
127d1981c8 addition of javascript files for view dashboard 2015-04-17 15:17:24 -04:00
Dante
8927c51cf9 View Refactoring and new status indicator display 2015-04-17 15:08:04 -04:00
dheeyi
7cae1c26ff PM-2313 0017153: Always dropping database when creating a new site from install/newSite. 
Causa : Fue definida asi, y siempre hacia drop de bases de datos.
Solució Aunque desde la interfaz siempre se verificaba la base de datos si existia sin embargo onternamente se hacia un drop de esa base de datos. Se valido esto con el cual se controla ese comportamiento.
 2015-04-17 14:34:29 -04:00
dheeyi
f56af476a2 Merge remote branch 'upstream/master' into PM-2313 2015-04-17 14:32:11 -04:00
dheeyi
ffd93998d2 PM-2313 0017153: Always dropping database when creating a new site from install/newSite. 
Causa : Fue definida asi, y siempre hacia drop de bases de datos.
Solució Aunque desde la interfaz siempre se verificaba la base de datos si existia sin embargo onternamente se hacia un drop de esa base de datos. Se valido esto con el cual se controla ese comportamiento.
 2015-04-17 12:59:00 -04:00
Julio Cesar Laura Avendaño
9d561b876b Merged in cochalo/processmaker/PM-2333 (pull request #1934) 
PM-2333 Al adicionar una activity ya creado a un lane duplica el mismo
 2015-04-17 12:53:35 -04:00
dheeyi
fd0905a2cb PM-2313 0017153: Always dropping database when creating a new site from install/newSite. 
Causa : Fue definida asi, y siempre hacia drop de bases de datos.
Solució Aunque desde la interfaz siempre se verificaba la base de datos si existia sin embargo onternamente se hacia un drop de esa base de datos. Se valido esto con el cual se controla ese comportamiento.
 2015-04-17 12:17:20 -04:00
Julio Cesar Laura Avendaño
8bde0c785a Merged in jennydmz/processmaker/dashBug (pull request #1942) 
Fixing a merge error to Dashboard integration.
 2015-04-17 11:00:42 -04:00
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
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
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
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
Paula V. Quispe
94831f8a17 I updated the label in timing control 2015-04-16 13:08:25 -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
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
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