fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,559 Commits 1 Branch 0 Tags
0ab7b29d0746de2e550ed1302f235e6bb892895b
Commit Graph

14559 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
jennydmz
0ab7b29d07 BY-103 
A letter was missed in the name of the file.
 2016-02-05 10:49:33 -04:00
Dante Loayza
8374469589 Merged in marcoAntonioNina/processmaker/GI-244-A (pull request #3464) 
GI-244-A
 2016-01-08 14:59:35 -04:00
Marco A. Nina Mena
3f5cedd304 GI-244-A 
- Cambiando hash de licencias
 2016-01-08 14:53:40 -04:00
Dante Loayza
f7ad60fe63 Merged in marcoAntonioNina/processmaker/GI-244 (pull request #3463) 
GI-244
 2016-01-08 14:32:29 -04:00
Marco A. Nina Mena
5ae20ed740 GI-244 No se distingue el uso de las licencias.... 
- Se cambio el hash de la licencia.
- Se cambio la validacion de cada una.
 2016-01-08 14:23:58 -04:00
Dante Loayza
4803062077 Merged in marcoAntonioNina/processmaker/GI-235-B (pull request #3461) 
GI-235-B
 2016-01-08 11:44:39 -04:00
Marco A. Nina Mena
1e9d8b0eb8 Add validation flag gmail and drive. 2016-01-08 10:11:11 -04:00
Dante Loayza
db3f10064d Merged in danteloayza/processmaker/GI-243 (pull request #3460) 
GI-243 La instrucción para añadir la reetiquetación de casos unassigned usa la configuración de drive
 2016-01-07 17:00:20 -04:00
Dante
02c723640a GI-243 La instrucción para añadir la reetiquetación de casos unassigned usa la configuración de drive 2016-01-07 16:53:48 -04:00
Dante Loayza
7f40f811c4 Merged in marcoAntonioNina/processmaker/GI-165-A (pull request #3459) 
Change scopes to constants
 2016-01-06 11:18:47 -04:00
Dante Loayza
51f55781a4 Merged in jennydmz/processmaker/GI-240-A (pull request #3457) 
GI-240-A
 2016-01-06 11:15:43 -04:00
Marco A. Nina Mena
fd5f21547c Change scopes to constants 2016-01-06 11:07:56 -04:00
Dante Loayza
a1466cb664 Merged in marcoAntonioNina/processmaker/GI-235-A (pull request #3458) 
GI-235-A
 2016-01-06 09:20:55 -04:00
Marco A. Nina Mena
8d817ce692 GI-235-A 
- Se adiciona la validación con licencia Drive.
- Se elemina codigo que ya no se utiliza.
 2016-01-06 09:10:38 -04:00
jennydmz
5cbfcabb39 GI-240 
Fixing an error when loading the class pmGoogleApi.
 2016-01-05 17:21:31 -04:00
Dante Loayza
fc9da96341 Merged in jennydmz/processmaker/GI-238 (pull request #3453) 
GI-238
 2016-01-05 15:46:42 -04:00
Dante Loayza
b8468dc99f Merged in marcoAntonioNina/processmaker/GI-235 (pull request #3454) 
GI-235
 2016-01-05 15:44:36 -04:00
Marco A. Nina Mena
bbc09c20c4 GI-235 Modificar pantalla PmGmail Admin para seleccionar las 2 funcionalidades:Drive y Gmail 2016-01-05 15:32:49 -04:00
jennydmz
a4e39af011 GI-238 
Changing the hash of the drive feature.

GI-238

Changing the hash of the drive feature.
 2016-01-05 14:58:40 -04:00
Dante Loayza
71e996655f Merged in danteloayza/processmaker/GI-241 (pull request #3452) 
GI-241 modificar el nombre del archivo logo-processmake-google.png a logo-processmaker-google
 2016-01-05 14:27:24 -04:00
Dante
1e1f5a9ba5 GI-241 modificar el nombre del archivo logo-processmake-google.png a logo-processmaker-google 2016-01-05 14:23:19 -04:00
Dante Loayza
af5847d16a Merged in jennydmz/processmaker/GI-240 (pull request #3451) 
GI-240
 2016-01-05 13:32:55 -04:00
jennydmz
70d395c6e8 GI-240 
Changing the method that verifies if the Gmail feature is enabled (Now is separeted from Drive feature).

GI-240

Changing the method that verifies if the Gmail feature is enabled (Now is separeted from Drive feature).
 2016-01-05 12:59:23 -04:00
Dante Loayza
f7d9035d17 Merged in jennydmz/processmaker/GI-239 (pull request #3450) 
GI-239
 2016-01-05 11:24:28 -04:00
jennydmz
77e4fbefff GI-239 
Changing the 'PM Gmail' label in the list of options in ADMIN > Settings.
 2016-01-05 11:16:58 -04:00
Dante Loayza
d7c70140bf Merged in marcoAntonioNina/processmaker/GI-237 (pull request #3449) 
GI-237
 2016-01-05 10:54:27 -04:00
Marco A. Nina Mena
18901e7192 Set value false 2016-01-05 10:49:12 -04:00
Marco A. Nina Mena
11f68338d9 GI-237 Añadir propiedades en clase GoogleApi que indiquen estado habilitación Gmail y Drive 
- Se añadio 2 propiedades $serviceDriveStatus, $serviceGmailStatus
 2016-01-05 10:44:35 -04:00
Dante Loayza
02dbc25760 Merged in jennydmz/processmaker/GI-230 (pull request #3448) 
GI-230
 2016-01-04 16:51:39 -04:00
jennydmz
6ed37b3f19 GI-230 
Fixing 404 error in the uninstall page.
 2016-01-04 16:38:52 -04:00
Dante Loayza
3e09c8321e Merged in danteloayza/processmaker/GI-229 (pull request #3445) 
GI-229 Modificar drive para que lea la información del archivo json y no del p12
 2016-01-02 12:09:01 -04:00
Dante
9d068bfbba GI-229 Modificar drive para que lea la información del archivo json y no del p12 2016-01-02 12:02:11 -04:00
Dante
b043a770a5 Merge remote-tracking branch 'upstream/3.0.1.7' into 3.0.1.7-Gmail 2015-12-23 19:20:17 -04:00
Dante Loayza
d4a5d3ce8c Merged in jennydmz/processmaker/GI-225 (pull request #3439) 
GI-225
 2015-12-22 17:28:54 -04:00
Dante Loayza
76977c527f Merged in jennydmz/processmaker/GI-218 (pull request #3440) 
GI-218
 2015-12-22 17:27:38 -04:00
Dante Loayza
b23cd2af25 Merged in jennydmz/processmaker/GI-206 (pull request #3438) 
GI-206
 2015-12-22 17:26:47 -04:00
jennydmz
23a99fad79 GI-218 
Changing the default p12 file for the new json configuration service account file
 2015-12-22 17:17:43 -04:00
Julio Cesar Laura Avendaño
591d4f59c4 Merged in paulis/processmaker/PM-4540 (pull request #3437) 
PM-4540
 2015-12-22 16:54:06 -04:00
Paula V. Quispe
2b34ddf790 PM-4540 2015-12-22 15:16:17 -04:00
Dante Loayza
547b4e20fc Merged in jennydmz/processmaker/GI-227 (pull request #3436) 
GI-227
 2015-12-22 13:42:00 -04:00
jennydmz
bd07687d57 GI-225 
Getting the server email configuration to set the email from the default server as the email from in the sended message.
 2015-12-22 11:26:42 -04:00
jennydmz
1a35e599c0 GI-206 
Changing the skin harcoded to the one that is loaded in session.
 2015-12-22 10:46:01 -04:00
jennydmz
6ad029273f GI-227 
Adding a simple validation in templates/cases/cases.js to hide the unpuse buttons if we are in the gmail interface.

And deleting the call to methods that make the pause cases send message.
 2015-12-22 08:42:41 -04:00
jennydmz
65910c3a08 Merge remote branch 'upstream/3.0.1.7-Gmail' into 3.0.1.7-Gmail 2015-12-22 08:26:10 -04:00
Julio Cesar Laura Avendaño
7ec245283f Merged in paulis/processmaker/PM-4495 (pull request #3434) 
PM-4495
 2015-12-21 17:29:59 -04:00
Paula V. Quispe
e487453bb2 PM-4495 2015-12-21 16:34:38 -04:00
Julio Cesar Laura Avendaño
c53d01cae7 Merged in paulis/processmaker/PM-4474 (pull request #3415) 
PM-4474
 2015-12-21 16:16:18 -04:00
Dante Loayza
0f3596d386 Merged in marcoAntonioNina/processmaker/GI-217 (pull request #3433) 
GI-217
 2015-12-21 16:12:51 -04:00
Julio Cesar Laura Avendaño
a0cf808fd9 Merged in paulis/processmaker/PM-4519 (pull request #3432) 
PM-4519
 2015-12-21 16:03:32 -04:00
Paula V. Quispe
eec7ec3327 PM-4474 
PM-4474

PM-4474

PM-4474

PM-4474
 2015-12-21 15:06:09 -04:00