Commit Graph

18243 Commits

Author SHA1 Message Date
Dante
c891dcc0ea BOM in schema.sql solution part 3 2015-06-10 11:33:05 -04:00
Dante
5880e3751f BOM in schema.sql solution part 2 2015-06-10 11:29:04 -04:00
Dante
068fa5fea7 BOM in schema.sql solution part 1 2015-06-10 11:28:11 -04:00
Brayan Pereyra
69abc612b4 BUG-17427 HTML Editor available for multiple Textarea controls in Dynaforms 2015-06-10 11:18:22 -04:00
Dante
2c21a10f6e resolution of calendar conflicts2 2015-06-10 11:01:27 -04:00
Dante
7637f84150 Merge branch 'dashboards2' of bitbucket.org:colosa/processmaker into dashboards2 2015-06-10 10:44:17 -04:00
Dante
46602be306 resolution of calendar conflicts 2015-06-10 10:43:23 -04:00
Marco Antonio Nina Mena
b8b612a46c Merged colosa/processmaker into master 2015-06-10 08:54:01 -04:00
Paula V. Quispe
4d011b4174 PM-1060: Firt migration ldapAdvanced 2015-06-09 16:14:01 -04:00
marcelo.cuiza
ab89629ec4 PM-2348,PM-2469,PM-2470
Designer > BPMN Designer: Estandarizar la funcionalidad del botóCancel'

