Commit Graph

286 Commits

Author SHA1 Message Date
Paula Quispe
c800a2999b Merged in release/3.2.2 (pull request #6147)
release/3.2.2

Approved-by: Paula Quispe <paula.quispe@processmaker.com>
2017-10-26 16:43:14 +00:00
Roly Rudy Gutierrez Pinto
d234b6f944 HOR-4006-B 2017-10-25 18:38:24 -04:00
Paula Quispe
546882d365 Merged in bugfix/HOR-3784 (pull request #6090)
HOR-3784

Approved-by: Roly <gproly@gmail.com>
Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
Approved-by: Paula Quispe <paula.quispe@processmaker.com>
2017-10-23 18:58:45 +00:00
Paula Quispe
81c90278bd release/3.2.2 to develop conflicts 2017-10-23 11:37:41 -04:00
Paula Quispe
22702842b9 Merge branch 'develop' of bitbucket.org:colosa/processmaker into bugfix/HOR-3784 2017-10-20 12:20:13 -04:00
davidcallizaya
2509ba1612 HOR-3925
Fix CR observations
2017-10-20 12:00:08 -04:00
davidcallizaya
128e42e71e HOR-3925
Create a user guest by default.
2017-10-20 12:00:08 -04:00
Roly
2032b5076a Merged in bugfix/HOR-3841 (pull request #6126)
HOR-3841

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
Approved-by: Paula Quispe <paula.quispe@processmaker.com>
2017-10-19 22:03:27 +00:00
Roly Rudy Gutierrez Pinto
3b6e2416ef HOR-3841 2017-10-19 09:46:48 -04:00
Paula Quispe
adc0c23acf HOR-3980 2017-10-18 16:02:20 -04:00
Paula Quispe
d0483f8b44 HOR-3784 2017-10-10 07:24:30 -04:00
davidcallizaya
a01d0af088 HOR-3951
Fix import users from ldap: username case sensitive.
2017-10-03 16:27:53 -04:00
Marco A. Nina Mena
9a75f900ba Change data init dashboard 2017-08-18 12:40:19 -04:00
davidcallizaya
de84f23265 Merge remote-tracking branch 'origin/feature/HOR-3274' into feature/HOR-3559 2017-08-10 21:38:58 -04:00
Paula Quispe
de4d75828b HOR-3639 2017-08-09 17:22:20 -04:00
u1
2240773cba HOR-3365 conflict resolution 2017-08-07 23:52:32 -04:00
Paula Quispe
678cd15bb0 HOR-3252 2017-08-05 11:40:12 -04:00
Paula Quispe
3e659921fd Merged in feature/HOR-3085 (pull request #5733)
HOR-3085

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2017-08-01 15:31:33 +00:00
Roly Rudy Gutierrez Pinto
6c97a19ad2 HOR-3366 pull request observations 2017-07-04 08:27:35 -04:00
Roly Rudy Gutierrez Pinto
ab866e5779 HOR-3366 2017-06-30 15:15:58 -04:00
Paula Quispe
6f1443bca1 Merged in develop (pull request #5762)
Develop

Approved-by: Paula Quispe <paula.quispe@processmaker.com>
2017-06-27 16:09:17 +00:00
Julio Cesar Laura Avendaño
720e3eb458 Put security fixes to develop branch 2017-06-14 11:14:23 -04:00
Paula Quispe
2ae466385c PR Spelling 2017-06-12 08:31:13 -04:00
Paula Quispe
f83ba242a4 HOR-3085 2017-06-09 16:40:18 -04:00
Paula Quispe
51a7dc327d HOR-3072 2017-06-05 11:48:49 -04:00
davidcallizaya
84ea1c0caf HOR-3340
1. Fix error message labels The event with {0}: {1} not is \"Start Event\"
2. Fix error message labels The event with {0}: {1} does not is registered.
3. Custom domain: FQDN does not include protocol and port, include from server.
2017-06-04 12:20:39 -04:00
davidcallizaya
76427ca571 HOR-3214
Fixed the code reviews.
2017-06-03 14:53:04 -04:00
Paula Quispe
16f3afc6e7 HOR-3313 2017-05-31 12:11:58 -04:00
Roly
de39ea54e7 Merged in bugfix/HOR-2909 (pull request #5683)
HOR-2909

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2017-05-24 19:51:02 +00:00
hjonathan
729bb92d90 update 2017-05-23 11:13:25 -04:00
Roly
cd070683c3 Merged develop into bugfix/HOR-2909 2017-05-19 15:55:49 -04:00
Paula Quispe
0af1a4ddf0 Merged in bugfix/HOR-2880 (pull request #5571)
HOR-2880

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2017-05-05 20:25:37 +00:00
Paula Quispe
d37217f4f2 Merge branch 'release/3.2.1' of bitbucket.org:colosa/processmaker into bugfix/HOR-2880 2017-05-05 12:06:14 -04:00
dheeyi william
a4d894ea8b HOR-1697
System Settings: Se aceptan valores reales/negativos en los campos: "MemoryLimit, CookieLifetime y DefaultUserExpiryDate"
2017-05-04 15:51:54 -04:00
Paula Quispe
537d826de8 Merged in bugfix/HOR-2858 (pull request #5555)
HOR-2858

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2017-05-03 20:25:24 +00:00
Paula Quispe
c2cddce587 HOR-2941 2017-04-21 16:15:29 -04:00
Paula Quispe
acc8d80f12 Merged in feature/HOR-2945 (pull request #5582)
HOR-2945

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2017-04-05 16:14:02 +00:00
Paula Quispe
caeb941cb2 Add a translation label 2017-03-30 15:56:35 -04:00
Paula Quispe
22b6038987 HOR-2935 2017-03-30 13:41:37 -04:00
Paula Quispe
b5a6a48d80 HOR-2880 2017-03-27 13:36:26 -04:00
Roly Rudy Gutierrez Pinto
ce4f36e1bd HOR-2909 2017-03-27 09:59:15 -04:00
Paula Quispe
2933f58bf0 HOR-2858 2017-03-22 13:23:45 -04:00
Paula Quispe
0e9258ec6f HOR-2839 2017-03-14 10:23:22 -04:00
Marco A. Nina Mena
bbfb22e44e HOR-2789 Audit Log translation
change label
2017-02-24 11:13:23 -04:00
Dante
9f4c3a5362 fixing incorrect texts when inserting into the content table 2017-02-23 10:12:53 -04:00
Dante
f23261fa5e HOR-2754 2017-02-22 12:04:12 -04:00
Marco A. Nina Mena
75af3c8fc2 Delete * in translation 2017-02-21 16:16:44 -04:00
Marco A. Nina Mena
07adac7c3d HOR-2726 Grammar and typo mistakes in ProcessMaker Google Integration section
- change descriptions labels
2017-02-21 15:35:32 -04:00
Paula V. Quispe
9b60fdb682 HOR-2282 2016-12-02 10:16:37 -05:00
Luis Fernando Saisa Lopez
fdc173f704 HOR-2155-E "Send notification in run..."
HOR-2155-E "Send notification in run..."
2016-11-16 13:55:57 -05:00