Commit Graph

8887 Commits

Author SHA1 Message Date
Erik Amaru Ortiz
9a5fe27b0b rake file update 2014-06-02 13:31:44 -04:00
Erik Amaru Ortiz
3c264b320e Merged in victorsl/processmaker (pull request #511)
ProcessMaker-BE "Role and Permission (Endpoints)"
2014-06-02 11:27:58 -04:00
Erik Amaru Ortiz
0785c76d51 Merged in wnestor/processmaker (pull request #512)
Culminacion de los behat del feature case tasks
2014-06-02 11:27:27 -04:00
Erik Amaru Ortiz
24cd1e4ece Merged in darojas/processmaker (pull request #514)
Se modifica end point cases tasks
2014-06-02 11:26:47 -04:00
Freddy Daniel Rojas Valda
5aefbbd044 Se modifica end point cases tasks 2014-06-02 11:19:58 -04:00
Freddy Daniel Rojas Valda
e3f441d188 Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-06-02 10:57:26 -04:00
Erik Amaru Ortiz
059094027f little tweaks to show pmui and mafe versions on system information section 2014-05-29 17:17:15 -04:00
Erik Amaru Ortiz
29790cbfbd Updating PM Rakefile 2014-05-29 17:16:35 -04:00
Erik Amaru Ortiz
e383ae49e5 Merged in cochalo/processmaker (pull request #513)
Correccion de label añadiendo TRANSLATIONS
2014-05-29 17:07:01 -04:00
Brayan Osmar Pereyra Suxo
cf80d23ecf Correccion de espacios 2014-05-29 15:46:55 -04:00
Brayan Osmar Pereyra Suxo
4b9c5df53e Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-05-29 15:39:48 -04:00
Brayan Osmar Pereyra Suxo
8800f47343 Correccion de conflictos 2014-05-29 15:38:10 -04:00
Brayan Osmar Pereyra Suxo
db6c8fb6f8 Correccion de label añadiendo TRANSLATIONS 2014-05-29 15:33:27 -04:00
Wendy Nestor
dfcae28205 Culminacion de los behat del feature case tasks 2014-05-29 15:03:09 -04:00
Victor Saisa Lopez
81d4700e7e ProcessMaker-BE "Role and Permission (Endpoints)"
- Se han implementado los siguientes Endpoints:
    GET    /api/1.0/{workspace}/role/{rol_uid}/permissions?filter={filter}&start={start}&limit={limit}
    GET    /api/1.0/{workspace}/role/{rol_uid}/available-permissions?filter={filter}&start={start}&limit={limit}
    POST   /api/1.0/{workspace}/role/{rol_uid}/permission
    DELETE /api/1.0/{workspace}/role/{rol_uid}/permission/{per_uid}
2014-05-29 13:10:11 -04:00
Victor Saisa Lopez
649f543773 Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-05-29 13:09:12 -04:00
Erik Amaru Ortiz
0b5ff94f21 update getting versions an fixed for fonts dir 2014-05-29 12:59:20 -04:00
Erik Amaru Ortiz
3910464ece Merged in wnestor/processmaker (pull request #510)
Modificacion de sintaxis en el feature project export/import y culminacion de los behat del feature roles
2014-05-29 12:55:16 -04:00
Erik Amaru Ortiz
944918231a Merged in victorsl/processmaker (pull request #509)
ProcessMaker-BE "Role and User (Endpoints)"
2014-05-29 12:54:52 -04:00
Wendy Nestor
ea40d00195 Modificacion de sintaxis en el feature project export/import y culminacion de los behat del feature roles 2014-05-29 09:28:42 -04:00
Victor Saisa Lopez
072a800e74 Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-05-29 09:08:59 -04:00
Erik Amaru Ortiz
3f697dc636 disabling deprecated .css includes for mafebuild 2014-05-28 16:05:41 -04:00
Victor Saisa Lopez
98f3ff777c ProcessMaker-BE "Role and User (Endpoints)"
- Se han implementado los siguientes Endpoints:
    GET    /api/1.0/{workspace}/role/{rol_uid}/users?filter={filter}&start={start}&limit={limit}
    GET    /api/1.0/{workspace}/role/{rol_uid}/available-users?filter={filter}&start={start}&limit={limit}
    POST   /api/1.0/{workspace}/role/{rol_uid}/user
    DELETE /api/1.0/{workspace}/role/{rol_uid}/user/{usr_uid}
2014-05-28 15:01:18 -04:00
Erik Amaru Ortiz
75199402e5 updateing app.php to remove composer autoload use, and some little tweaks 2014-05-28 12:08:00 -04:00
Erik Amaru Ortiz
45362f5bb5 adding std object instance declaration to avoid warnings 2014-05-28 12:05:31 -04:00
Julio Cesar Laura Avendaño
263d9a1485 Merged in gproly/processmaker (pull request #508)
window legend processmap view
2014-05-28 11:02:55 -04:00
Roly Rudy Gutierrez Pinto
788b4215cf window legend processmap view 2014-05-28 10:33:18 -04:00
Erik Amaru Ortiz
20e7e68e17 Merged in victorsl/processmaker (pull request #507)
ProcessMaker-BE "Role (Endpoints)"
2014-05-28 09:11:20 -04:00
Victor Saisa Lopez
13a11f1e9a ProcessMaker-BE "Role (Endpoints)"
- Se han implementado los siguientes Endpoints:
    GET    /api/1.0/{workspace}/roles?filter={filter}&start={start}&limit={limit}
    GET    /api/1.0/{workspace}/role/{rol_uid}
    POST   /api/1.0/{workspace}/role
    PUT    /api/1.0/{workspace}/role/{rol_uid}
    DELETE /api/1.0/{workspace}/role/{rol_uid}
2014-05-27 16:25:57 -04:00
Julio Cesar Laura Avendaño
c495486ffd Merged in gproly/processmaker (pull request #506)
Implementation of processmap in tracker cases.
2014-05-27 13:42:48 -04:00
Roly Rudy Gutierrez Pinto
b390930882 Implementation of processmap in tracker cases. 2014-05-27 10:33:26 -04:00
Erik Amaru Ortiz
7c0747ffa9 Merged in darojas/processmaker (pull request #499)
Se modifica la clase wsBase para que se ejecuten los triggers before assigment, cuando se realiza el route-case. Replace harcoded labels by a translation ID
2014-05-26 12:22:02 -04:00
Erik Amaru Ortiz
c9a4de7f15 last update, to fix Mafe build error 2014-05-26 11:06:19 -04:00
Erik Amaru Ortiz
382e7463e0 updating Rakefile, calling mafe tasks 2014-05-26 10:52:18 -04:00
Julio Cesar Laura Avendaño
674f073e8d Merged in gproly/processmaker (pull request #503)
improvement uri processmap view
2014-05-23 17:08:03 -04:00
Julio Cesar Laura Avendaño
678b31576c Merged in julceslau/processmaker (pull request #505)
Merge code github > bitbucket 2014-05-23 17:00
2014-05-23 17:02:51 -04:00
Julio Cesar Laura
230fd25b34 Merge code github > bitbucket 2014-05-23 17:00 2014-05-23 16:58:04 -04:00
Julio Cesar Laura
5184de7763 Merge code github > bitbucket 2014-05-23 16:55 2014-05-23 16:54:28 -04:00
Roly Rudy Gutierrez Pinto
7ac313d0d2 improvement uri processmap view 2014-05-23 16:52:36 -04:00
Julio Cesar Laura
33fb82f376 Merge code github > bitbucket 2014-05-23 16:35 2014-05-23 16:32:18 -04:00
Erik Amaru Ortiz
45fd1bfd0d rake file to build pmUI & mafe JS projects into processmaker 2014-05-23 15:26:01 -04:00
julceslauhub
6ae5fa6d36 Merge pull request #2424 from marcoAntonioNina/BUG-15020
BUG-15020 Pagination toolbar is not refreshing when when... SOLVED
2014-05-23 14:48:31 -04:00
Marco Antonio Nina
e3f367e672 Improvement delete search for date 2014-05-23 14:30:44 -04:00
julceslauhub
e752605b70 Merge pull request #2423 from marcoAntonioNina/BUG-15022
BUG-15022 "ShowDirs" button should change to "HideDirs" once we click SOLVED
2014-05-23 14:18:14 -04:00
Marco Antonio Nina
e6dcb88d80 Improvement js label 2014-05-23 14:13:19 -04:00
julceslauhub
922a9a93e8 Merge pull request #2422 from julceslauhub/master
BUG 12395 History log no refleja verdaderos datos historicos IMPROVEMENTS 2
2014-05-23 13:48:29 -04:00
Julio Cesar Laura
d1e6dfb61e BUG 12395 History log no refleja verdaderos datos historicos IMPROVEMENTS 2 2014-05-23 13:45:25 -04:00
Marco Antonio Nina
bcd8aefe89 BUG-15022 "ShowDirs" button should change to "HideDirs" once we click SOLVED
- It don't have the functionality
- The label and funtionality was added.
2014-05-23 11:35:27 -04:00
julceslauhub
34f4c65f98 Merge pull request #2420 from julceslauhub/master
BUG 12395 History log no refleja verdaderos datos historicos IMPROVEMENTS
2014-05-23 11:24:09 -04:00
Julio Cesar Laura
237bfbac2c BUG 12395 History log no refleja verdaderos datos historicos IMPROVEMENTS 2014-05-23 11:21:27 -04:00