Commit Graph
14791 Commits
Author SHA1 Message Date
leiyong aa6f7b5d5f * Finish task#7654. 2020-08-26 10:11:20 +08:00
Catouse 2942519ed8 * improve UI of recentprogram block. 2020-08-26 09:56:55 +08:00
Catouse 413a53019e * refactor. 2020-08-26 09:56:55 +08:00
Yagami d9e9623e07 Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x 2020-08-26 09:48:14 +08:00
Yagami ed353f7ebd * Fix en menu. 2020-08-26 09:47:58 +08:00
holan20180123 7b3c3b65a8 Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x 2020-08-26 09:46:50 +08:00
holan20180123 f6ec68ffe8 * Add English lang file for progranplan module. 2020-08-26 09:46:17 +08:00
tianshujie98 5095245438 Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x 2020-08-26 09:32:30 +08:00
tianshujie98 82a3cdadde * Unified action/lang file. 2020-08-26 09:30:00 +08:00
Yagami 4240f51ae5 Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x 2020-08-26 09:23:26 +08:00
Yagami 77cf55dd79 * Fix system menu header. 2020-08-26 09:23:01 +08:00
holan20180123 bd2cf28ff1 Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x 2020-08-26 09:10:56 +08:00
holan20180123 f4ccf99b1d * Edit English lang file for user module. 2020-08-26 09:10:23 +08:00
tianshujie98 640bb8c7d3 Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x 2020-08-26 09:06:41 +08:00
tianshujie98 41ecce79d5 * Add comment. 2020-08-26 09:05:49 +08:00
holan20180123 76628a20a5 * Add English lang file. 2020-08-26 09:02:43 +08:00
tianshujie98 2ea4545a7c Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x 2020-08-26 08:35:48 +08:00
tianshujie98 00fe28cc80 * Unified button format. 2020-08-26 08:33:11 +08:00
Catouse f73b816280 * improve UI of program cards view. 2020-08-26 08:26:50 +08:00
tianshujie98 f71882401e Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x 2020-08-26 08:12:27 +08:00
tianshujie98 89f8a86f3f * Add judgment when the database is empty. 2020-08-26 08:11:21 +08:00
leiyong 7853944cea * Add scrum overview block. 2020-08-25 18:51:53 +08:00
tianshujie98 784a002bc0 * Fix bug. 2020-08-25 17:38:19 +08:00
qiyu-xie 11b3c29bb2 * Add en.php. 2020-08-25 17:25:42 +08:00
tianshujie98 1b1ad2a384 * Fix Bug #3400. 2020-08-25 17:24:32 +08:00
tianshujie98 356ced18f5 Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x 2020-08-25 17:00:21 +08:00
tianshujie98 dbba92d084 * Fix Bug #3401. 2020-08-25 16:59:54 +08:00
Catouse 267ac8f0b7 * task #7651, improve UI of programteam block. 2020-08-25 16:54:58 +08:00
tianshujie98 17242608fe Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x 2020-08-25 16:43:15 +08:00
tianshujie98 a3cb36f6e3 * Modified design/lang/en.php 2020-08-25 16:42:25 +08:00
leiyong cc901f28ee Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x 2020-08-25 16:42:03 +08:00
leiyong 22ab2f9599 * Adjust code. 2020-08-25 16:41:40 +08:00
Yagami 05b1ffeb32 Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x 2020-08-25 16:41:03 +08:00
z 1eb3af2a6d * fix error. 2020-08-25 16:40:31 +08:00
Yagami 639cd3ad87 Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x 2020-08-25 16:40:31 +08:00
z 8667908ce3 Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x 2020-08-25 16:39:02 +08:00
Yagami 6831c27236 Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x 2020-08-25 16:38:35 +08:00
z 9a11ace11e * adjust for getParentPairs with template. 2020-08-25 16:38:17 +08:00
Yagami 7e73b340d6 Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x 2020-08-25 16:38:02 +08:00
hufangzhou 943cb2a8fa * Add scrum overview block. 2020-08-25 16:37:52 +08:00
Yagami 58c0bc19a0 * Fix menu. 2020-08-25 16:37:42 +08:00
tianshujie98 8fcccc4604 Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x 2020-08-25 16:35:01 +08:00
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
holan20180123 843e2f8579 Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x 2020-08-25 16:18:02 +08:00
holan20180123 be2c3596a3 * Edit program lang en.php 2020-08-25 16:17:17 +08:00
Catouse e908c152cb * fix status filter not work in program/browse in grid view. 2020-08-25 16:07:21 +08:00
Catouse 648934425c * task #7660, fix progress error in cmmigantt block. 2020-08-25 16:02:14 +08:00
Catouse 57df12b6d1 * refactor. 2020-08-25 15:52:13 +08:00
Catouse 79c2decff2 * task #7660, add UI for cmmigantt block. 2020-08-25 15:52:13 +08:00