Erik Amaru Ortiz 428da67762 Merge branch 'master' of github.com:colosa/processmaker ...

Conflicts:
	workflow/public_html/sysGeneric.php

2014-01-15 11:14:59 -04:00

..

calendarEdit.html

…

calendarEdit.js

Doc System, change hardcoded labels

2013-03-14 15:15:04 -04:00

email.tpl

BUG 8730 add template and javascript de este bug.

2012-03-15 17:57:30 -04:00

emails.js

IMPROVEMENET in emails configuration form

2014-01-09 14:07:42 -04:00

maintenance.html

Updates for OAuth2 support

2013-10-22 11:17:48 -04:00

pmLogo.html

BUG 11284 "When you select an image, the apply button image is shown on

2013-04-22 11:42:31 -04:00

pmLogo.js

Arreglo en label para la propiedad waitTitle

2013-09-02 10:55:45 -04:00

system.js

Arreglo en label para la propiedad waitTitle

2013-09-02 10:55:45 -04:00

uxUsersList.js

Bug 12047: Problema con el listado de Usuarios.

2013-06-06 15:34:18 -04:00