Commit Graph
17826 Commits
Author SHA1 Message Date
tianshujie98 fb263a1152 * Add lang/en.php 2020-08-25 16:27:11 +08:00
tianshujie98 62d11a4516 * Add lang/en.php 2020-08-25 16:26:33 +08:00
tianshujie98 0e82809798 Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x 2020-08-25 15:31:15 +08:00
tianshujie98 1011f0cb0e * Checkout module/group/lang/resource.php xuanxuan/module/group/ext/lang/zh-cn/xuanxuan.php 2020-08-25 15:30:10 +08:00
holan20180123 02794ed5c4 Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x 2020-08-25 15:12:28 +08:00
holan20180123 c2f4b9a9fb * Edit Programstatistic block. 2020-08-25 15:11:09 +08:00
Yagami e94501758c Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x 2020-08-25 15:00:16 +08:00
Yagami 4e0a3d0da5 * Fix block details. 2020-08-25 14:59:24 +08:00
tianshujie98 60fcf05741 * Delete empty line. 2020-08-25 14:53:50 +08:00
tianshujie98 73c08aa197 Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x 2020-08-25 14:52:27 +08:00
tianshujie98 36ca024811 * Add stdclass. 2020-08-25 14:51:07 +08:00
holan20180123 cdcb944cbb Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x 2020-08-25 14:14:04 +08:00
holan20180123 8a403a5f3b * Add field in Assigned to me block. 2020-08-25 14:13:29 +08:00
leiyong cf5c7e507c * Finish task#7654. 2020-08-25 14:12:35 +08:00
holan20180123 ee92307425 * Fix bug Assigned to me block. 2020-08-25 14:06:08 +08:00
holan20180123 80a20fa5de Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x 2020-08-25 13:58:42 +08:00
holan20180123 2af996af25 * Fix bug Assigned to me block. 2020-08-25 13:57:58 +08:00
tianshujie98 669d6c31e8 Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x 2020-08-25 13:41:26 +08:00
Yagami 78c467722a Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x 2020-08-25 13:40:39 +08:00
Yagami 115612570d * Fix sql. 2020-08-25 13:40:25 +08:00
tianshujie98 4e03358c25 * Add group/lang/resource.php. 2020-08-25 13:39:50 +08:00
tianshujie98 8c6babfb24 Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x 2020-08-25 13:33:03 +08:00
holan20180123 dfa03cf8cd Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x 2020-08-25 13:22:32 +08:00
holan20180123 865cda58f7 * Finish task #7627. 2020-08-25 13:21:39 +08:00
tianshujie98 1efa74380e * Add group/lang/resource.php. 2020-08-25 13:21:18 +08:00
Yagami 49717ef5bd Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x 2020-08-25 13:17:18 +08:00
Yagami 5885a75c2e * Code for program mothod. 2020-08-25 13:15:56 +08:00
holan20180123 eea72cf851 * Edit block lang. 2020-08-25 13:03:07 +08:00
Yagami 2a49dfd4d1 * Fix weekly bugs. 2020-08-25 11:27:34 +08:00
Yagami 8a418a6503 Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x 2020-08-25 11:10:02 +08:00
Yagami ad619c4909 * Code for story and requirement. 2020-08-25 11:09:42 +08:00
holan20180123 1af4b600af * Edit block lang 2020-08-25 10:48:54 +08:00
holan20180123 297be48bcc * Add unique field. 2020-08-25 10:06:32 +08:00
holan20180123 7f194f36ce Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x 2020-08-25 09:40:17 +08:00
holan20180123 6abb1f2aae * Add block for program statistic. 2020-08-25 09:37:08 +08:00
z d1f4308b36 Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x 2020-08-25 09:20:41 +08:00
z d64667dc99 * adjust for get parent pairs. 2020-08-25 09:19:54 +08:00
tianshujie98 485eb371fe Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x 2020-08-25 08:58:20 +08:00
tianshujie98 d62d93baa7 * Finish task #7628. 2020-08-25 08:57:39 +08:00
tianshujie98 7f4c8ac9ac * Finish task #7628. 2020-08-25 08:19:53 +08:00
leiyong 74bfa68346 * Adjust block lang. 2020-08-25 08:13:31 +08:00
Catouse 907261749e * task #7664, improve UI of cmmiprogress block. 2020-08-24 19:14:18 +08:00
leiyong d7e9aa82f7 * Block add operation button. 2020-08-24 17:59:08 +08:00
Yagami 1cadda2706 * Fix program link and weekly bug. 2020-08-24 17:21:59 +08:00
Yagami a5c739d8cd Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x 2020-08-24 16:33:57 +08:00
Yagami 3603ff2623 * Add story and requirement. 2020-08-24 16:33:37 +08:00
leiyong 9e95b1bb78 * Fix bug. 2020-08-24 15:39:16 +08:00
Yagami 74d5aa7981 Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x 2020-08-24 15:34:55 +08:00
Yagami 5d75ef450c * Add new block set method and more link. 2020-08-24 15:33:30 +08:00
z a6937ad5bf Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x 2020-08-24 15:30:26 +08:00