Commit Graph

892 Commits

Author SHA1 Message Date
Julio Cesar Laura
f7da7e016d Deleting BOM froom class Additional tables 2015-04-01 14:11:47 -04:00
Dante Loayza
db31fbe173 Merged master into dashboards2 2015-04-01 09:08:57 -04:00
Julio Cesar Laura Avendaño
2ef493d4f0 Merged in paulis/processmaker/PM-VERACODE-G (pull request #1836)
I solved issues with Cryptographic Issues
2015-03-31 17:26:19 -04:00
Julio Cesar Laura Avendaño
95c8fd27da Merged in paulis/processmaker/PM-1532 (pull request #1821)
I solved the issue PM-1532 informacion de History dynaform
2015-03-31 16:40:25 -04:00
Paula V. Quispe
0872b7208e I solved the conflicts 2015-03-31 15:42:44 -04:00
Marco Antonio Nina Mena
13f344a295 -Improvement file appDelegation
- quit line deprecated.
2015-03-31 14:52:36 -04:00
Marco Antonio Nina Mena
8108a33230 Improvement file appDelegation
- quit line deprecated.
2015-03-31 14:50:17 -04:00
Marco Antonio Nina Mena
68ed954a2e Merge branch 'master' of bitbucket.org:marcoAntonioNina/processmaker into dashboards2 2015-03-31 12:54:59 -04:00
Julio Cesar Laura Avendaño
a2a1ba562d Merged in mcuiza/processmaker/DT-issues-1 (pull request #1796)
veracode issues
2015-03-30 13:34:44 -04:00
danteloayza
87f728a947 excluding files from pull request part 4 2015-03-30 12:07:04 -04:00
danteloayza
e0577c0007 excluding files from pull request part 3 2015-03-30 11:42:50 -04:00
Paula V. Quispe
19ffc1c26f I solved the issue PM-1532 informacion de History dynaform 2015-03-27 17:59:50 -04:00
Brayan Pereyra
bf0ab884a9 Correccion de error en community 2015-03-27 17:26:38 -04:00
jennylee
e39b6bdd54 lasts corrections 2015-03-27 17:25:06 -04:00
jennylee
9325a1ec99 Adding the new changes in AppDelegation.php 2015-03-27 17:10:11 -04:00
Brayan Pereyra
0898b8cc9b Se adicion la correccion para PARALELOS y SUBPROCESS 2015-03-27 14:24:56 -04:00
Brayan Pereyra
8d6d4e596d Correccion de contador en APP_CACHE_VIEW 2015-03-27 12:22:30 -04:00
Julio Cesar Laura
bd3a3c40ba Merging changes made by Brayan related to counters 2015-03-26 23:57:28 -04:00
Julio Cesar Laura Avendaño
6c6e43e458 Merged in cochalo/processmaker/PM-1936 (pull request #1781)
Correccion de contadores en tipos de tareas
2015-03-26 22:10:25 -04:00
jennylee
d08457420a Adding the model of the db 2015-03-26 18:58:43 -04:00
jennylee
f6788b35d5 Resolving conflicts 2015-03-26 18:14:51 -04:00
marcelo.cuiza
7104ece311 veracode issues 2015-03-26 17:41:41 -04:00
danteloayza
cff0e2c6e1 Non conflict files 2015-03-26 17:37:32 -04:00
Paula V. Quispe
055082cec2 I solved Cryptographic Issues 2015-03-26 11:22:37 -04:00
Brayan Pereyra
fde8667a66 Correccion de contadores en tipos de tareas 2015-03-25 17:09:10 -04:00
Paula V. Quispe
f402d00446 I solved some issue with Cryptographic Issues 2015-03-25 16:22:18 -04:00
Roly Rudy Gutierrez Pinto
4581a6efc3 PM-947 2015-03-25 15:57:53 -04:00
Roly Rudy Gutierrez Pinto
8f67bd2b21 PM-947 2015-03-23 22:22:10 -04:00
Brayan Pereyra
a446bb6eac Merge branch 'master' of bitbucket.org:colosa/processmaker into CONSOLIDATED 2015-03-23 14:45:52 -04:00
Julio Cesar Laura Avendaño
5c30b852b1 Merged in zeitmaster/processmaker-goose (pull request #1675)
PM-1718: Actions By Email feature integrated as part of the core classes of ProcessMaker
2015-03-23 09:29:40 -04:00
Gustavo Cruz
5ab3033871 Merge changes manually due to conflicts with the upstream master branch. 2015-03-23 09:25:22 -04:00
Julio Cesar Laura Avendaño
46f4f1511b Merged in cochalo/processmaker/LISTADOS (pull request #1717)
Correccion de contador participated
2015-03-23 09:17:12 -04:00
Julio Cesar Laura Avendaño
81002e1fc5 Merged in cochalo/processmaker/PM-1765 (pull request #1712)
Correccion de BUGS en DEPARTAMENTS
2015-03-23 09:15:22 -04:00
Victor Saisa Lopez
8f30cc7cec PM-00000 "Improvements for BPMN-DESIGNER (back-end)" SOLVED
Issue:
    Improvements for BPMN-DESIGNER: Events, Gateways (back-end)
Description:
    - Se han realizado varias mejoras al back-end del BPMN-DESIGNER:
          > Se a agregado soporte para los events de otros tipos
            que no sean message-event (solo se permitio que se acepte
            el dibujado, aun no tienen funcionalidad). Tambien se a
            logrado que el diseñel flujo sea funcional no importando
            que estos events pertenezcan al flujo.
          > Se a mejorado el gateway-to-gateway (ya no es necesario
            crear siempre su task-dummy)
          > Se hicieron mejoras al default-flow
          > Se implementaron metodos necesarios para que cuando un
            event de tipo start es eliminado, este cambio sea reflejado
            en su activity
    - Los projects/processes creados antes de la fecha de creacion de
      este commit no funcionaran. Se sugiere crear nuevos projects/processePM-00000 "Improvements for BPMN-DESIGNER (back-end)" SOLVED

Issue:
    Improvements for BPMN-DESIGNER: Events, Gateways (back-end)
Description:
    - Se han realizado varias mejoras al back-end del BPMN-DESIGNER:
          > Se a agregado soporte para los events de otros tipos
            que no sean message-event (solo se permitio que se acepte
            el dibujado, aun no tienen funcionalidad). Tambien se a
            logrado que el diseñel flujo sea funcional no importando
            que estos events pertenezcan al flujo.
          > Se a mejorado el gateway-to-gateway (ya no es necesario
            crear siempre su task-dummy)
          > Se hicieron mejoras al default-flow
          > Se implementaron metodos necesarios para que cuando un
            event de tipo start es eliminado, este cambio sea reflejado
            en su activity
    - Los projects/processes creados antes de la fecha de creacion de
      este commit no funcionaran. Se sugiere crear nuevos projects/processess
2015-03-20 17:13:44 -04:00
Brayan Pereyra
de8bec20ab Correccion de contador participated 2015-03-20 11:44:35 -04:00
Gustavo Cruz
0b4e4926ae Merge remote-tracking branch 'upstream/master' 2015-03-20 10:56:02 -04:00
Brayan Pereyra
5acde24bfa PM-1755 REST endpoint GET /api/1.0/{workspace}/departments 2015-03-20 10:36:55 -04:00
Julio Cesar Laura Avendaño
9c7b459e74 Merged in cochalo/processmaker/LISTADOS (pull request #1710)
Correcion de migracion de casos a nuevos listados
2015-03-20 00:26:28 -04:00
Gustavo Cruz
e26da50743 Merge remote-tracking branch 'upstream/master' 2015-03-19 12:51:23 -04:00
Brayan Pereyra
6d73bffea2 Correcion de migracion de casos a nuevos listados 2015-03-19 11:12:55 -04:00
Brayan Pereyra
60184faa5d Envio temporal 2015-03-16 17:48:09 -04:00
Paula V. Quispe
b6fdc8e7be I reviewed the XSS - MEDIUM in 7 fiels 2015-03-16 17:26:48 -04:00
Gustavo Cruz
d1ea4faf95 Merges upstream master branch manually due to conflicts in the System REST end point. 2015-03-16 08:58:18 -04:00
Julio Cesar Laura Avendaño
ada7c6b1bc Merged in cochalo/processmaker/LISTS (pull request #1630)
Adicion de contadores de bandeja (y tiempo de acces token)
2015-03-16 01:35:30 -04:00
Gustavo Cruz
88def091e3 Adding the generated model classes for the actions by email 2015-03-13 10:12:25 -04:00
Gustavo Cruz
c887019a59 moving all the model classes away from the Features folder 2015-03-13 09:58:54 -04:00
Gustavo Cruz
8cab5a63d3 First take to migration of classes into the ProcessMaker Core 2015-03-12 18:04:39 -04:00
Brayan Pereyra
71d88faf40 Actualizacion de PARTICIPATED cuando obtiene un SELF_SERVICE 2015-03-12 16:03:04 -04:00
Paula V. Quispe
056784289a I solved all observation by Code Injection-Hight 2015-03-12 14:51:09 -04:00
Brayan Pereyra
9597adc22c Correccion de Contador PARTICIPATED en caso de SELF SERVICES 2015-03-12 11:58:48 -04:00