Commit Graph

14236 Commits

Author SHA1 Message Date
jennydmz
e95bfac099 mergeconflich resolved 2015-11-27 16:32:44 -04:00
David Callizaya
626cfd55fe Merged in dheeyi/processmaker/pm-4160 (pull request #3247)
pm-4160
2015-11-27 15:26:13 -04:00
David Callizaya
88de6cc157 Merged in qronald/processmaker/4161_A (pull request #3249)
PM-4161
2015-11-27 15:25:48 -04:00
David Callizaya
b09e246c22 Merged in paulis/processmaker/PM-3532-V7 (pull request #3255)
PM-3532
2015-11-27 15:04:46 -04:00
David Callizaya
96c43f09b0 Merged in paulis/processmaker/PM-4216-V7 (pull request #3257)
PM-4216
2015-11-27 15:04:32 -04:00
Julio Cesar Laura Avendaño
b371a2c05f Merged in paulis/processmaker/PM-4215 (pull request #3253)
PM-4215
2015-11-27 14:52:01 -04:00
Julio Cesar Laura Avendaño
c98d4b2aec Merged in paulis/processmaker/PM-4194 (pull request #3250)
PM-4194
2015-11-27 14:51:42 -04:00
Julio Cesar Laura Avendaño
64b17421f6 Merged in paulis/processmaker/PM-4090-V7 (pull request #3242)
PM-4090
2015-11-27 14:51:24 -04:00
Julio Cesar Laura Avendaño
5707409e1a Merged in mcuiza/processmaker/PM-4192 (pull request #3248)
PM-4192
2015-11-27 14:51:05 -04:00
Paula V. Quispe
a869a3074e PM-4216 2015-11-27 14:25:23 -04:00
Paula V. Quispe
2167324c07 PM-3532 2015-11-27 12:42:37 -04:00
Paula V. Quispe
d34b13037d PM-4215 2015-11-27 11:48:43 -04:00
Dante Loayza
0868766bc7 Merged in jennydmz/processmaker/GI-163 (pull request #3251)
GI-163
2015-11-27 11:43:30 -04:00
jennydmz
e13a5a56b7 GI-163
Adding some changes and validations for code review
2015-11-27 11:38:44 -04:00
Paula V. Quispe
b0880fc3db PM-4194 2015-11-27 11:31:49 -04:00
Ronald Quenta
d1e7f51bc7 PM-4161 2015-11-27 11:31:22 -04:00
Ronald Q
25ab8d80b3 remove comment 2015-11-27 11:21:49 -04:00
Ronald Q
aef2c01017 PM-4161 Modificaciones en los endpoints de Mobile para soportar timezones 2015-11-27 11:21:34 -04:00
william barra
fbb834aed5 Timezone
Conflicts:
	workflow/engine/src/ProcessMaker/Services/Api/Cases.php
2015-11-27 11:11:27 -04:00
Dante Loayza
bb4c1c2f14 Merged in marcoAntonioNina/processmaker/GI-162 (pull request #3246)
GI-162
2015-11-27 11:08:06 -04:00
Julio Cesar Laura Avendaño
3a9c268f48 Merged in victorsl/processmaker/PM-444-3017 (pull request #3244)
PM-444
2015-11-27 10:54:38 -04:00
Dante Loayza
bfa76fd34d Merged in danteloayza/processmaker/GI-164 (pull request #3245)
GI-164
2015-11-27 10:41:50 -04:00
Marco A. Nina Mena
c8bef4c68d GI-162 Corregir obser. code Review Pmdrive/Gmail SOLVED
- Add validation error_log, return

Change validate array_search == null to === false

Change setTimeout 36000 to 60000
2015-11-27 10:30:54 -04:00
Dante
1324beb6cb GI-164 Corregir Code Review en pmFunctions 2015-11-27 09:59:15 -04:00
Victor Saisa Lopez
6cd975664b PM-444 "0013316: Be able to assign users to different time zone (user's time zone)" SOLVED
Issue:
    PM-444:  0013316: Be able to assign users to different time zone
    PM-3493: Agregar soporte multiple timezone a los endpoints usando formato fecha ISO 8601
Cause:
    New feature
Solution:
    Added functionality for time zone
2015-11-26 20:11:58 -04:00
Paula V. Quispe
272d4c9f43 PM-4090
PM-4090
2015-11-26 15:17:00 -04:00
marcelo.cuiza
ee5774a11a PM-4192: 0019327: No se puede colocar un case label a una tarea cuando es de tipo paralelo
correccion de observacion
2015-11-26 15:00:10 -04:00
Julio Cesar Laura Avendaño
4879d8089e Merged in mcuiza/processmaker/PM-3915-A (pull request #3239)
PM-3915
2015-11-26 14:06:47 -04:00
Julio Cesar Laura Avendaño
aa60c8afd4 Merged in mcuiza/processmaker/PM-4112 (pull request #3240)
PM-4112
2015-11-26 14:05:26 -04:00
Julio Cesar Laura Avendaño
8cab1bb724 Merged in victorsl/processmaker/PM-4147-3016 (pull request #3235)
PM-4147
2015-11-25 17:50:16 -04:00
Julio Cesar Laura Avendaño
dc6d3fa1d1 Merged in danteloayza/processmaker/PM-4180 (pull request #3236)
PM-4180
2015-11-25 16:23:57 -04:00
Julio Cesar Laura Avendaño
255c26c502 Merged in paulis/processmaker/PM-3817 (pull request #3234)
PM-3817
2015-11-25 15:32:58 -04:00
Dante
9691cfad4c Merge remote-tracking branch 'upstream/3.0.1.6' into 3.0.1.6-Gmail 2015-11-25 14:26:33 -04:00
Dante
e10c092bb5 PM-4180 Return the created bookmark when a new bookmark is created. 2015-11-25 14:20:46 -04:00
Julio Cesar Laura Avendaño
5ec3c483ae Merged in mcuiza/processmaker/PM-3739-A (pull request #3231)
PM-3739
2015-11-25 12:17:05 -04:00
Julio Cesar Laura Avendaño
dd54273082 Merged in gproly/processmaker/PM-4157 (pull request #3233)
PM-4157
2015-11-25 12:12:21 -04:00
Victor Saisa Lopez
322f1729ed PM-4147 "Problemas con cron" SOLVED
Issue:
    Problemas con cron
Cause:
    Problemas con cron
Solution:
    Se actualizo el codigo de los crones: cron, ldapcron, messageeventcron, timereventcron
    por una version mas actual
2015-11-25 11:54:52 -04:00
Paula V. Quispe
d942e7b67c PM-3817 2015-11-25 11:37:14 -04:00
Roly Rudy Gutierrez Pinto
d8d0c20794 PM-4157 2015-11-25 11:19:43 -04:00
Julio Cesar Laura Avendaño
3f45e0df02 Merged in paulis/processmaker/PM-4165 (pull request #3230)
PM-4165
2015-11-25 10:59:06 -04:00
Julio Cesar Laura Avendaño
75a19353c9 Merged in luisfernandosl/processmaker/PM-4155 (pull request #3228)
PM-4155
2015-11-25 09:35:03 -04:00
marcelo.cuiza
80bd4a085c PM-3739: 18719: Urgent help required with ProcessMaker on IE 11 2015-11-24 17:30:20 -04:00
Paula V. Quispe
6ed85615b3 PM-4165 2015-11-24 17:28:51 -04:00
Julio Cesar Laura Avendaño
b94e0e6c61 Merged in paulis/processmaker/PM-4082-V6 (pull request #3223)
PM-4082
2015-11-24 17:10:35 -04:00
Julio Cesar Laura Avendaño
8b75f7fc4a Merged in paulis/processmaker/PM-4145-V6 (pull request #3215)
PM-4145
2015-11-24 16:53:00 -04:00
Julio Cesar Laura Avendaño
dadaa2194a Merged in paulis/processmaker/PM-4148-V6 (pull request #3214)
PM-4148
2015-11-24 16:52:24 -04:00
Julio Cesar Laura Avendaño
3c47b04cc5 Merged in paulis/processmaker/PM-4154-V6 (pull request #3216)
PM-4154
2015-11-24 16:51:42 -04:00
Julio Cesar Laura Avendaño
a5e33d73cb Merged in luisfernandosl/processmaker/PM-4153 (pull request #3222)
PM-4153
2015-11-24 16:48:46 -04:00
Dante Loayza
824763602f Merged in danteloayza/processmaker/3.0.1.6-Gmail (pull request #3229)
GI-156
2015-11-24 16:07:44 -04:00
Luis Fernando Saisa Lopez
3b8bcd0977 PM-4155 "Update warning page" SOLVED 2015-11-24 14:44:47 -04:00