Commit Graph

142 Commits

Author SHA1 Message Date
leiyong
dc52779039 * Improve project module. 2020-09-17 16:48:20 +08:00
Yagami
fc036c5d99 * Finish task #7850,#7854. 2020-09-17 16:39:53 +08:00
Yagami
334260162a * Rename program lang. 2020-09-16 14:54:23 +08:00
Yagami
685fbad61a * Merge code. 2020-09-16 14:53:48 +08:00
leiyong
b55e9344ee * Adjust program lang . 2020-09-16 14:49:19 +08:00
Yagami
2b9a3fb312 * Move project list to program module. 2020-09-16 14:22:37 +08:00
Yagami
d624251ab6 * Delete unused file and fix menu. 2020-09-16 14:05:26 +08:00
Yagami
66f4f5403a * Fix sql and rename program to PRJ. 2020-09-16 11:28:55 +08:00
Yagami
ac8bb689b7 * Change realStarted to realBegan. 2020-09-16 08:28:47 +08:00
holan20180123
dc59b063a7 * Fix bug #3471. 2020-09-11 15:23:23 +08:00
leiyong
c7594b8f4a * Adjust the GetList method of the program module. 2020-09-09 10:19:47 +08:00
Yagami
11bc9076ac * Code for task #7825. 2020-09-07 14:18:32 +08:00
tianshujie98
e61eb3eca1 * Remove spaces. 2020-09-03 17:44:15 +08:00
tianshujie98
adaf912eee * Modify English language items. 2020-09-03 17:33:29 +08:00
hufangzhou
0a46aa5512 * Fix problems found in code review. 2020-09-03 15:54:12 +08:00
hufangzhou
0c3c03cc9d * Fix bug#3415. 2020-09-02 15:41:50 +08:00
holan20180123
f2d571b28d * Fix ajax get program menu. 2020-09-02 09:59:35 +08:00
z
ab578b96b1 * fix error. 2020-09-01 17:15:30 +08:00
Yagami
988b5f1076 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-09-01 09:14:48 +08:00
Yagami
63e462a885 * Finish task #7724. 2020-08-31 16:00:28 +08:00
holan20180123
521cea2844 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-08-31 15:04:28 +08:00
holan20180123
7a661001da * Finish task #7758. 2020-08-31 14:57:44 +08:00
Yagami
116a7e43b3 * Finish task #7721. 2020-08-31 13:34:32 +08:00
Yagami
0956f7468d * Fix program code detail. 2020-08-29 13:43:03 +08:00
Yagami
49316f308b * Rename program method name. 2020-08-29 13:20:27 +08:00
leiyong
3d44a40267 Merge branch 'master' of github.com:easysoft/zentaopms 2020-08-27 14:43:26 +08:00
leiyong
2d3947e441 * Fix bug. 2020-08-27 14:41:27 +08:00
Catouse
35289a78f9 * improve UI of program list and cards view. 2020-08-27 14:28:59 +08:00
z
4ab2be31d0 * adjust for end is 0000-00-00. 2020-08-27 14:21:12 +08:00
z
48929ce58b * set recPerPage to 50 in program-browse page. 2020-08-27 14:03:46 +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
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
Catouse
6c9c62f233 * improve UI of program list. 2020-08-27 11:03:39 +08:00
z
5674cdbae8 * finish task #7708. 2020-08-27 10:59:38 +08:00
Catouse
a5f004beab Merge branch '20.x'
# Conflicts:
#	module/program/view/create.html.php
2020-08-27 09:33:00 +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
z
89a542e350 * finish task #7697. 2020-08-26 16:46:12 +08:00
z
6b93c993aa * set default isCat in edit program. 2020-08-26 13:10:05 +08:00
z
518ca3027e * adjust for en lang. 2020-08-26 10:30:41 +08:00
z
e6879f283d * adjust code for update. 2020-08-26 10:19:39 +08:00
z
b55ef50a46 Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x 2020-08-26 10:11:25 +08:00
z
8eb7358131 * adjust for check begin and end. 2020-08-26 10:10:01 +08:00
Catouse
413a53019e * refactor. 2020-08-26 09:56:55 +08:00
Yagami
ed353f7ebd * Fix en menu. 2020-08-26 09:47:58 +08:00
Catouse
f73b816280 * improve UI of program cards view. 2020-08-26 08:26:50 +08:00
z
8667908ce3 Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x 2020-08-25 16:39:02 +08:00