Se agrego funcionalidad para IE
2015-06-09 14:36:43 -04:00
marcelo.cuiza
4ee1c1ec70 Merge remote branch 'upstream/master' 2015-06-09 10:42:10 -04:00
Victor Saisa Lopez
5a893d0ca8 Merge branch 'master' of bitbucket.org:colosa/processmaker 2015-06-09 09:43:45 -04:00
Quenta Ronald
0b67947407 Merged colosa/processmaker into master 2015-06-09 08:59:37 -04:00
Julio Cesar Laura Avendaño
7b8f7b3792 Merged in paulis/processmaker/PM-2780-PM (pull request #2308)
PM-2780:Add an option to select minutes to task timing control
2015-06-08 13:37:45 -04:00
Paula V. Quispe
0db77754aa I added minutes in end point 2015-06-08 13:10:48 -04:00
Paula V. Quispe
058120f862 PM-2815: I checked the funcion in cron 2015-06-08 12:59:45 -04:00
Julio Cesar Laura Avendaño
0dc542bef2 Merged in paulis/processmaker/PM-2884 (pull request #2311)
PM-2884: I solved a issue with ENGINE=InnoDB
2015-06-08 12:57:57 -04:00
Paula V. Quispe
35c9338a14 PM-2884: I deleted a line 2015-06-08 12:43:48 -04:00
Paula V. Quispe
11af05a351 PM-2884: I solved a issue with ENGINE=InnoDB 2015-06-08 12:06:25 -04:00
Victor Saisa Lopez
828681befc Merge branch 'master' of bitbucket.org:colosa/processmaker 2015-06-08 12:04:53 -04:00
Paula V. Quispe
193c996bfa PM-2815: I added minutes in Assigment rules > timing control 2015-06-08 11:34:13 -04:00
Ronald Quenta
2c7f2e5cf3 Merge branch 'master' of bitbucket.org:qronald/processmaker 2015-06-08 10:23:14 -04:00
Ronald Quenta
d93b4b6464 Merge remote branch 'pm/master' 2015-06-08 10:23:00 -04:00
Quenta Ronald
e5362006fa Merged colosa/processmaker into master 2015-06-08 10:10:19 -04:00
Julio Cesar Laura Avendaño
f1b7efe331 Merged in victorsl/processmaker/PM-2835 (pull request #2303)
PM-2835 "Adicionar los siguientes features..." SOLVED
2015-06-08 09:57:33 -04:00
Quenta Ronald
c5c3b404c3 Merged colosa/processmaker into master 2015-06-08 09:51:20 -04:00
Marco Antonio Nina Mena
38762a65d8 Merged colosa/processmaker into master 2015-06-08 09:09:20 -04:00
Victor Saisa Lopez
8d596bddf3 Merge branch 'master' of bitbucket.org:colosa/processmaker 2015-06-08 09:03:21 -04:00
marcelo.cuiza
47ff0e6c11 Merge remote branch 'upstream/master' 2015-06-08 08:56:21 -04:00
Paula V. Quispe
c69dfee3c9 PM-2780: I added minutes in sreen_Derivation 2015-06-08 08:54:34 -04:00
Paula V. Quispe
19f772d496 PM-2780:Add an option to select minutes to task timing control 2015-06-08 08:11:27 -04:00
Julio Cesar Laura Avendaño
bf387ea1f9 Merged in luisfernandosl/processmaker/PM-2891 (pull request #2304)
PM-2891 "No se muestra el scrollbar en el modulo..." SOLVED
2015-06-05 17:40:44 -04:00
Victor Saisa Lopez
8574af00c2 Merge branch 'master' of bitbucket.org:colosa/processmaker 2015-06-05 16:56:32 -04:00
Luis Fernando Saisa Lopez
a44fd05e6f PM-2891 "No se muestra el scrollbar en el modulo..." SOLVED 2015-06-05 16:14:33 -04:00
Victor Saisa Lopez
617198ef17 PM-2835 "Adicionar los siguientes features..." SOLVED
Issue:
    Adicionar los siguientes features la posibilidad de seleccionarse en la licencia (features):
    - Code Scanner
    - Multiple Email Servers
    - Mobile Fields
Cause:
    Nueva validacion de licencia para features
Solution:
    - Se agrego validacion de licencia para los features especificados
    - Se completo el "Code Scanner" para procesos BPMN (import and triggers)
Note:
    QA debera hacer pruebas en procesos pm y pmx
2015-06-05 15:44:28 -04:00
Victor Saisa Lopez
788487f524 Merge branch 'master' of bitbucket.org:colosa/processmaker into PM-2835 2015-06-05 10:28:41 -04:00
Julio Cesar Laura Avendaño
95b1c11813 Merged in paulis/processmaker/PM-2814 (pull request #2300)
PM-2814: Update logo with the registered simbol
2015-06-05 10:05:47 -04:00
Paula V. Quispe
f642bec47b PM-2815: I added MINUTES in end point 2015-06-05 09:58:35 -04:00
Quenta Ronald
1909757900 Merged colosa/processmaker into master 2015-06-05 09:23:16 -04:00
Dante Loayza
bfd1bb1fb8 Merged in marcoAntonioNina/processmaker/dashboards2 (pull request #2301)
Add field cost and unit cost in tables user reporting and pro reporting
2015-06-03 17:28:09 -04:00
Marco Antonio Nina Mena
c20db26fba Add field cost and unit cost in tables user reporting and pro reporting 2015-06-03 17:20:00 -04:00
marcelo.cuiza
c79380b708 Merge remote branch 'upstream/master' 2015-06-03 17:15:08 -04:00
Dante Loayza
a71c388ca7 Merged in marcoAntonioNina/processmaker/dashboards2 (pull request #2299)
Add fields cost and unit cost in Process Properties
2015-06-03 11:59:54 -04:00
Marco Antonio Nina Mena
68c1a722a9 Add fields cost and unit cost in Process Properties 2015-06-03 11:51:26 -04:00
Dante
4e2b101b25 Change of arrows icons 2015-06-03 10:31:39 -04:00
Victor Saisa Lopez
8cbae210e1 Merge branch 'master' of bitbucket.org:colosa/processmaker into PM-2835 2015-06-03 09:44:45 -04:00
Dante
638ec76798 app delgation and calendar functions renaming 2015-06-03 09:37:28 -04:00
Paula V. Quispe
0af6a20839 I updated the logos 2015-06-03 09:24:22 -04:00
Marco Antonio Nina Mena
bba7eea6fc Merge branch 'master' of bitbucket.org:marcoAntonioNina/processmaker into dashboards2 2015-06-03 08:40:57 -04:00
Marco Antonio Nina Mena
dd87162609 Merged colosa/processmaker into master 2015-06-03 08:29:54 -04:00