Commit Graph

334 Commits

Author SHA1 Message Date
Yagami
1b9c6b0e98 * Merge code. 2020-09-23 14:54:16 +08:00
leiyong
ab6ea6f7e0 * Project add sort. 2020-09-23 13:27:18 +08:00
leiyong
3dc97e7148 * Adjust project creation and editing logic. 2020-09-23 11:03:30 +08:00
leiyong
0f66457e03 * Aajust style. 2020-09-22 15:43:40 +08:00
Yagami
dd48623aaa * Delete unused file and add new file. 2020-09-22 15:10:11 +08:00
Yagami
88a76e1efa * Fix details. 2020-09-22 15:10:11 +08:00
leiyong
d671cd644c * Adjust project creation logic. 2020-09-22 13:08:17 +08:00
Yagami
cec65da271 * Fix program and project btn. 2020-09-22 10:53:23 +08:00
leiyong
85d698582c * Add item drop down menu. 2020-09-22 08:54:03 +08:00
hufangzhou
9b7d53c4c7 * Finish task#7934. 2020-09-21 17:32:16 +08:00
Yagami
3cb892fc4e * Fix product menu. 2020-09-21 16:45:06 +08:00
leiyong
566d03a358 * Fix project editing errors. 2020-09-21 16:10:33 +08:00
Yagami
55b0a94586 * Fix code error. 2020-09-21 16:04:00 +08:00
leiyong
5b83f2d3f6 * Update project address. 2020-09-21 15:48:34 +08:00
hufangzhou
a208608d85 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-09-21 15:10:51 +08:00
hufangzhou
69ff276665 * Finish task#7934. 2020-09-21 15:10:42 +08:00
leiyong
cc046270aa * Project add type selection. 2020-09-21 14:56:13 +08:00
leiyong
239ae2eefe * Project add edit method. 2020-09-21 14:39:35 +08:00
Yagami
7a7c587a6a * Add create prj btn in program browse. 2020-09-21 14:36:25 +08:00
leiyong
94fae1d49e * Add edit and copy method under project. 2020-09-20 23:27:06 +08:00
leiyong
3550097dc8 * Add project authority management function. 2020-09-20 22:57:24 +08:00
Yagami
99fe956e4b * Merge code. 2020-09-18 16:48:19 +08:00
leiyong
a8103fd03e * Add project creation method. 2020-09-18 14:26:27 +08:00
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
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
f2d571b28d * Fix ajax get program menu. 2020-09-02 09:59:35 +08:00
Yagami
116a7e43b3 * Finish task #7721. 2020-08-31 13:34:32 +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
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
8eb7358131 * adjust for check begin and end. 2020-08-26 10:10:01 +08:00
Catouse
f73b816280 * improve UI of program cards view. 2020-08-26 08:26:50 +08:00
Yagami
1cadda2706 * Fix program link and weekly bug. 2020-08-24 17:21:59 +08:00
z
6ee48f38f7 * adjust for change isCat field. 2020-08-24 15:30:00 +08:00
z
ccfe5c5ada Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x 2020-08-24 10:19:56 +08:00
z
23d070d622 * finish task #7643, 2020-08-24 10:18:53 +08:00
sgm0422
1ecc8c4644 * Fix code style. 2020-08-22 23:42:46 +08:00
z
bd27e5b0ed * finish task #7645. 2020-08-21 16:01:44 +08:00