Daniel Rojas
a538a34a42
Merge branch 'master' of bitbucket.org:colosa/processmaker
2014-06-23 13:05:32 -04:00
Erik Amaru Ortiz
83b80fc17e
little fix for notice message
2014-06-23 13:03:34 -04:00
Victor Saisa Lopez
04564c11c3
ProcessMaker-BE "Group (fixes)"
...
- Se agrego validacion al elminar un grupo (si el grupo esta asignado a una tarea)
- Otros improvements tambien se realizaron
2014-06-23 12:56:23 -04:00
Victor Saisa Lopez
d750cd9902
Merge branch 'master' of bitbucket.org:colosa/processmaker
2014-06-23 12:45:21 -04:00
Erik Amaru Ortiz
064c9c7a1e
Merged in cochalo/processmaker (pull request #549 )
...
Correccion para obtener user_uid
2014-06-23 11:18:53 -04:00
Erik Amaru Ortiz
97e82ef938
Merged in victorsl/processmaker (pull request #546 )
...
ProcessMaker-BE "Trigger Wizard (fixes)"
2014-06-23 10:30:22 -04:00
Brayan Osmar Pereyra Suxo
c31d2ee430
Correccion para obtener user_uid
2014-06-23 10:23:12 -04:00
Daniel Rojas
353cd55058
Merge branch 'master' of bitbucket.org:colosa/processmaker
2014-06-23 10:09:47 -04:00
Erik Amaru Ortiz
ddb6e08294
litle fix warning
2014-06-23 09:06:47 -04:00
Luis Fernando Saisa Lopez
653685ed30
Merge branch 'master' of git://github.com/colosa/processmaker into BUG-15195
2014-06-20 16:53:38 -04:00
julceslauhub
b36247878a
Merge pull request #2468 from julceslauhub/master
...
BUG 15153 Call to undefined function SOLVED
2014-06-20 16:24:22 -04:00
Julio Cesar Laura
a869888d78
BUG 15153 Call to undefined function SOLVED
...
- The pmFunctions from the plugins not loaded before include pmScript class
- Change the includes order of the related classes
2014-06-20 16:21:23 -04:00
Marco Antonio Nina
2cdd7c1a02
BUG-14986 Authorization Bypass via Forceful Browsing IMPROVEMENT
2014-06-20 16:08:47 -04:00
Victor Saisa Lopez
d5f8f1ee3e
Merge branch 'master' of bitbucket.org:colosa/processmaker
2014-06-20 15:54:22 -04:00
Luis Fernando Saisa Lopez
e70916ea97
BUG 15195 "User appear more than once in the..." SOLVED
...
- User appear more than once in the Process Supervisor window
- Problema resuelto, cuando se elimina a un usuario por ADMIN>USERS>Users, este usuario puede se eliminado sin restricciones
aunque el usuario este asignado como supervisor de un proceso lo cual no es correcto.
Se hace una validacion que verifica si el usuario esta asignado como supervisor le saldra un mensaje de confirmacion
que indica si deseea eliminar el usuario de todas maneras. Si la respuesta es Si, se eliminara de la lista de usuarios
y de la lista de usuarios asignados como supervisores.
2014-06-20 13:03:57 -04:00
Julio Cesar Laura Avendaño
e213c6adfd
Merged in julceslau/processmaker (pull request #548 )
...
Merge code from github.com to bitbucket.org 2014-06-20 12:20
2014-06-20 12:25:48 -04:00
Julio Cesar Laura
5b63a6cfc7
Merge code from github.com to bitbucket.org 2014-06-20 12:20
2014-06-20 12:23:47 -04:00
Julio Cesar Laura
aebf02d698
Merge code from github.com to bitbucket.org 2014-06-20 12:20
2014-06-20 12:21:00 -04:00
Victor Saisa Lopez
82071586c2
ProcessMaker-BE "Trigger Wizard (fixes)"
...
- En el listado de trigger wizards no estaba ordenado, ahora se despliega ordenadamente
- Se corrigio el .feature correspondiente para que aplique el cambio
- Otros fixes tambien se realizaron
2014-06-20 11:48:57 -04:00
julceslauhub
2bd6b68cca
Merge pull request #2465 from marcoAntonioNina/BUG-15167
...
BUG-15167 Error al momento de envio de triggers SOLVED
2014-06-20 11:14:55 -04:00
Marco Antonio Nina
8cb260dcf6
BUG-15167 Error al momento de envio de triggers SOLVED
...
- No validation if exists the file env.ini
- A validation was added in file class.system.php
2014-06-20 10:55:52 -04:00
julceslauhub
542aba432f
Merge pull request #2464 from Jennydmz/master
...
BUG-15193 Error in PM Table Data Search option
2014-06-20 10:25:17 -04:00
Daniel Rojas
47d9972fd4
Merge branch 'master' of bitbucket.org:colosa/processmaker
2014-06-20 09:17:45 -04:00
Victor Saisa Lopez
e3b85eb09b
Merge branch 'master' of bitbucket.org:colosa/processmaker
2014-06-20 09:01:20 -04:00
jennylee
fdc1a997e3
BUG-15193 Error in PM Table Data Search option
...
The search option in PMTables has a validation where the APP_UID field is ignored in the search because this was causing some search troubles when you wanna search a number that was include into the APP_UID (eg. 'APP_UID':405044408538cb9472ade260172, 'text to search':4408 )
Now, we add a checkbox field near the search text field to customize this behavior. With this checkbox 'Search also in the APP_UID field' you can decide if the search will include or not the APP_UID field.
2014-06-18 16:28:44 -04:00
jennylee
38c4752661
Merge remote branch 'upstream/master'
2014-06-18 16:28:37 -04:00
Erik Amaru Ortiz
816314fda2
Merged in darojas/processmaker (pull request #541 )
...
Fix delete case scheduler.
2014-06-18 15:48:53 -04:00
Erik Amaru Ortiz
8fa430ce7c
Merged in wnestor/processmaker (pull request #545 )
...
Se descomento varios escenarios de los features calendar, pm group, pm user y roles
2014-06-18 15:47:47 -04:00
Erik Amaru Ortiz
eff396dbc8
Merged in victorsl/processmaker (pull request #540 )
...
ProcessMaker-BE "Category (improvement)"
2014-06-18 15:46:58 -04:00
Wendy Nestor
4ac6016f8e
Se descomento varios escenarios de los features calendar, pm group, pm user y roles
2014-06-18 15:43:07 -04:00
julceslauhub
e477d46672
Merge pull request #2455 from marcoAntonioNina/BUG-14984
...
BUG-14984 Improvement value DEBUG_SQL
2014-06-18 15:16:46 -04:00
Julio Cesar Laura Avendaño
6b6df66b0a
Merged in julceslau/processmaker (pull request #544 )
...
Merge code from github.com to bitbuclet.org 2014-06-18 15:00
2014-06-18 15:04:28 -04:00
Julio Cesar Laura
35a373dfd5
Merge code from github.com to bitbuclet.org 2014-06-18 15:00
2014-06-18 15:02:49 -04:00
Julio Cesar Laura
cc6e1cc16a
Merge remote branch 'upstream/master'
2014-06-18 14:59:54 -04:00
julceslauhub
621c7b4436
Merge pull request #2463 from marcoAntonioNina/BUG-15237
...
BUG-15237 Task Information on Case Information Menu not working SOLVED
2014-06-18 14:57:54 -04:00
Marco Antonio Nina
8efd7e5b78
BUG-15237 Task Information on Case Information Menu not working SOLVED
...
- For the task completed the index and task_uid was wrong.
- A validation was added looking those id's, in file cases_Open.php.
- A validation was added for case paused.
2014-06-18 11:51:39 -04:00
jennylee
af70198315
BUG-15193 Error in PM Table Data Search option
...
The search option in PMTables has a validation where the APP_UID field is ignored in the search because this was causing some search troubles when you wanna search a number that was include into the APP_UID (eg. 'APP_UID':405044408538cb9472ade260172, 'text to search':4408 )
Now, we add a checkbox field near the search text field to customize this behavior. With this checkbox 'Search also in the APP_UID field' you can decide if the search will include or not the APP_UID field.
2014-06-18 11:31:22 -04:00
jennylee
5ca54df0cb
Merge remote branch 'upstream/master'
2014-06-18 11:31:03 -04:00
Marco Antonio Nina
a25c04443b
BUG-15237 Task Information on Case Information Menu not working SOLVED
...
- For the task completed the index and task_uid was wrong.
- A validation was added looking those id's, in file cases_Open.php.
2014-06-18 11:13:46 -04:00
Daniel Rojas
d752d1044f
Merge branch 'master' of bitbucket.org:colosa/processmaker
2014-06-18 11:09:03 -04:00
julceslauhub
c8de3ed3f7
Merge pull request #2460 from norahmollo/BUG_12828
...
BUG_12828 When not choosing a ldap provider an error is displayed
2014-06-18 10:40:15 -04:00
norahmollo
1cb28a9a02
BUG_12828 When not choosing a ldap provider an error is displayed
...
When not choosing a ldap provider and pressing continue, an error is displayed and it`s text says "File: Edit.xml not exists.".
2014-06-18 10:06:34 -04:00
Victor Saisa Lopez
a009c17bea
Merge branch 'master' of bitbucket.org:colosa/processmaker
2014-06-18 09:04:23 -04:00
Erik Amaru Ortiz
ccdbb59702
little fix when token fn, is serving a refresh token
2014-06-17 17:05:11 -04:00
Erik Amaru Ortiz
dfdca4b48b
Merged in wnestor/processmaker (pull request #543 )
...
Adicion de nuevo escenario para los features calendar, category, pm group, pm user, roles
2014-06-17 16:30:18 -04:00
Wendy Nestor
b628992a12
Adicion de nuevo escenario para los features calendar, category, pm group, pm user, roles
2014-06-17 15:28:44 -04:00
Erik Amaru Ortiz
0e18a5c4f9
adding client id and secret params to load FrontEnd data
2014-06-17 14:39:16 -04:00
jennylee
75388ccab3
Merge remote branch 'upstream/master'
2014-06-17 12:57:26 -04:00
julceslauhub
bdd98c2d6b
Merge pull request #2457 from gproly/BUG-14775
...
BUG-14775 addition of flag that enables password policies when logging user. IMPROVEMENT.
2014-06-17 12:50:31 -04:00
Julio Cesar Laura Avendaño
57e12bab24
Merged in julceslau/processmaker (pull request #542 )
...
Merge code from github to bitbucket 2014-06-17
2014-06-17 12:34:36 -04:00