Commit Graph

9007 Commits

Author SHA1 Message Date
Wendy Nestor
fa35fb408c Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-06-11 12:37:28 -04:00
Erik Amaru Ortiz
93c9dd5c26 disabling database session storage, using native php sessions 2014-06-11 12:33:44 -04:00
Wendy Nestor
452610a09a Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-06-11 12:00:35 -04:00
Erik Amaru Ortiz
5e0ad95fd0 Merged in wnestor/processmaker (pull request #536)
Adicion de nuevos escenarios a los features calendar, process category, departments, pm group, pm user y roles
2014-06-11 11:36:34 -04:00
Wendy Nestor
d95e869a47 Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-06-11 10:35:05 -04:00
Julio Cesar Laura Avendaño
1679e33751 Merged in julceslau/processmaker (pull request #537)
Updating .po and .sql files with new labels required by backend team
2014-06-11 10:30:39 -04:00
Julio Cesar Laura
752b37e22b Updating .po and .sql files with new labels required by backend team 2014-06-11 10:27:06 -04:00
Wendy Nestor
b5e6b532f5 Adicion de nuevos scenarios en los features departments, pm group, pm user y roles 2014-06-10 17:00:17 -04:00
Wendy Nestor
962ef70969 Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-06-10 14:53:36 -04:00
Erik Amaru Ortiz
7333cf1444 Oauth2 Registering and Access Management is complete now.
- User can register applications and manage them
- User can manage access tokens from interface on profile menu
2014-06-10 13:03:47 -04:00
Erik Amaru Ortiz
92c695772d Installer Fix, wrong setting for workspace name in url_redirect field 2014-06-10 11:48:18 -04:00
Erik Amaru Ortiz
bb9fc96634 Little fix, to avoid warning using Safari browser 2014-06-10 11:20:58 -04:00
Wendy Nestor
3a0d3822b5 Adicion de nuevos escenarios a los features calendar y process category 2014-06-10 10:25:33 -04:00
Wendy Nestor
046edd1a7e Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-06-09 15:22:58 -04:00
Erik Amaru Ortiz
213fd34122 Merged in darojas/processmaker (pull request #533)
Fix harcoded labels by a translation ID Users country, city and location
2014-06-09 12:43:47 -04:00
Erik Amaru Ortiz
33aa586d96 Merged in wnestor/processmaker (pull request #534)
Se comento una linea innecesaria
2014-06-09 12:43:14 -04:00
Erik Amaru Ortiz
dd87af2352 Merged in victorsl/processmaker/BUG-15041 (pull request #532)
BUG-15041 "Inactive Groups are display in list of available..." SOLVED
2014-06-09 12:42:34 -04:00
Wendy Nestor
e88637e308 Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-06-09 12:41:53 -04:00
Erik Amaru Ortiz
e9aa1bdac3 Merged in victorsl/processmaker (pull request #535)
ProcessMaker-BE "Import artifacts (small fix)"
2014-06-09 12:40:33 -04:00
Victor Saisa Lopez
0b51024e02 ProcessMaker-BE "Export, artifacts missing (small fix)"
- Added validation, to import file without artifacts
2014-06-09 12:34:59 -04:00
Wendy Nestor
2ed9c2d92d Se comento una linea innecesaria 2014-06-09 11:02:08 -04:00
Daniel Rojas
3fffdece41 Fix harcoded labels by a translation ID Users country, city and location 2014-06-09 10:58:45 -04:00
Victor Saisa Lopez
d205e8b4eb BUG-15041 "Inactive Groups are display in list of available..." SOLVED
- Inactive Groups are display in list of available groups
- Added condition to only get active groups
2014-06-09 10:04:55 -04:00
Daniel Rojas
085eac7ccd Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-06-09 09:37:17 -04:00
Erik Amaru Ortiz
9b091e24b8 Merged in wnestor/processmaker (pull request #528)
Adicion de nuevos escenarios en los features case scheduler, process permissions, export/import project y event
2014-06-09 09:14:39 -04:00
Erik Amaru Ortiz
43195f34ea Merged in victorsl/processmaker/BUG-15088 (pull request #531)
BUG-15088 "Al editar el nombre de un proceso este permite..." SOLVED
2014-06-09 09:13:57 -04:00
Wendy Nestor
ca0e4f8c1e modificaciones en los features case scheduler y event 2014-06-09 09:09:38 -04:00
Wendy Nestor
95637e866e Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-06-09 09:03:25 -04:00
Daniel Rojas
3678bd2fac Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-06-09 08:51:49 -04:00
Victor Saisa Lopez
67762ecbf2 BUG-15088 "Al editar el nombre de un proceso este permite..." SOLVED
- Al editar el nombre de un proceso este permite ingresar el
  nombre de uno ya existente
- El problema no esta al editar el proceso (esto cuando se ingresa
  a "Edit process"), sino cuando el ProcessMap hace el "auto-save",
  ahi si guarda el titulo del proceso
- Se ha agregado validacion cuando se actualizen los datos mediante
  el "auto-save" (esto se aplica solo para los datos del proceso)
- En el lado Frontend se esta enviando los datos del proceso
  (title, description) de manera continua con el "auto-save"
  para su actualizacion, pero como ya existe la validacion, ahora
  sale un ERROR. Esto debera ser revisado en el lado Frontend
2014-06-06 16:53:34 -04:00
Victor Saisa Lopez
29edfabe4d ProcessMaker-BE "Export, artifacts missing"
- Export, artifacts missing
- Se ha completado los artifacts al exportar e importar
2014-06-06 15:21:01 -04:00
Erik Amaru Ortiz
310fb20e6b Merged in victorsl/processmaker (pull request #529)
ProcessMaker-BE "Case Tasks (Endpoint)"
2014-06-06 12:10:56 -04:00
Victor Saisa Lopez
17e261243f ProcessMaker-BE "Case Tasks (Endpoint)"
- Se han implementado el siguiente Endpoint:
    GET /api/1.0/{workspace}/case/{app_uid}/tasks
2014-06-06 12:04:30 -04:00
Wendy Nestor
2e55e21550 Adicion de nuevos escenarios en los features case scheduler, process permissions y export/import project 2014-06-06 09:53:05 -04:00
Julio Cesar Laura Avendaño
a63a72ffac Merged in jennydmz/processmaker (pull request #527)
Translation error for mafe.
2014-06-06 09:30:06 -04:00
jennylee
77412ef663 Solving conflicts 2014-06-05 16:56:16 -04:00
jennylee
1e18293e3c Merge remote branch 'upstream/master' 2014-06-05 16:48:38 -04:00
Julio Cesar Laura Avendaño
2032b9da3f Merged in julceslau/processmaker (pull request #526)
Merge code from github.com to bitbucket repo 2014-06-05
2014-06-05 16:34:54 -04:00
Julio Cesar Laura
e85997738b Merge code from github.com to bitbucket repo 2014-06-05 2014-06-05 16:30:19 -04:00
julceslauhub
8daf4d4e27 Merge pull request #2436 from julceslauhub/master
BUGs 15078, 15077, 15122, 15079, 15114 and 15107 SOLVED
2014-06-05 16:22:38 -04:00
Julio Cesar Laura
906dc99390 BUGs 15078, 15077, 15122, 15079, 15114 and 15107 SOLVED 2014-06-05 16:21:32 -04:00
jennylee
dbc3504737 Translation error for mafe. 2014-06-05 09:57:36 -04:00
jennylee
103daf3650 Merge branch 'master' of bitbucket.org:jennydmz/processmaker
Conflicts:
	workflow/engine/js/stagesmap/core/stagesmap.js
	workflow/engine/xmlform/tracker/tracker_Configuration.xml
2014-06-05 09:55:43 -04:00
julceslauhub
bde3244f41 Merge pull request #2435 from marcoAntonioNina/BUG-15021
BUG-15021 We can´t access to the Files that are inside a folder SOLVED
2014-06-05 09:12:17 -04:00
Erik Amaru Ortiz
b4154bf562 Merged in cochalo/processmaker (pull request #521)
Correcion de op_action adicionando RESEND
2014-06-05 08:59:50 -04:00
Erik Amaru Ortiz
55e5ff9024 Merged in wnestor/processmaker (pull request #522)
Modificacion de sintaxis en los features roles, case tracker y import/export project
2014-06-05 08:58:49 -04:00
Wendy Nestor
d83bce5246 Modificacion de sintaxis en los features roles, case tracker y import/export project 2014-06-04 16:12:47 -04:00
Wendy Nestor
fa4dcbbb29 Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-06-04 16:10:07 -04:00
Marco Antonio Nina
cb3625b3bd BUG-15021 We can´t access to the Files that are inside a folder SOLVED
- It don't have the functionality
- A validataion was added for directories
2014-06-04 15:37:54 -04:00
Julio Cesar Laura Avendaño
8f36c09f5b Merged in gproly/processmaker (pull request #524)
BUG 15074 Section DESIGNER message 'One item should be selected in order to execute the action.' is not displayed when not selected any row. SOLVED
2014-06-04 14:56:19 -04:00