Commit Graph
829 Commits
Author SHA1 Message Date
hufangzhou d5f7193f3f * Modify the language file. 2020-11-27 16:16:32 +08:00
hufangzhou 82afdda6a3 * Modify the language files. 2020-11-27 13:02:46 +08:00
hufangzhou 6c6d177c84 * Fix a bug. 2020-11-27 09:19:25 +08:00
hufangzhou 7b866ec815 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-11-27 09:07:50 +08:00
hufangzhou be37148d14 * Finish task#8454. 2020-11-27 09:05:06 +08:00
Yagami cb0043a49b * Finish task #8460. 2020-11-26 15:55:41 +08:00
hufangzhou f651b8351d Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-11-26 10:59:29 +08:00
hufangzhou 5b0a2a341a * Finish task#8447. 2020-11-26 10:56:51 +08:00
z f161d4133b * code for task #8496. 2020-11-25 16:15:58 +08:00
z 880e182c06 * code for task #8496. 2020-11-25 16:15:58 +08:00
hufangzhou f198b6f0a6 * Finish task#8448. 2020-11-25 13:44:44 +08:00
leiyong 5ef321f149 * Adjust code logic. 2020-11-25 10:59:41 +08:00
Yagami 90446d239a * Merge code and finish task #8475. 2020-11-25 10:36:44 +08:00
Catouse 424193e084 * improve style of contextmenu in recentproject block. 2020-11-24 17:26:13 +08:00
Catouse 3d14cd6a52 * task #8506, change dropdown to context-dropdown and fix conflict of dropdown-menu with overflow style. 2020-11-24 17:11:06 +08:00
Catouse a5ccc8a6e9 * improve style of recentproject block. 2020-11-24 17:11:06 +08:00
Catouse c3c9994742 * fix drag-and-drop conflict when block content has panel-heading in dashbard page. 2020-11-24 17:11:06 +08:00
holan20180123 e9fcbe9c21 * Finish task #8507. 2020-11-24 14:11:09 +08:00
leiyong 94586714e6 * Finish task#8509. 2020-11-24 10:54:37 +08:00
holan20180123 40630c75a8 * Finish task #8451. 2020-11-24 09:05:28 +08:00
holan20180123 41b1d9931a * Finish task #8450. 2020-11-24 08:56:14 +08:00
hufangzhou 12d61dd780 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-11-23 16:23:50 +08:00
hufangzhou da1466c600 * Finish task#8444. 2020-11-23 16:23:44 +08:00
holan20180123 eabbb2fd3f * Finish task #8449. 2020-11-23 16:13:49 +08:00
leiyong 4051bc8353 * Adjust block module code. 2020-11-23 14:41:52 +08:00
holan20180123 f90a9dbe3d * Variable renaming 'project' to 'execution'. 2020-11-20 11:23:46 +08:00
leiyong d2d690fd12 * Adjust the block module language file. 2020-11-19 15:15:22 +08:00
holan20180123 d071fcae02 * Rename project to execution. 2020-11-19 14:27:29 +08:00
leiyong 72a2b18c20 * Adjust the block module language file and model.php Logic. 2020-11-19 14:07:58 +08:00
Yagami f2c6dba226 * Rename project function name. 2020-11-19 14:02:50 +08:00
Yagami aae58fea38 * Adjust code details. 2020-11-19 10:41:37 +08:00
leiyong e94ca07efe * Adjust code. 2020-11-17 17:36:20 +08:00
leiyong 03326e0d24 * Fix error. 2020-11-17 14:23:07 +08:00
leiyong 3cb8149563 * Finish task#8313. 2020-11-13 14:02:11 +08:00
leiyong e4dcf11d58 * Finish task#8340. 2020-11-12 09:48:18 +08:00
leiyong 579891b10e * Fix bug. 2020-11-06 11:48:29 +08:00
leiyong 0c1e2de9bc * Adjust code. 2020-11-05 11:48:18 +08:00
leiyong d325c15d42 * Adjust code. 2020-11-04 09:23:15 +08:00
leiyong ab57b31bb4 *Fix bug. 2020-11-03 14:48:50 +08:00
Yagami 5e6861d852 * Fix bugs. 2020-11-03 13:33:30 +08:00
leiyong 345413d23f * Add language file. 2020-11-02 14:20:00 +08:00
Yagami 18131e47ef * Fix bugs. 2020-11-02 10:09:40 +08:00
z 5644b81408 Merge branch '12.x' 2020-10-30 16:58:47 +08:00
Catouse 442ab248ba * fix refreshPanel not work as expected sometimes. 2020-10-23 11:02:54 +08:00
qiyu-xie fbdc9624fc * Fix bug#3549. 2020-10-10 09:11:48 +08:00
leiyong d066fef4e5 *Adjust code. 2020-09-29 08:31:27 +08:00
leiyong fd0a11a8b1 * Adjust code . 2020-09-28 17:24:55 +08:00
leiyong af733f65fb * Finish bug#3537. 2020-09-28 16:49:48 +08:00
Catouse 6b649c8fbc * task #7928, fix UI of waterfallprogress block. 2020-09-24 14:00:00 +08:00
Yagami dd48623aaa * Delete unused file and add new file. 2020-09-22 15:10:11 +08:00