Commit Graph

17274 Commits

Author SHA1 Message Date
wangyidong
f14dde277c Merge branch 'master' of github.com:easysoft/zentaopms 2020-03-17 16:40:55 +08:00
wangyidong
cfa5261960 * finish task #6902 and merge xuanxuan. 2020-03-17 16:38:44 +08:00
leiyong
b0966e0faf Wechat can recursively obtain department users. 2020-03-17 16:32:45 +08:00
reneeteng
9e21c86389 * Install lang updated. 2020-03-17 15:38:35 +08:00
Yagami
a9fbc3950d Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-03-16 15:29:14 +08:00
Yagami
d2d138869d * Fix makefile and sql. 2020-03-16 15:28:45 +08:00
reneeteng
875caed3ed Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-03-16 14:19:06 +08:00
reneeteng
adc3b3c1c4 * Lang file update for ci and my. 2020-03-16 14:16:29 +08:00
wangyidong
bc08702d32 * finish task #6970. 2020-03-16 09:16:31 +08:00
reneeteng
ac9c8a9559 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-03-16 08:24:50 +08:00
sgm0422
8dda089476 * Fix isClickble for requirement. 2020-03-15 15:00:51 +08:00
sgm0422
1770208118 * Code for requiment. 2020-03-15 14:37:28 +08:00
reneeteng
fd83116e1d Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-03-15 11:41:11 +08:00
wangyidong
da823eacb6 * fix bug. 2020-03-14 13:30:58 +08:00
reneeteng
6e9cc77ed7 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-03-13 15:37:13 +08:00
wangyidong
054c41e2b8 * adjust en lang. 2020-03-13 14:59:09 +08:00
wangyidong
db2fc06f49 * change error word. 2020-03-13 14:38:37 +08:00
wangyidong
101679c6a5 Merge branch 'master' of github.com:easysoft/zentaopms 2020-03-13 13:23:13 +08:00
wangyidong
3ba2f42aef * show child label. 2020-03-13 11:22:54 +08:00
sgm0422
8797f0bd90 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-03-13 10:09:28 +08:00
sgm0422
ce1716feac * Code for requirement. 2020-03-13 10:09:02 +08:00
wangyidong
4905c7aef6 * fix bug. 2020-03-13 10:01:02 +08:00
wangyidong
82fff1b42f * finish task #6981. 2020-03-13 10:00:43 +08:00
wangyidong
8f3adf9e95 Merge branch 'master' of github.com:easysoft/zentaopms 2020-03-13 08:51:45 +08:00
wangyidong
fcfe033f28 * adjust for parent-child story. 2020-03-13 08:36:31 +08:00
leiyong
5aeea7572a Docking CMMI. 2020-03-13 08:23:37 +08:00
reneeteng
56e566e786 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-03-12 22:48:48 +08:00
sgm0422
cb9fbd724e * Add my-requirement view. 2020-03-12 16:37:44 +08:00
reneeteng
8a5a175f2c * Updated compile lang file. 2020-03-12 16:22:47 +08:00
reneeteng
38d3c16954 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-03-12 16:16:15 +08:00
zbx
58e43db063 * Code for requirement and story. 2020-03-12 15:44:33 +08:00
zbx
b72ddf92d1 * Code for requirement. 2020-03-12 14:51:17 +08:00
zbx
aec712defd * Add storyCommon to config. 2020-03-11 16:56:41 +08:00
wangyidong
beaa6ff0b2 * adjust for save action to pms. 2020-03-11 08:58:27 +08:00
wangyidong
89ea58a4da * adjust for make zentaoxx. 2020-03-10 18:07:31 +08:00
wangyidong
26177e362e * fix bug #6974. 2020-03-10 15:51:47 +08:00
wangyidong
5d36307c44 + add fr.php and de.php. zentaopms_12.1.stable_20200310 2020-03-10 15:42:00 +08:00
wangyidong
904df3224b * add new version and upgrade. 2020-03-10 15:14:18 +08:00
wangyidong
f69d8231c9 * adjust for parse comment for resolve bug. 2020-03-09 17:49:40 +08:00
wangyidong
5a3ea1e897 * adjust for parseComment. 2020-03-09 17:42:43 +08:00
wangyidong
88ffd189e1 * adjust setrule page. 2020-03-09 15:52:14 +08:00
wangyidong
0f1432cc5f * adjust code. 2020-03-09 15:10:02 +08:00
wangyidong
224c383d00 * change saveRepo to importRepoFromConfig. 2020-03-09 15:07:49 +08:00
wangyidong
427a762bbc * adjust for init when create or update job. 2020-03-09 14:56:52 +08:00
wangyidong
35a2251dcb * adjust for get svnDir. 2020-03-09 14:13:16 +08:00
wangyidong
e7b5d2d0a8 * adjust show log. 2020-03-09 09:44:31 +08:00
wangyidong
aa07506688 * adjust for compile each tag. 2020-03-09 09:13:24 +08:00
reneeteng
118fc78d25 * CI, Jenkins lang updated. 2020-03-08 16:02:49 +08:00
wangyidong
a694c8493f * change comment to commit. 2020-03-06 18:27:21 +08:00
wangyidong
14bb491ce5 * change job name. 2020-03-06 17:40:15 +08:00