Commit Graph

12543 Commits

Author SHA1 Message Date
jonathan
4ea226b63f Merge branch 'master' of https://bitbucket.org/jonathanquispe/processmaker 2015-04-30 16:12:25 -04:00
jonathan quispe
2755a3ba3e Merged colosa/processmaker into master 2015-04-30 16:10:22 -04:00
Julio Cesar Laura Avendaño
c00a99447c Merged in qronald/processmaker (pull request #2044)
malFormed json without sending
2015-04-30 15:33:08 -04:00
jonathan quispe
27b35bc4d6 Merged colosa/processmaker into master 2015-04-30 15:24:36 -04:00
Julio Cesar Laura Avendaño
ec4d85dfbe Merged in paulis/processmaker/PM-2347 (pull request #2053)
PM-2347: I solved a notice
2015-04-30 14:00:32 -04:00
Paula V. Quispe
9995cb8062 PM-2347: I solved a notice 2015-04-30 13:55:56 -04:00
Quenta Ronald
10b6052e3d Merged colosa/processmaker into master 2015-04-30 13:23:21 -04:00
Julio Cesar Laura Avendaño
492fed8bf2 Merged in dheeyi/processmaker/PM-2393 (pull request #2052)
PM-2393
2015-04-30 13:13:01 -04:00
Julio Cesar Laura Avendaño
d267f2321c Merged in paulis/processmaker/PM-2543 (pull request #2046)
PM-2543: Error al adicionar triggers a los steps
2015-04-30 12:59:30 -04:00
dheeyi
f34b941e5f Se arreglo la razon el por que se volvio a abrir este card 2015-04-30 12:24:26 -04:00
dheeyi
baf5a48916 Merge remote branch 'upstream/master' 2015-04-30 12:15:50 -04:00
Julio Cesar Laura Avendaño
02852bf810 Merged in eriknyk/processmaker/enable-rest-api-from-plugins (pull request #2047)
Enabling Rest API service from plugins
2015-04-30 12:13:20 -04:00
jonathan quispe
d2f997607d Merged colosa/processmaker into master 2015-04-30 11:40:24 -04:00
jonathan
83d95a63e9 Merge remote branch 'upstream/master' 2015-04-30 11:38:52 -04:00
Julio Cesar Laura Avendaño
5093c0e206 Merged in luisfernandosl/processmaker/PM-2390 (pull request #2039)
PM-2390 "[Enterprise][Community] Login:..." SOLVED
2015-04-30 11:08:53 -04:00
Julio Cesar Laura Avendaño
dc0cafa321 Merged in paulis/processmaker/PM-2479 (pull request #2042)
PM-2479: actualizar VARIABLE_label en suprocesos
2015-04-30 11:08:10 -04:00
Julio Cesar Laura Avendaño
8bf6338e3c Merged in victorsl/processmaker/PM-1944 (pull request #2032)
PM-1944 "0015574: Current User se muestra con UNASSIGNED..." SOLVED
2015-04-30 11:01:21 -04:00
Julio Cesar Laura Avendaño
a5f411d31d Merged in dheeyi/processmaker/PM-2447 (pull request #2007)
PM-2447 Admin>Settigns>Calendar: Cuando quieres crear un calendario con el nombre demasiado largo dice que creo correctamente pero no creo en realidad con su nombre completo.
2015-04-30 10:59:16 -04:00
Julio Cesar Laura Avendaño
bb5b987196 Merged in dheeyi/processmaker/PM-2483 (pull request #2035)
PM-2483 DesignerBPMN>ProcessPermissions: No se puede editar un permiso mas de dos veces.
2015-04-30 10:58:46 -04:00
Julio Cesar Laura Avendaño
f3b4f78bf4 Merged in dheeyi/processmaker/PM-1879 (pull request #1989)
PM-1879 0015808: Incorrect messages handling and/or actions when the user's session expires in the DESIGNER module 0016086: Information of templates lost.
2015-04-30 10:58:04 -04:00
Julio Cesar Laura Avendaño
2df7980caa Merged in paulis/processmaker/PM-2374 (pull request #2017)
PM-2374: I deleted the tbsplit image
2015-04-30 10:51:58 -04:00
Julio Cesar Laura Avendaño
80f41ec371 Merged in paulis/processmaker/PM-2347 (pull request #1986)
PM-2347: Problemas con el FROM del ACTION BY EMAIL
2015-04-30 10:50:56 -04:00
Julio Cesar Laura Avendaño
9d7db0233a Merged in gproly/processmaker/PM-2310 (pull request #2045)
PM-2310
2015-04-30 09:41:01 -04:00
jonathan quispe
997b1b09a1 Merged colosa/processmaker into master 2015-04-30 09:40:16 -04:00
Julio Cesar Laura Avendaño
ca28c9c77a Merged in victorsl/processmaker/PM-2381 (pull request #2036)
PM-2381 "Randomicamente nos muestra el siguiente warning..." SOLVED
2015-04-30 09:38:52 -04:00
jonathan quispe
36c6e3fd53 Merged colosa/processmaker into master 2015-04-30 09:10:54 -04:00
Paula V. Quispe
62e65acc0a PM-2543: Error al adicionar triggers a los steps 2015-04-30 08:55:47 -04:00
dheeyi
3784aff5d7 Merge remote branch 'upstream/master' 2015-04-30 08:45:56 -04:00
Erik
1901b98571 Merge branch 'enable-rest-api-from-plugins' of bitbucket.org:colosa/processmaker into enable-rest-api-from-plugins 2015-04-29 17:41:13 -05:00
Erik
7c83243c23 Merge branch 'master' into enable-rest-api-from-plugins 2015-04-29 17:40:39 -05:00
Roly Rudy Gutierrez Pinto
7b1453631f PM-2310 2015-04-29 17:50:49 -04:00
Ronald Quenta
03f783f14d malFormed json without sending 2015-04-29 17:28:37 -04:00
Julio Cesar Laura Avendaño
f9b5abed98 Merged in qronald/processmaker (pull request #2043)
add new endpoint for process image, cancel, pause, unpause
2015-04-29 17:26:22 -04:00
Ronald Quenta
67807bc6e2 Merge branch 'master' of bitbucket.org:qronald/processmaker 2015-04-29 17:22:16 -04:00
Quenta Ronald
6fee84e7c4 Merged colosa/processmaker into master 2015-04-29 17:20:59 -04:00
Ronald Quenta
1b9e11541d add new endpoint for process image and cancel, pause, unpause 2015-04-29 17:18:43 -04:00
erik
467a241887 Fixing rest api dispatching for plugins with camelcase names
- plugin camelcase names are supported now
- fix for bug when a requests like
    GET /plugin-erik/hello/world
    GET /plugin-nonExistsPlugin/hello/world
  was resolving and dispatching the same resource
2015-04-29 16:15:57 -05:00
dheeyi
4ee9eea392 Merge remote branch 'upstream/master' 2015-04-29 17:06:12 -04:00
Julio Cesar Laura Avendaño
79b8344050 Merged in dashboards2 (pull request #2030)
Default Compare Date and Other tickets solved
2015-04-29 16:53:24 -04:00
jonathan quispe
dffe46d40e Merged colosa/processmaker into master 2015-04-29 16:52:00 -04:00
Paula V. Quispe
e633bf6c8e PM-2479: actualizar VARIABLE_label en suprocesos 2015-04-29 16:49:52 -04:00
erik
decbedd451 Merge branch 'master' into enable-rest-api-from-plugins 2015-04-29 15:43:44 -05:00
Dante Loayza
f49623a193 Merged in marcoAntonioNina/processmaker/dashboards2 (pull request #2041)
Improvement formDashboards
2015-04-29 16:32:15 -04:00
Dante Loayza
a0e0221e9b Merged master into dashboards2 2015-04-29 16:30:43 -04:00
Julio Cesar Laura Avendaño
bae59aac50 Merged in gproly/processmaker/PM-2394 (pull request #2040)
PM-2394
2015-04-29 16:29:35 -04:00
Marco Antonio Nina Mena
c11652b5fd Improvement formDashboards 2015-04-29 16:27:01 -04:00
Roly Rudy Gutierrez Pinto
fc76d32a66 PM-2394 2015-04-29 16:22:52 -04:00
Dante
372785f34d New labels added 2015-04-29 15:50:19 -04:00
Julio Cesar Laura Avendaño
e58d4f7af4 Merged in luisfernandosl/processmaker/PM-2254 (pull request #2033)
PM-2254 "El label de Custom Cases List..." SOLVED
2015-04-29 15:46:14 -04:00
Marco Antonio Nina Mena
d70929f5f4 Merge remote-tracking branch 'upstream/dashboards2' into dashboards2 2015-04-29 15:24:51 -04:00