Commit Graph

11634 Commits

Author SHA1 Message Date
veronicaaruquipa
be2bc32ccb Adjustment some PM server information details as generic info. 2014-12-08 12:26:17 -04:00
Julio Cesar Laura Avendaño
c01e76f1ef Merged in victorsl/processmaker/PM-1066 (pull request #1250)
PM-1066 "Al actualizar PM 2.5.2.3 a 2.8 no se puede crear..." SOLVED
2014-12-08 12:09:07 -04:00
Victor Saisa Lopez
9519916804 PM-1066 "Al actualizar PM 2.5.2.3 a 2.8 no se puede crear..." SOLVED
Issue:
    - PM-1066: Al actualizar PM 2.5.2.3 a 2.8 no se puede crear dashlets del advanced dashboard
    - PM-998: Review Batch routing en Enterprise Trial
Cause:
    Este problema es a causa de que cada plugin enterprise requiere
    que este cargado la clase "enterprisePlugin"
Solution:
    Se ha agregado un "require_once" para cargar clase "enterprisePlugin"
2014-12-08 11:44:54 -04:00
Julio Cesar Laura Avendaño
87c0b51ce0 Merged in cochalo/processmaker (pull request #1249)
Adicion de requerimiento de mcrypt par ala instalacion de PM
2014-12-08 11:32:29 -04:00
Brayan Osmar Pereyra Suxo
2fd3ad82ac Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-12-08 11:25:10 -04:00
Brayan Osmar Pereyra Suxo
6253574204 Adicion de requerimiento de mcrypt par ala instalacion de PM 2014-12-08 11:22:41 -04:00
Julio Cesar Laura Avendaño
56dee10fe8 Merged in darojas/processmaker/master-core (pull request #1247)
PM-1040. Remove code from the Community version. Change password hash method
2014-12-08 11:12:21 -04:00
Freddy Daniel Rojas Valda
e2750f806e PM-1040. Remove code from the Community version. Change password hash method 2014-12-08 11:07:55 -04:00
veronicaaruquipa
b0aa5d00ca Algunos Hooks ha sido adicionados para evitar errores al ejecutar los behats de conexión a las base de datos. 2014-12-08 09:56:04 -04:00
veronicaaruquipa
c35d4024f3 Parametrización de los parámetros de conexión a la base de datos declarados en behat.yml y enviados mediante los features. 2014-12-08 09:51:20 -04:00
veronicaaruquipa
d502648664 Parametrización de los parámetros de conexión a la base de datos declarados en behat.yml y enviados mediante los features. 2014-12-08 09:11:13 -04:00
veronicaaruquipa
274e865060 Merge branch 'master' of https://bitbucket.org/veronicaaruquipa/processmaker into fixing-broken-features 2014-12-08 09:08:10 -04:00
veronicaaruquipa
065d55bee5 Fixing code source indentation. 2014-12-08 00:20:52 -04:00
Veronica Aruquipa
171c615eee Merged colosa/processmaker into master 2014-12-07 23:32:55 -04:00
Julio Cesar Laura Avendaño
c61034182a Merged in darojas/processmaker/master-core (pull request #1245)
PM-1040. Remove code from the Community version. Fix EOT space
2014-12-05 17:04:19 -04:00
Freddy Daniel Rojas Valda
91de514063 PM-1040. Remove code from the Community version. Fix EOT space 2014-12-05 16:59:40 -04:00
Freddy Daniel Rojas Valda
99f853a877 Merge branch 'master' of bitbucket.org:colosa/processmaker into master-core 2014-12-05 15:45:59 -04:00
Veronica Aruquipa
87f1548574 Merged colosa/processmaker into master 2014-12-05 15:09:58 -04:00
Julio Cesar Laura Avendaño
2ed555cccc Merged in jennydmz/processmaker (pull request #1242)
PM-1055 Fixing CodeMirror Mode and Autocomplete
2014-12-05 14:32:41 -04:00
Veronica Aruquipa
44f8f633bf Merged fixing-broken-features into master 2014-12-05 14:20:49 -04:00
jennylee
51495f6a0b PM-1055 Fixin CodeMirror Mode and Autocomplete 2014-12-05 14:17:18 -04:00
Julio Cesar Laura Avendaño
40aeef0a80 Merged in norah/processmaker/PM_694 (pull request #1241)
PM-694 Deprecated for php 5.4
2014-12-05 11:43:25 -04:00
norahmollo
0880eca790 PM-694 Deprecated for php 5.4
Changes for deprecated
2014-12-05 11:31:42 -04:00
Julio Cesar Laura Avendaño
98974fce5a Merged in julceslau/processmaker (pull request #1239)
Updating .po and .sql files for release 2014-12-05
2014-12-05 11:07:06 -04:00
Julio Cesar Laura
81cf92fe24 Updating .po and .sql files for release 2014-12-05 2014-12-05 11:03:44 -04:00
Victor Saisa Lopez
5ca23cf3bb PM-937 "Add Gateway to Gateway support" SOLVED
Issue:
    Add Gateway to Gateway support
Cause:
    Nueva solicitud de funciones
Solution:
    - Se ha implementado esta nueva funcionalidad "Gateway to Gateway" de un BPMN-Project a un ProcessMaker-Project
    - Se ha agregado un nuevo tipo de Task (GATEWAYTOGATEWAY) que sirve de puente para conectar un Gateway con otro Gateway

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

Conflicts:
	workflow/engine/classes/model/map/TaskMapBuilder.php
-----
2014-12-05 10:58:00 -04:00
Julio Cesar Laura Avendaño
2d9f0d4448 Merged in jennydmz/processmaker (pull request #1234)
PM-1039 Arreglando files para community
2014-12-04 17:08:00 -04:00
jennylee
bda6bd5328 PM-1039 Arreglando files para community 2014-12-04 16:59:10 -04:00
Freddy Daniel Rojas Valda
a69c0a42c6 Merge branch 'master' of bitbucket.org:colosa/processmaker into master-core 2014-12-04 16:37:52 -04:00
Julio Cesar Laura Avendaño
46fa17550d Merged in darojas/processmaker/master-core (pull request #1233)
PM-1040. Remove code from the Community version. Fix 14636 New Functionality - To allow set index in tables.
2014-12-04 16:21:30 -04:00
Freddy Daniel Rojas Valda
8984d1de99 Merge branch 'master' of bitbucket.org:colosa/processmaker into master-core 2014-12-04 15:18:25 -04:00
Freddy Daniel Rojas Valda
710bf24578 PM-1040. Remove code from the Community version. Fix 14636 New Functionality - To allow set index in tables. 2014-12-04 14:40:11 -04:00
Julio Cesar Laura Avendaño
5d231c7874 Merged in darojas/processmaker/master-core (pull request #1231)
Remove code from the Community version. Fix array code
2014-12-04 11:53:43 -04:00
Victor Saisa Lopez
7e3dc8aae3 PM-937 "Add Gateway to Gateway support" SOLVED
Issue:
    Add Gateway to Gateway support
Cause:
    Nueva solicitud de funciones
Solution:
    - Se ha implementado esta nueva funcionalidad "Gateway to Gateway" de un BPMN-Project a un ProcessMaker-Project
    - Se ha agregado un nuevo tipo de Task (GATEWAYTOGATEWAY) que sirve de puente para conectar un Gateway con otro Gateway
2014-12-04 11:40:52 -04:00
Freddy Daniel Rojas Valda
2ad7cd8d16 Remove code from the Community version. Fix array code 2014-12-04 11:36:35 -04:00
Julio Cesar Laura Avendaño
95a44c8100 Merged in jennydmz/processmaker/PM-1039a (pull request #1230)
PM-1039 Aniadiendo files para a obviar codigo en la version community.
2014-12-04 10:44:21 -04:00
jennylee
4a6f3930b5 PM-1039 Aniadiendo files para a obviar codigo en la version community. 2014-12-04 10:23:06 -04:00
Julio Cesar Laura Avendaño
f95ec2b11a Merged in darojas/processmaker/master-core (pull request #1229)
Remove code from the Community version. Xml and html extensions
2014-12-04 10:00:44 -04:00
Freddy Daniel Rojas Valda
427e76fc67 Remove code from the Community version. Xml and html extensions 2014-12-04 09:27:48 -04:00
Freddy Daniel Rojas Valda
c0f76175c1 Merge branch 'master' of bitbucket.org:colosa/processmaker into master-core 2014-12-04 09:15:43 -04:00
Julio Cesar Laura Avendaño
fc3ae511a3 Merged in darojas/processmaker/master-core (pull request #1225)
PM-1040 Removing some code to Community version
2014-12-03 14:58:40 -04:00
Freddy Daniel Rojas Valda
7da2827c34 Merge branch 'master' of bitbucket.org:colosa/processmaker into master-core 2014-12-03 14:00:29 -04:00
Julio Cesar Laura Avendaño
9ed8ae811d Merged in julceslau/processmaker (pull request #1227)
PM-1036 Bloquear el acceso a ProcessMaker Enterprise cuando la licencia expira SOLVED
2014-12-03 13:59:53 -04:00
Julio Cesar Laura
27b39f489e PM-1036 Bloquear el acceso a ProcessMaker Enterprise cuando la licencia expira SOLVED 2014-12-03 13:58:55 -04:00
Julio Cesar Laura Avendaño
9fe21a46cf Merged in julceslau/processmaker (pull request #1226)
PM-1036 Bloquear el acceso a ProcessMaker Enterprise cuando la licencia expira SOLVED
2014-12-03 13:46:18 -04:00
Julio Cesar Laura
6fbe1fd4d2 PM-1036 Bloquear el acceso a ProcessMaker Enterprise cuando la licencia expira SOLVED 2014-12-03 13:42:09 -04:00
Freddy Daniel Rojas Valda
7a7e2770ef Removing some code to Community version 2014-12-03 11:03:31 -04:00
Julio Cesar Laura Avendaño
b3387280b1 Merged in darojas/processmaker/master-d (pull request #1186)
Add end point File. To upload multiple files
2014-12-03 11:00:51 -04:00
Freddy Daniel Rojas Valda
9744232d3f Removing some code to Community version 2014-12-03 10:34:22 -04:00
Freddy Daniel Rojas Valda
91ae2eb7a7 Merge branch 'master' of bitbucket.org:colosa/processmaker into master-core 2014-12-02 11:19:28 -04:00