Cievoloth Coca
dd62133cf8
fix checkout problem
2019-05-29 20:49:12 +00:00
Cievoloth Coca
5e36b96aa1
commit order
2019-05-29 20:46:44 +00:00
Cievoloth Coca
b2cc065ec3
more order
2019-05-29 20:43:28 +00:00
Cievoloth Coca
f8e42fc0ed
order
2019-05-29 20:41:46 +00:00
Cievoloth Coca
17f14248fd
order the code
2019-05-29 20:29:43 +00:00
Cievoloth Coca
6bb7d458af
separate by stages
2019-05-29 20:26:50 +00:00
Cievoloth Coca
195e33c63e
git install
2019-05-29 20:20:34 +00:00
Cievoloth Coca
c09b078c76
only checkout
2019-05-29 20:18:48 +00:00
Cievoloth Coca
06cce3b51e
docker image change
2019-05-29 20:17:35 +00:00
Paula Quispe
bb8e914964
Merged in bugfix/PMC-786 (pull request #6894 )
...
PMC-786
Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com >
2019-05-29 18:55:41 +00:00
Andrea Adamczyk
c73ee5c2e0
Merged in bugfix/PMC-815 (pull request #6915 )
...
PMC-815
Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com >
2019-05-29 18:43:02 +00:00
Andrea Adamczyk
c83988d5ac
PMC-815
2019-05-29 14:27:00 -04:00
Paula Quispe
5dd5a25a74
Merge with develop: solving conflicts
2019-05-29 13:12:45 -04:00
Roly Rudy Gutierrez Pinto
b24a3eca66
PMC-476
2019-05-29 11:07:49 -04:00
Cievoloth Coca
e4537bb818
run adjustment
2019-05-29 14:59:03 +00:00
Cievoloth Coca
1c84d3ea3d
Install dependencies
2019-05-29 14:56:50 +00:00
Cievoloth Coca
546c008745
circleCI initial setup with phpunit image and code checkout
2019-05-29 14:52:01 +00:00
Paula Quispe
05d713c847
PMC-840
2019-05-29 09:53:13 -04:00
Roly
d93c713297
Merged in bugfix/PMC-744 (pull request #6905 )
...
PMC-744
Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com >
2019-05-28 20:30:40 +00:00
Paula Quispe
ff33075228
PMC-786
2019-05-28 08:33:17 -04:00
Paula Quispe
4064c1bebf
Merged in bugfix/PMC-798 (pull request #6904 )
...
PMC-798
Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com >
2019-05-27 12:42:44 +00:00
Julio Cesar Laura Avendaño
81793b13e8
Merged in bugfix/PMC-602-B (pull request #6913 )
...
PMC-602
Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com >
Approved-by: Paula Quispe <paula.quispe@processmaker.com >
2019-05-24 21:36:40 +00:00
Julio Cesar Laura Avendaño
3e9eacfc99
Merged in bugfix/PMC-604 (pull request #6900 )
...
PMC-604
Approved-by: Paula Quispe <paula.quispe@processmaker.com >
Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com >
2019-05-24 21:35:59 +00:00
Andrea Adamczyk
0bd42424ab
Merged in bugfix/PMC-791 (pull request #6898 )
...
PMC-791
Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com >
2019-05-24 20:27:12 +00:00
Julio Cesar Laura Avendaño
458b9a7cbd
PMC-604
2019-05-24 12:45:10 -04:00
Julio Cesar Laura Avendaño
32ab82a19b
PMC-602
2019-05-24 11:02:24 -04:00
Paula Quispe
ef18b79e90
PMC-798
2019-05-24 10:57:49 -04:00
Rodrigo Quelca
ffee1de408
Merged in feature/PMC-814 (pull request #6908 )
...
PMC-814
Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com >
2019-05-24 14:29:24 +00:00
Roly Rudy Gutierrez Pinto
250976c159
PMC-744
2019-05-23 16:30:49 -04:00
Ronald Quenta
22a95fb920
Merged in bugfix/PMC-801 (pull request #6903 )
...
PMC-801
Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com >
2019-05-23 16:48:40 +00:00
Ronald Quenta
72bf31a574
Merged in bugfix/PMC-800 (pull request #6902 )
...
PMC-800
Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com >
2019-05-23 16:48:00 +00:00
Rodrigo Quelca
04a2796188
PMC-814: Improve advanced search sending the param CATEGORY_UID to filter process by categories
2019-05-23 10:37:01 -04:00
Julio Cesar Laura Avendaño
dcc1634fd3
PMC-604
2019-05-21 16:00:18 -04:00
Ronald Q
fb0153fa7d
PMC-800
2019-05-21 13:33:46 -04:00
Ronald Q
42f8c662f1
PMC-801
2019-05-21 12:06:30 -04:00
Andrea Adamczyk
9282eeadb5
PMC-791
2019-05-20 14:08:50 -04:00
Rodrigo Quelca
847a0fb744
fix bad merge
2019-05-17 12:22:59 -04:00
Rodrigo Quelca
8666105929
Merge branch 'feature/PMC-61' of bitbucket.org:colosa/processmaker into feature/PMC-61
2019-05-17 11:16:45 -04:00
Rodrigo Quelca
81aaae594a
solve conflicts
2019-05-17 11:16:18 -04:00
Paula Quispe
8252428a0c
Merged in feature/PMC-758-A (pull request #6897 )
...
PMC-760: Advanced Search Loader UI
Approved-by: Rodrigo Quelca <rockoinfo@yahoo.com >
Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com >
2019-05-16 17:54:34 +00:00
Rodrigo Quelca
817c7836a0
PMC-760: Advanced Search Loader UI
...
fix CR notes
fix code style
bad equal
fix the error handling
remove catch error line
fix time out
solve conflicts
solve conflicts
PMC-760: Advanced Search Loader UI
fix CR notes
fix code style
bad equal
fix the error handling
remove catch error line
fix time out
solve conflicts with be
2019-05-16 12:27:08 -04:00
Paula Quispe
a6df306166
Merged in bugfix/PMC-783 (pull request #6891 )
...
PMC-783
Approved-by: David Callizaya <david.callizaya@processmaker.com >
Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com >
2019-05-16 14:16:04 +00:00
Paula Quispe
911d001fa6
Merged in bugfix/PMC-794 (pull request #6896 )
...
PMC-794
Approved-by: Paula Quispe <paula.quispe@processmaker.com >
2019-05-16 11:43:56 +00:00
Paula Quispe
f389682ec5
PMC-794
2019-05-16 07:46:25 -04:00
Andrea Adamczyk
fbff2ce99b
Merged in bugfix/PMC-380 (pull request #6892 )
...
PMC-380
Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com >
2019-05-16 02:46:25 +00:00
paulis
57c2ab282c
Conflicts
2019-05-15 22:41:23 -04:00
Andrea Adamczyk
7055872083
PMC-380
2019-05-15 22:18:05 -04:00
Roly
494778bb11
Merged in bugfix/PMC-585-A (pull request #6895 )
...
PMC-585
Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com >
2019-05-16 02:16:26 +00:00
Roly Rudy Gutierrez Pinto
bc1862db3d
PMC-585-A
2019-05-15 20:20:24 -04:00
Julio Cesar Laura Avendaño
5d8949255b
Merged in bugfix/PMC-602 (pull request #6893 )
...
PMC-602
Approved-by: Paula Quispe <paula.quispe@processmaker.com >
2019-05-15 22:34:41 +00:00