Commit Graph

1494 Commits

Author SHA1 Message Date
yfl
cfa8147618 * Fix Bug 2019-04-22 09:30:41 +08:00
reneeteng
9cad7d87d2 * Lang change b. 2019-04-19 10:35:56 +08:00
reneeteng
6d414d84b3 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-04-17 11:14:48 +08:00
reneeteng
992d5fa425 * Lang changed. 2019-04-17 10:47:23 +08:00
Catouse
58a5ce3d92 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-04-16 11:29:08 +08:00
Catouse
e8420fc3a7 * refactor codes. 2019-04-16 11:29:01 +08:00
reneeteng
590112e66c Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-04-15 15:42:22 +08:00
Yagami
c534d4602c * Code for task #7805. 2019-04-15 10:50:21 +08:00
reneeteng
b9dc6d629b Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-04-15 09:23:53 +08:00
reneeteng
d29d77ac06 * Lang changed. 2019-04-15 09:23:02 +08:00
yfl
550c5168c1 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-04-11 13:13:55 +08:00
yfl
14eb93ef75 * Task # 7894 2019-04-11 13:13:19 +08:00
Yagami
8bd5e075d1 * Fix parent task button. 2019-04-11 10:49:00 +08:00
reneeteng
fcf101fa3c Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-04-09 15:48:19 +08:00
reneeteng
b557a8c45a Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-04-09 15:47:33 +08:00
chenfei
bee17125ad * Prepare for upgrade 11.4.1 2019-04-06 13:49:21 +08:00
wangyidong
559095ff58 * adjust children actions for task-view page in modal. 2019-04-04 14:52:29 +08:00
wangyidong
96fd2a0f4d * adjust for task view page in modal. 2019-04-02 17:12:13 +08:00
Yagami
c7c59c30bf * Finish task #7707. 2019-03-29 14:03:53 +08:00
wangyidong
bf97231962 * adjust for task getProjectTaskPairs method. 2019-03-28 10:28:26 +08:00
wangyidong
9f42f0b0d4 * fix bug. 2019-03-27 09:21:30 +08:00
Yagami
a16d4f3c67 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-03-25 14:02:20 +08:00
Yagami
fcf80e8675 * Fix task lang file. 2019-03-25 14:01:56 +08:00
wangyidong
84955d15ab * adjust for testStory. 2019-03-25 13:45:59 +08:00
chenfei
d39a315e79 * Prepare for zentao 11.4 upgrade. 2019-03-22 17:36:42 +08:00
wangyidong
d78546eea5 * adjust for task #5357. 2019-03-22 16:49:47 +08:00
chenfei
e2520978d1 * Adjust edit and delete button in view page of plan, release and build module. 2019-03-22 15:58:04 +08:00
wangyidong
5f6df0bcdb Merge branch 'master' of github.com:easysoft/zentaopms 2019-03-22 15:26:24 +08:00
wangyidong
884b7b9c18 * adjust for 5325. 2019-03-22 15:13:50 +08:00
Yagami
0e0f0af555 * Finish child task. 2019-03-22 11:19:44 +08:00
Yagami
0344580fff * Fix task lang file. 2019-03-22 10:42:00 +08:00
Catouse
e8a14d2a48 * finish task #5315. 2019-03-21 14:32:22 +08:00
Yagami
6aa434a9ca * Fix closeModal js. 2019-03-21 13:43:38 +08:00
Yagami
8c6015a5ea * Finish task #5346. 2019-03-21 09:53:46 +08:00
chenfei
fa5f377d52 * Code for task #5343, #5346. 2019-03-20 15:58:19 +08:00
chenfei
b66c5ec7fa * Finish task #5330. 2019-03-19 17:23:35 +08:00
wangyidong
3cd2f30ad8 Merge branch 'master' of github.com:easysoft/zentaopms 2019-03-18 16:56:38 +08:00
wangyidong
e925ae51e9 * finish task #5325. 2019-03-18 16:55:58 +08:00
Yagami
7004af89d9 * Finish task #5327. 2019-03-18 15:48:30 +08:00
Yagami
62249b0782 * Finish task #5316. 2019-03-18 11:17:57 +08:00
Yagami
08f9a09730 * Fix bug #2467. 2019-03-15 13:27:22 +08:00
Yagami
e05ed035f6 * Fix lastEditDate bug. 2019-03-11 17:17:11 +08:00
wangyidong
487e802420 * finish task #7499. 2019-03-08 14:48:50 +08:00
Yagami
dcc120573d * Fix get user data method. 2019-02-27 17:00:49 +08:00
chenfeiCF
35c33e50ed * Adjust en lang. 2019-02-27 13:34:35 +08:00
wangyidong
e3f51c9a19 * adjust for copy title. 2019-02-27 10:53:30 +08:00
wangyidong
8f1b0fe119 * adjust table width for en lang. 2019-02-27 09:43:14 +08:00
Yagami
efe734f04a * Code for task #5284. 2019-02-26 14:28:26 +08:00
reneeteng
c05c534b12 * Lang change. 2019-02-26 10:29:53 +08:00
wangyidong
62386800f2 * finish task #5308. 2019-02-25 10:46:10 +08:00