fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,184 Commits 1 Branch 0 Tags
df39cd5ab43441ec41da0aaf5efeaa1c54a3ab8d
Commit Graph

7686 Commits

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
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
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
jennylee
4629ff8add Fixing a merge error 2015-04-17 10:48:39 -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
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
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
Marco Antonio Nina Mena
bcc752ad43 delete print 2015-04-16 17:11:17 -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
Paula V. Quispe
94831f8a17 I updated the label in timing control 2015-04-16 13:08:25 -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
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
Marco Antonio Nina Mena
1677ddc894 Merge branch 'master' of bitbucket.org:marcoAntonioNina/processmaker into dashboards2 2015-04-16 08:43:37 -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
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
jonathan
077cf4d19b remove licenseexpired 2015-04-15 17:06:49 -04:00
Brayan Pereyra
1c1cd078f0 PM-2293 PM-2296: Se agrego validacion para guardar una tarea 2015-04-15 16:53:26 -04:00
jonathan
4b5524058a Merge branch 'master' of https://bitbucket.org/jonathanquispe/processmaker 2015-04-15 16:11:20 -04:00
jonathan
14ba5ce845 update login 2015-04-15 16:11:04 -04:00
jonathan quispe
44f597a805 Merged colosa/processmaker into master 2015-04-15 15:07:26 -04:00
Victor Saisa Lopez
1f5ef6413d PM-2320 "Add DEL_RISK_DATE field in tables Delegation..." SOLVED 
Issue:
    Add DEL_RISK_DATE field in tables Delegation, App_cache_view, List_Inbox
Cause:
    New feature
Solution:
    Added DEL_RISK_DATE field in tables and implemented funcionality for new field in core
 2015-04-15 14:52:15 -04:00
Marco Antonio Nina Mena
34098810f8 Add fields endPoint status indicator 2015-04-15 14:46:54 -04:00
Brayan Pereyra
43c1f2ed2d PM-1915: Adicion de field delStatus para indicar el hilo pausado 2015-04-15 12:49:47 -04:00
Marco Antonio Nina Mena
8a8373684c Add validation indicator 1050 "Status" 2015-04-15 12:42:48 -04:00
Marco Antonio Nina Mena
639210ef71 Add endpoint status indicator 2015-04-15 12:07:21 -04:00