Commit Graph
17772 Commits
Author SHA1 Message Date
z afb11b19de Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x 2020-08-24 13:21:56 +08:00
z d7ba21e035 * finish task #7648. 2020-08-24 13:16:54 +08:00
Yagami fe575297f0 Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x 2020-08-24 11:45:10 +08:00
z 0b06025c15 Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x 2020-08-24 11:34:08 +08:00
z 1a9c007fec * finish task #7648. 2020-08-24 11:33:37 +08:00
Yagami 1ad65ade80 * Fix progress error. 2020-08-24 11:32:02 +08:00
leiyong da40782404 * Finish task#7658. 2020-08-24 11:31:36 +08:00
Yagami 82f771c4af Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x 2020-08-24 10:58:09 +08:00
Yagami 4925070808 Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x 2020-08-24 10:56:44 +08:00
holan20180123 6257a82bf8 * Edit isClickable for program model. 2020-08-24 10:56:39 +08:00
Yagami b12aef4e0f * Code for task #7640. 2020-08-24 10:53:59 +08:00
holan20180123 6c8c7255f0 Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x 2020-08-24 10:52:24 +08:00
holan20180123 33666bc545 * Add risk list for assign to me block. 2020-08-24 10:50:52 +08:00
Yagami ec46bb7bcc Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x 2020-08-24 10:47:48 +08:00
Yagami 865d311df2 * Fix block details. 2020-08-24 10:45:30 +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
tianshujie98 be6daed1e6 * Finish task #7628. 2020-08-24 09:37:37 +08:00
tianshujie98 9bf7cd19ef * Finish task #7628. 2020-08-24 09:21:49 +08:00
tianshujie98 0b09a6a3fc * Finish task #7628. 2020-08-24 09:16:20 +08:00
leiyong 83e0d78aef * Add issue lang file. 2020-08-24 08:11:20 +08:00
sgm0422 ecbeb7f598 * Fix code details. 2020-08-23 15:24:16 +08:00
sgm0422 1ecc8c4644 * Fix code style. 2020-08-22 23:42:46 +08:00
tianshujie98 51329f01b8 Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x 2020-08-21 17:04:01 +08:00
tianshujie98 8b479c3cf5 * Finish task #7628. 2020-08-21 17:03:25 +08:00
Yagami 57508a6634 Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x 2020-08-21 17:01:29 +08:00
Yagami 87f36b0c39 * Fix code style. 2020-08-21 16:59:10 +08:00
z 23055c1ed6 Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x 2020-08-21 16:02:26 +08:00
z bd27e5b0ed * finish task #7645. 2020-08-21 16:01:44 +08:00
holan20180123 7ceed7be4f Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x 2020-08-21 15:44:57 +08:00
holan20180123 d52f312fe0 * Edit css of recentprogram block. 2020-08-21 15:44:15 +08:00
Yagami ab623ffab6 Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x 2020-08-21 15:39:55 +08:00
Yagami bc831b9e94 * Add program statistic. 2020-08-21 15:39:39 +08:00
holan20180123 29f9b687de Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x 2020-08-21 15:38:37 +08:00
holan20180123 848c7cf866 * Add recent program block. 2020-08-21 15:37:59 +08:00
leiyong 0c008cd016 * Issue add search. 2020-08-21 15:29:30 +08:00
Yagami de2b16d64e Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x 2020-08-21 13:51:40 +08:00
Yagami a245bb6954 * Fix welcome block. 2020-08-21 13:51:09 +08:00
holan20180123 af7e3883a5 Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x 2020-08-21 13:26:21 +08:00
holan20180123 1b615eab97 * Edit search risk. 2020-08-21 13:25:54 +08:00
Yagami a2dc263d7d Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x 2020-08-21 13:15:18 +08:00
Yagami 3b9a6dbe09 * Add block module list. 2020-08-21 13:14:51 +08:00
holan20180123 7ac97c9e56 Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x 2020-08-21 13:06:30 +08:00
holan20180123 5769bf7c0f * Add contribute block. 2020-08-21 13:05:43 +08:00
Yagami 88141954a6 Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x 2020-08-21 11:25:58 +08:00
Yagami 647b060875 * Fix block get list method. 2020-08-21 11:25:39 +08:00
z 648f5e84f8 Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x 2020-08-21 11:05:30 +08:00
z 463a7c24a8 * code for task #7644. 2020-08-21 11:04:41 +08:00
Yagami c09e27a568 Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x 2020-08-21 10:57:30 +08:00
Yagami 9c24b069d6 * Add new block. 2020-08-21 10:56:19 +08:00