Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
44,300 Commits 2 Branches 292 Tags
12e8aebfb269cacbaaa654cf16c906fcd62d76be
Commit Graph
1206 Commits
Author SHA1 Message Date
tanghucheng 24dab5df38 * Fix bug #26906. 2022-08-26 11:30:14 +08:00
王怡栋 2a49655e2d Merge branch 'sprint/master_zhouxudong_update64888' into 'master' 
* Optimization task #64888.

See merge request easycorp/zentaopms!5037
 2022-08-23 01:49:31 +00:00
xieqiyu 99e4534f38 Merge branch 'master' into master_xieqiyu_draftStory 2022-08-22 17:29:21 +08:00
zhouxudong faf66f2d63 * Optimization task #64888. 2022-08-19 07:51:38 +00:00
王怡栋 e75b9b4b5f Merge branch 'sprint/228_tianshujie_api' into 'master' 
* Get the execution list.

See merge request easycorp/zentaopms!5029
 2022-08-19 05:13:29 +00:00
tianshujie b47cd1b77b * Fixed an issue where the admin could not click on the program. 2022-08-19 11:36:05 +08:00
zhouxudong 6312af0dea * Fix bug #26612. 2022-08-19 03:11:05 +00:00
zhouxudong b058344542 * Fix bug #26612. 2022-08-19 03:07:13 +00:00
周旭东 b2026b22af Update de.php 2022-08-19 00:47:54 +00:00
zhouxudong 49d654cabc * Finish task #64888. 2022-08-16 05:37:22 +00:00
xieqiyu 17773dee90 * Code for story of add draft status. 2022-08-12 16:00:00 +08:00
zhouxudong 837a32960f * Fix bug #26294. 2022-08-11 01:46:07 +00:00
王怡栋 7c2d2b54eb Merge branch 'master' into 'master_liuhong_63787' 
# Conflicts:
#   module/program/css/browse.css
#   module/project/css/browse.css
 2022-08-11 01:22:50 +00:00
liuhong f713f01ee7 *Finish task #63787. 2022-08-11 00:49:21 +00:00
王怡栋 de30066a3b Merge branch 'master_liuhong_63787' into 'master' 
Master liuhong 63787

See merge request easycorp/zentaopms!4902
 2022-08-10 08:11:31 +00:00
xieqiyu 4c01aec006 * Code for task#63787. 2022-08-10 15:51:23 +08:00
wangyidong 901d2b95a0 Merge branch 'sprint/master_zhouxudong_code' 2022-08-10 15:29:23 +08:00
xieqiyu bd18594c80 * Code for task#63579. 2022-08-10 15:09:57 +08:00
xieqiyu 2f6d225550 * Code for task#62851. 2022-08-10 13:55:03 +08:00
zhouxudong 266fdf9ca7 * Update code. 2022-08-10 05:42:26 +00:00
xieqiyu 9c4f3f0ee1 * Code for task#62851. 2022-08-10 13:32:15 +08:00
xieqiyu e6bd15a63a * Code for task#63581. 2022-08-10 10:25:58 +08:00
zhouxudong 01c75c8370 * Finish task. 2022-08-09 15:08:33 +00:00
zhouxudong 8750b265c1 * Finish task. 2022-08-09 13:05:50 +00:00
zhouxudong 808d01aa17 * Finish task. 2022-08-09 09:43:34 +00:00
zhouxudong 6f8f9b52e9 * Finish task. 2022-08-09 07:31:10 +00:00
zhouxudong 90e0daf6c0 * Finish task. 2022-08-09 06:32:29 +00:00
zhouxudong 3cc9977663 * Finisha task. 2022-08-09 05:49:27 +00:00
liuhong bb856c1fce *Finish task #63781. 2022-08-09 02:32:04 +00:00
liuhong 0fa2de0ff8 *Finish task #63781. 2022-08-09 01:23:43 +00:00
zhouxudong ef847f1169 * Finish task #63581. 2022-08-08 14:37:33 +00:00
zhouxudong abc59ed7aa * Finish task #63679. 2022-08-07 15:21:43 +00:00
zhouxudong c68f271328 * Finish task 62581. 2022-08-07 13:55:38 +00:00
zhouxudong 0091ac82c6 * Update. 2022-08-05 08:16:11 +00:00
zhouxudong e56f5c8082 * Update code. 2022-08-05 07:39:23 +00:00
zhouxudong 0e5fccdc46 * Update code. 2022-08-05 06:20:54 +00:00
zhouxudong cf009e9c80 * Reconstruction method. 2022-08-05 01:58:27 +00:00
zhouxudong 7a34334374 * Fix bug. 2022-08-04 05:50:24 +00:00
王怡栋 a1fc10a300 Merge branch 'sprint/222' into 'master' 
Sprint/222

See merge request easycorp/zentaopms!4784
 2022-08-04 03:03:16 +00:00
zhouxudong e95b8f75a3 * Finish task #62852. 2022-08-04 02:36:12 +00:00
zhouxudong 7054e33346 * Finish task #62852. 2022-08-04 02:30:31 +00:00
zhouxudong f3c4e8b26b * Finish task #62852. 2022-08-04 02:24:51 +00:00
zhouxudong 0c29e89833 * Finish task #62852. 2022-08-04 02:16:56 +00:00
wangyuting2 c4f99aeced * Fix program featureMenu bug. 2022-08-04 09:52:05 +08:00
zhouxudong 8bbac3b2fe * Finish task #62852. 2022-08-04 01:45:10 +00:00
liuruogu 5f57574e75 * Finish task #63387. 2022-08-04 00:40:25 +00:00
zhouxudong 584793163f * Finish task #62852. 2022-08-03 07:31:07 +00:00
wangyuting2 84c6278274 * Finish task #63288. 2022-08-03 13:32:41 +08:00
wangyuting2 fa81472771 * Adjust menu. 2022-08-03 13:32:41 +08:00
zhouxudong b139f8da68 * Finish task #62852. 2022-08-03 01:34:09 +00:00