Commit Graph
18599 Commits
Author SHA1 Message Date
z 48929ce58b * set recPerPage to 50 in program-browse page. 2020-08-27 14:03:46 +08:00
z 505ed7c1bf Merge branch 'master' of github.com:easysoft/zentaopms 2020-08-27 13:54:46 +08:00
z 4f47220347 * finish task #7698. 2020-08-27 13:54:23 +08:00
tianshujie98 6b275e872d Merge branch 'master' of github.com:easysoft/zentaopms 2020-08-27 13:51:33 +08:00
tianshujie98 5ac6d0540e * Add programplan comment. 2020-08-27 13:50:54 +08:00
holan20180123 22f5c0b363 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-08-27 13:48:23 +08:00
holan20180123 1062033526 * Finish Task #7711. 2020-08-27 13:42:16 +08:00
leiyong 5c6c487580 * Adjust menu。 2020-08-27 13:34:36 +08:00
qiyu-xie 8a2aff88ac Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-08-27 13:32:22 +08:00
qiyu-xie 08e776ae48 * Add issue module notes. 2020-08-27 13:31:38 +08:00
Yagami f4d53d4d80 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-08-27 13:22:03 +08:00
Yagami 8197765c51 * Add cron sql. 2020-08-27 13:21:50 +08:00
tianshujie98 02a33344f7 Merge branch 'master' of github.com:easysoft/zentaopms 2020-08-27 13:20:16 +08:00
tianshujie98 840b7ab03a * Add risk commit. 2020-08-27 13:19:45 +08:00
Yagami 9b5dc31850 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-08-27 13:03:58 +08:00
z d51ab5893b Merge branch 'master' of github.com:easysoft/zentaopms 2020-08-27 13:03:02 +08:00
z 04508fa14c * adjust code. 2020-08-27 13:02:33 +08:00
Yagami 39f3fffed8 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-08-27 13:02:29 +08:00
Yagami d117275c5b * Fix group programs. 2020-08-27 13:01:57 +08:00
tianshujie98 17ba1e95e4 * Add workestimation comment. 2020-08-27 12:16:34 +08:00
qiyu-xie b3b90ccbe2 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-08-27 11:31:31 +08:00
qiyu-xie 9ca95ac3e6 *Add design assignTo priv. 2020-08-27 11:30:45 +08:00
tianshujie98 13d2475a99 Merge branch 'master' of github.com:easysoft/zentaopms 2020-08-27 11:28:29 +08:00
tianshujie98 822bf9ecbd * Add budget comment. 2020-08-27 11:27:55 +08:00
Catouse 042957fd1d * fix params type error in comments. 2020-08-27 11:23:35 +08:00
leiyong f0276c001b * Finish task#7705. 2020-08-27 11:18:30 +08:00
Yagami 1e917bcb0f Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-08-27 11:17:40 +08:00
Yagami b3e27f70b3 * Mv milestone to qc. 2020-08-27 11:17:22 +08:00
tianshujie98 6eb4d2b698 Merge branch 'master' of github.com:easysoft/zentaopms 2020-08-27 11:14:19 +08:00
tianshujie98 dd2f82a8de * Add stage comment. 2020-08-27 11:12:53 +08:00
Catouse 6c9c62f233 * improve UI of program list. 2020-08-27 11:03:39 +08:00
z e8c9a0ccf5 Merge branch 'master' of github.com:easysoft/zentaopms 2020-08-27 11:00:14 +08:00
z 5674cdbae8 * finish task #7708. 2020-08-27 10:59:38 +08:00
tianshujie98 065928fd20 * Fix assignTo. 2020-08-27 10:46:18 +08:00
tianshujie98 f0758c4634 * Fix assignTo. 2020-08-27 10:37:43 +08:00
tianshujie98 801efb0539 Merge branch 'master' of github.com:easysoft/zentaopms 2020-08-27 10:29:03 +08:00
tianshujie98 7fe0cba0c9 * Fix bug. 2020-08-27 10:28:20 +08:00
Yagami eb47645a67 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-08-27 10:14:12 +08:00
Yagami 84cdafa606 * Fix block weekly. 2020-08-27 10:13:31 +08:00
tianshujie98 1d2bdce37e Merge branch 'master' of github.com:easysoft/zentaopms 2020-08-27 10:00:34 +08:00
tianshujie98 3d363c7f2e * Fix repo/view/revision.html.php bug. 2020-08-27 09:58:21 +08:00
Catouse a5f004beab Merge branch '20.x'
# Conflicts:
#	module/program/view/create.html.php
2020-08-27 09:33:00 +08:00
leiyong df1a9ee5ef * Finish task#7702. 2020-08-27 09:23:10 +08:00
leiyong 06e5748f12 * Adjust lang file. 2020-08-27 09:11:23 +08:00
leiyong 113dbc40d9 Merge branch 'master' of github.com:easysoft/zentaopms 2020-08-27 09:10:41 +08:00
Catouse 53503ab6fa * task #7641, support show projects in nested list. 2020-08-27 09:05:31 +08:00
Catouse 88a70977e6 * task #7641, support show projects in nested list. 2020-08-27 09:03:43 +08:00
Catouse b10f3686a8 * fix cannot submit form without parentprogram data on create one. 2020-08-27 09:02:38 +08:00
Catouse 3712145ff9 * only show programs which status is doing in programteam block. 2020-08-27 09:02:38 +08:00
Catouse 6040241c94 * hide products select control on count less than 2. 2020-08-27 09:02:38 +08:00