Commit Graph

13118 Commits

Author SHA1 Message Date
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
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
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
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
Dante
638ec76798 app delgation and calendar functions renaming 2015-06-03 09:37:28 -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
Dante
c07cd643df remove old calculateDuration function 2015-06-02 17:41:19 -04:00
Dante Loayza
0e4cfd9940 Merged in marcoAntonioNina/processmaker/dashboards2 (pull request #2296)
Add tooltips dashboards view
2015-06-02 17:32:46 -04:00
Dante
1c09be6c84 duration, delay and queue calculation corrections 2015-06-02 17:27:14 -04:00
Julio Cesar Laura Avendaño
5f09e4a4fd Merged in victorsl/processmaker/PM-2809-2 (pull request #2297)
PM-2809 "Mejora del calculo de creacion de casos en el... (fix)" SOLVED
2015-06-02 17:22:30 -04:00
Victor Saisa Lopez
400854098a PM-2809 "Mejora del calculo de creacion de casos en el... (fix)" SOLVED
Fix to update the SCH_END_DATE field
2015-06-02 14:47:34 -04:00
Marco Antonio Nina Mena
e23d613ff6 Add tooltips dashboards view 2015-06-02 12:29:07 -04:00
Dante Loayza
d31bc48ecd Merged master into dashboards2 2015-06-02 11:12:04 -04:00
Marco Antonio Nina Mena
e7487eb4a8 Merge branch 'master' of bitbucket.org:marcoAntonioNina/processmaker into dashboards2 2015-06-02 10:02:17 -04:00
Marco Antonio Nina Mena
e2f3d02595 Merged colosa/processmaker into master 2015-06-02 09:59:08 -04:00
Julio Cesar Laura Avendaño
b782819cca Merged in luisfernandosl/processmaker/PM-2828 (pull request #2292)
PM-2828 "In the BPMN Designer, can not connect..." SOLVED
2015-06-01 17:53:53 -04:00
Luis Fernando Saisa Lopez
914537d445 PM-2828 "In the BPMN Designer, can not connect..." SOLVED 2015-06-01 13:58:50 -04:00
Marco Antonio Nina Mena
52bcb82c7a Merged colosa/processmaker into master 2015-06-01 13:27:23 -04:00
Luis Fernando Saisa Lopez
cb93c2fe8f Merge branch 'master' of bitbucket.org:colosa/processmaker into PM-2828 2015-06-01 12:41:32 -04:00
Julio Cesar Laura Avendaño
6b1e603cfb Merged in dheeyi/processmaker/PM-2790 (pull request #2290)
PM-2790 0017387: Derivacion en paralelo, una de los hilos llega a la bandeja como leido
2015-06-01 09:38:35 -04:00
Marco Antonio Nina Mena
15a98e7117 Merge branch 'master' of bitbucket.org:marcoAntonioNina/processmaker into dashboards2 2015-06-01 08:46:08 -04:00
Marco Antonio Nina Mena
5aa9a64ce5 Merged colosa/processmaker into master 2015-06-01 08:42:57 -04:00
Julio Cesar Laura Avendaño
d0f39c0504 Merged in mcuiza/processmaker/PM-874 (pull request #2274)
PM-874 - No se puede importar Report Tables en los procesos
2015-06-01 08:41:52 -04:00
Marco Antonio Nina Mena
5dd419e2dc Merged colosa/processmaker into master 2015-06-01 08:41:50 -04:00
Julio Cesar Laura Avendaño
40f5026211 Merged in dheeyi/processmaker/PM-2672 (pull request #2285)
PM-2672 La cuadro "Get Started" es modal, pero en Chrome esta propiedad no ocupa toda la ventana del Navegador
2015-06-01 08:40:25 -04:00
dheeyi
35247643f1 PM-2790
0017387: Derivacion en paralelo, una de los hilos llega a la bandeja como leido
2015-05-29 17:31:16 -04:00
dheeyi
12edf45060 Merge remote branch 'upstream/master' into PM-2790 2015-05-29 17:12:11 -04:00
marcelo.cuiza
cfcebd3da5 pm-874 2015-05-29 16:07:30 -04:00
Luis Fernando Saisa Lopez
5018092db2 PM-2828 "In the BPMN Designer, can not connect..." SOLVED 2015-05-29 15:23:51 -04:00
Julio Cesar Laura Avendaño
056be92c74 Merged in paulis/processmaker/PM-2791-2 (pull request #2286)
PM-2791: I added the regular expresion in other place
2015-05-29 14:59:17 -04:00
Paula V. Quispe
1aee191a1b PM-2791: I added the regular expresion in other place 2015-05-29 14:42:29 -04:00
Marco Antonio Nina Mena
23ded482a4 Merge remote-tracking branch 'upstream/dashboards2' into dashboards2 2015-05-29 14:39:21 -04:00
Julio Cesar Laura Avendaño
4e5c32c2c3 Merged in dheeyi/processmaker/PM-2713 (pull request #2284)
PM-2713 Outlook Connector: No muestra la información de Process Map en el cliente
2015-05-29 13:42:08 -04:00
dheeyi
69ede48baf PM-2672
La cuadro "Get Started" es modal, pero en Chrome esta propiedad no ocupa toda la ventana del Navegador
2015-05-29 12:03:35 -04:00
Dante
10c5526a64 Revert "init datae compare in view added"
This reverts commit b23036cc523d75a411e38bfe291815eca2f5a7d2.
2015-05-29 11:46:16 -04:00
Dante
a7edf93e33 Revert "period compare fix"
This reverts commit 677ac667fba94d3ee23e05a872876370ee9ad9a0.
2015-05-29 11:46:09 -04:00
Dante
bb23de5253 Revert "add oldValue to presenter->dashboardIndicatorsViewModel"
This reverts commit 43e466721fd60c615ccabb6548652365ca8edadf.
2015-05-29 11:45:48 -04:00
Dante
dde451e37f Revert "rounding two 2 decimals the indicator's old value"
This reverts commit 67b4e31a3075cca526a063cfed85f70e5a00cabc.
2015-05-29 11:45:37 -04:00
Dante
535d11a41b Revert "Add interfaz list Inbox"
This reverts commit c326dc43c37047faf54f9a6bfa2774722f45e33d.
2015-05-29 11:45:06 -04:00
Dante
a5322a97a2 Revert "Arrows icons changed"
This reverts commit 20ae6d31eec85f2fde0aa6c4a30d904ec8b66f75.
2015-05-29 11:43:32 -04:00
marcelo.cuiza
cf1ccbb15d PM-874 2015-05-29 11:33:05 -04:00
Marco Antonio Nina Mena
2a85cd11b1 Merge branch 'master' of bitbucket.org:marcoAntonioNina/processmaker into dashboards2 2015-05-29 09:22:32 -04:00
Marco Antonio Nina Mena
00b90de47c Merge remote-tracking branch 'upstream/dashboards2' into dashboards2 2015-05-29 09:21:56 -04:00