Commit Graph

11634 Commits

Author SHA1 Message Date
veronicaaruquipa
e83469478a Merge branch 'master' of https://bitbucket.org/veronicaaruquipa/processmaker into fixing-broken-features 2014-12-18 19:29:18 -04:00
veronicaaruquipa
4535b97854 Review the Backend QA instance and Michelangelo instance because in the Michelangelo instance it is possible to start a task with wrong password. 2014-12-18 19:27:57 -04:00
Richard Yujra
74e5994f1d Merge branch 'master' of bitbucket.org:richardnoel/processmaker 2014-12-18 16:47:23 -04:00
Julio Cesar Laura Avendaño
4f5e0ab23e Merged in darojas/processmaker/PM-1126 (pull request #1290)
PM-1142 "Any user can reassign any case even if he/she is not assign to the task" SOLVED
2014-12-18 14:51:36 -04:00
Freddy Daniel Rojas Valda
69d24d5f68 PM-1142 "Any user can reassign any case even if he/she is not assign to the task" SOLVED 2014-12-19 13:38:04 -04:00
Freddy Daniel Rojas Valda
dbe8219e6b PM-1142 "Any user can reassign any case even if he/she is not assign to the task" SOLVED 2014-12-19 11:59:40 -04:00
Freddy Daniel Rojas Valda
d9169e1163 Merge branch 'master' of bitbucket.org:colosa/processmaker into PM-1126 2014-12-19 09:26:03 -04:00
norahmollo
bd03b838df PM-14992 RW-152-6 Reflected Cross Site Scripting
Codigo JavaScript evaluado y ejecutado
2014-12-18 09:06:40 -04:00
Freddy Daniel Rojas Valda
3c4763793e Merge branch 'master' of bitbucket.org:colosa/processmaker into PM-1126 2014-12-18 09:05:17 -04:00
Veronica Aruquipa
e3251d45b0 Merged colosa/processmaker into master 2014-12-18 08:56:34 -04:00
Richard Yujra
f7f29736cf Merged colosa/processmaker into master 2014-12-17 16:53:35 -04:00
Richard Yujra
7a43647cbb Merge branch 'master' of bitbucket.org:richardnoel/processmaker 2014-12-17 16:25:59 -04:00
Julio Cesar Laura Avendaño
9826220ce4 Merged in julceslau/processmaker (pull request #1287)
Fix notice message in class derivation when the next task is end of process
2014-12-17 16:16:24 -04:00
Julio Cesar Laura
0034008941 Fix notice message in class derivation when the next task is end of process 2014-12-18 15:40:43 -04:00
Julio Cesar Laura Avendaño
d09aa63b7c Merged in veronicaaruquipa/processmaker/fixing-broken-features (pull request #1286)
Some input data were chaged in order to match the expected results with API results.
2014-12-17 14:37:15 -04:00
Freddy Daniel Rojas Valda
484660f0f7 Merge branch 'master' of bitbucket.org:colosa/processmaker into master-core 2014-12-17 13:33:06 -04:00
Veronica Aruquipa
0e177296b9 Merged master into fixing-broken-features 2014-12-17 12:35:20 -04:00
Veronica Aruquipa
6f0000bbc2 Merged colosa/processmaker into master 2014-12-17 12:34:39 -04:00
veronicaaruquipa
1e99846d3b It was changed the input data in order to match the the expected result from web service and corresponding behat test. 2014-12-17 12:06:18 -04:00
veronicaaruquipa
7b4cbd0589 It was changed the sql-server-db-connection tests file name in order to we don't have an instance of ProcessMaker with Microsoft SQL Server available for now. 2014-12-16 17:33:23 -04:00
Richard Yujra
4fe77a2382 Merged colosa/processmaker into master 2014-12-16 16:33:56 -04:00
Julio Cesar Laura Avendaño
92ece428dd Merged in gproly/processmaker (pull request #1284)
PMFormDesigner
2014-12-16 16:13:43 -04:00
Roly Rudy Gutierrez Pinto
d4d9c5845f PMFormDesigner 2014-12-16 15:48:11 -04:00
Freddy Daniel Rojas Valda
b7cb97c60c Merge branch 'master' of bitbucket.org:colosa/processmaker into master-core 2014-12-16 15:24:45 -04:00
Veronica Aruquipa
ab9f2d4e4c Merged colosa/processmaker into master 2014-12-16 15:05:53 -04:00
Freddy Daniel Rojas Valda
f712cb4468 PM-1117 Paused Case - SOLVED 2014-12-16 11:53:11 -04:00
Julio Cesar Laura Avendaño
4c79c04b4b Merged in cochalo/processmaker/BUG-16211 (pull request #1283)
BUG 16211 Messages History: No muestra los mensajes enviados
2014-12-16 11:23:39 -04:00
Brayan Osmar Pereyra Suxo
f10fdd7572 BUG 16211 Messages History: No muestra los mensajes enviados 2014-12-16 11:13:09 -04:00
Veronica Aruquipa
cd4208eac3 Merged colosa/processmaker into master 2014-12-16 10:47:01 -04:00
Julio Cesar Laura Avendaño
ee1ce8d278 Merged in darojas/processmaker/master-core (pull request #1280)
PM-1117 Paused Case - SOLVED
2014-12-16 09:43:58 -04:00
Quenta Ronald
6f9a247bb2 Merged colosa/processmaker into master 2014-12-15 11:45:30 -04:00
Julio Cesar Laura Avendaño
9e878cc516 Merged in victorsl/processmaker/PM-1111 (pull request #1279)
PM-1111 "16332: Grids with same name (Small fix)" SOLVED
2014-12-15 09:12:40 -04:00
Victor Saisa Lopez
2f0053a667 PM-1111 "16332: Grids with same name (Small fix)" SOLVED
Small fix
2014-12-13 16:50:32 -04:00
Victor Saisa Lopez
4f52f0a433 PM-1111 "16332: Grids with same name (Small fix)" SOLVED
Small fix
2014-12-13 16:45:53 -04:00
Freddy Daniel Rojas Valda
6d350195da Merge branch 'master' of bitbucket.org:colosa/processmaker into master-core 2014-12-13 16:17:12 -04:00
Freddy Daniel Rojas Valda
055248e212 Merge branch 'master' of bitbucket.org:colosa/processmaker into master-core 2014-12-13 10:15:32 -04:00
Julio Cesar Laura Avendaño
8d8363ab59 Merged in cochalo/processmaker (pull request #1276)
BUG-16459 Cases Notes: No muestra todo el texto introducido
2014-12-12 16:26:28 -04:00
Julio Cesar Laura Avendaño
f5cb3b2045 Merged in luisfernandosl/processmaker/PM-940 (pull request #1277)
PM 940 "ProcessMaker-MA "Email Server (endpoints)"" SOLVED
2014-12-12 16:24:17 -04:00
Luis Fernando Saisa Lopez
aef82289c2 PM 940 "ProcessMaker-MA "Email Server (endpoints)"" SOLVED 2014-12-13 16:06:47 -04:00
Luis Fernando Saisa Lopez
003153366a Merge branch 'master' of bitbucket.org:colosa/processmaker into PM-940 2014-12-13 15:56:01 -04:00
Luis Fernando Saisa Lopez
4e62e6c29e Merge branch 'master' of bitbucket.org:colosa/processmaker into PM-940 2014-12-13 12:20:58 -04:00
Brayan Osmar Pereyra Suxo
9989cbbad6 BUG-16459 Cases Notes: No muestra todo el texto introducido 2014-12-12 16:10:23 -04:00
Luis Fernando Saisa Lopez
06777f0d50 PM 940 "ProcessMaker-MA "Email Server (endpoints)"" SOLVED
> ProcessMaker-MA "Email Server (endpoints)"

  - Se han implementado los siguientes Endpoints:
	GET    /api/1.0/{workspace}/email/paged?filter={filter}&start={start}&limit={limit}
	GET    /api/1.0/{workspace}/emails?filter={filter}&start={start}&limit={limit}
	GET    /api/1.0/{workspace}/email/{mess_uid}
	POST   /api/1.0/{workspace}/email
	POST   /api/1.0/{workspace}/email/test-connection
	PUT    /api/1.0/{workspace}/email/{mess_uid}
	DELETE /api/1.0/{workspace}/email/{mess_uid}

  - Se esta creando un 1er registro en la tabla EMAIL_SERVER, esto al ejecutar el comando "./processmaker upgrade".
  - El metodo "System::getEmailConfiguration()" recupera el EMAIL_SERVER por default, caso contrario trabajara como lo
    hacia anteriormente.

Merge branch 'master' of bitbucket.org:colosa/processmaker into PM-940

Conflicts:
	workflow/engine/config/schema.xml
	workflow/engine/data/mysql/schema.sql
2014-12-12 15:13:53 -04:00
Julio Cesar Laura Avendaño
d40b3a864c Merged in luisfernandosl/processmaker/PM-940 (pull request #1271)
PM 940 "ProcessMaker-MA "Email Server (endpoints)"" SOLVED
2014-12-12 14:50:41 -04:00
Julio Cesar Laura Avendaño
71cf0f68ed Merged in victorsl/processmaker/PM-1115 (pull request #1275)
PM-1115 "16306: Date Field not showing next date after 1969" SOLVED
2014-12-12 10:45:48 -04:00
Victor Saisa Lopez
9531d78fe1 PM-1115 "16306: Date Field not showing next date after 1969" SOLVED
Issue:
    16306: Date Field not showing next date after 1969
Cause:
    Esto se debe a la funcion "mktime" de PHP para Windows el cual tiene una limitante
    en el rango de fechas (rango valido entre 1901 y 2038). Para mas detalles
    visite el sgte link ----> http://php.net/manual/en/function.mktime.php
Solution:
    Se ha mejorado el metodo "calculateBeforeFormat" de la clase "XmlForm_Field_Date" el
    cual verifica el total de añde la fecha que se obtiene con "mktime"; esto solo
    para servidores Windows
2014-12-12 17:33:13 -04:00
Julio Cesar Laura Avendaño
d048b55613 Merged in darojas/processmaker/PM-1113 (pull request #1272)
PM-1113 Arreglar labels para PM3 - SOLVED
2014-12-11 17:13:33 -04:00
Freddy Daniel Rojas Valda
1429ca3741 PM-1113 Arreglar labels para PM3 - SOLVED 2014-12-12 15:49:06 -04:00
Freddy Daniel Rojas Valda
2fcaef2db4 Merge branch 'master' of bitbucket.org:colosa/processmaker into PM-1113 2014-12-12 12:15:15 -04:00
Julio Cesar Laura Avendaño
6b82927b7d Merged in jennydmz/processmaker (pull request #1273)
Fixing the Codemirror PHP hints to include PMFunctions
2014-12-11 17:04:30 -04:00