Commit Graph
2098 Commits
Author SHA1 Message Date
Yagami b3e27f70b3 * Mv milestone to qc. 2020-08-27 11:17:22 +08:00
leiyong be892d8966 * Finish task#7703. 2020-08-27 08:52:37 +08:00
Yagami b72a7dee43 Merge branch 'master' into 20.x 2020-08-26 16:10:36 +08:00
Yagami d6cb4f1d75 * Fix menu order. 2020-08-26 11:30:06 +08:00
Yagami ed353f7ebd * Fix en menu. 2020-08-26 09:47:58 +08:00
Yagami 77cf55dd79 * Fix system menu header. 2020-08-26 09:23:01 +08:00
Yagami 58c0bc19a0 * Fix menu. 2020-08-25 16:37:42 +08:00
Yagami 3603ff2623 * Add story and requirement. 2020-08-24 16:33:37 +08:00
leiyong a39e00876e * Merger code. 2020-08-20 11:13:07 +08:00
Yagami 06e0452d78 * Code for program index. 2020-08-19 14:51:57 +08:00
Yagami a86cb31895 * Add holiday and fix project and product menu. 2020-08-19 10:58:29 +08:00
Yagami 5639a2a7f1 * Fix details. 2020-08-19 08:30:12 +08:00
Yagami bfd9f8e5d1 * Code for task #7625. 2020-08-18 14:36:39 +08:00
Yagami 3965976022 * Code for task #7632. 2020-08-17 15:31:44 +08:00
holan20180123 5ab40d872f * Move programplan from qc to zentaopms. 2020-08-17 13:50:12 +08:00
Yagami 96cd6f5e6e * Fix common. 2020-08-17 10:14:42 +08:00
holan20180123 b877163ef3 * Fix bug #3358. 2020-08-17 09:22:33 +08:00
Yagami 89eb2e6f34 * Code for qc. 2020-08-14 11:13:53 +08:00
Yagami ba50010878 * Fix main menu. 2020-08-12 15:45:56 +08:00
z b1cd0ed599 * code for task #7600. 2020-08-06 13:36:41 +08:00
Catouse c2b35db7d1 * fix picker undefined error in some pages without import picker js. 2020-08-06 10:48:30 +08:00
Yagami 8b6579d4b2 * Fix common menu. 2020-08-05 15:45:26 +08:00
Yagami 7105e4cba5 * Fix menu order. 2020-08-05 14:08:12 +08:00
Yagami 7c172bfcc2 * Fix common menu. 2020-08-05 14:02:51 +08:00
Yagami d8ed76cff2 * Fix menu. 2020-08-05 13:42:59 +08:00
Yagami 1be49bb204 * Add menu. 2020-08-05 13:37:40 +08:00
leiyong dc446c8225 Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x 2020-08-04 22:12:19 -07:00
leiyong b94f0e499f * Add menu. 2020-08-04 22:11:46 -07:00
Yagami 3f5b97b526 Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x 2020-08-05 13:08:31 +08:00
Yagami f45dd79989 * Add stakeholder. 2020-08-05 13:08:14 +08:00
leiyong a25ac36e61 Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x 2020-08-04 22:06:47 -07:00
leiyong 9cdb8ec0f8 * Adjust menu. 2020-08-04 22:05:14 -07:00
Yagami 683112acc6 * Fix common lang. 2020-08-05 11:27:05 +08:00
Yagami 575a430356 * Fix common menu and program list. 2020-08-05 11:15:26 +08:00
Yagami 15849794ec * Fix common lang menu. 2020-08-05 09:44:19 +08:00
z a748df7c3c * code for task #7600. 2020-08-04 14:05:41 +08:00
z 9a17e562d8 * merge fr lang. 2020-08-03 10:14:25 +08:00
z 277ed6ca46 * fix dev-api and change zh-tw lang. 2020-07-28 08:42:29 +08:00
Yagami d417a026f6 * Fix menu link. 2020-07-27 15:58:08 +08:00
Catouse 7d1f51118f * task #7372, bug #3196, fix datatable line height in firefox. 2020-07-27 10:24:44 +08:00
Yagami 50d7645c96 * Fix menu. 2020-07-27 10:07:09 +08:00
tianshujie98 94f98fa13a * Finish task #7536,7557,7558. 2020-07-27 10:05:11 +08:00
z cb7931251b * finish task #7535. 2020-07-27 09:29:31 +08:00
z 4502545269 * revert datatable tr height. 2020-07-27 09:15:41 +08:00
z 9b835f13fd * finish task #7534. 2020-07-24 20:57:32 +08:00
z 480b7df59d * finish task #7533. 2020-07-24 20:41:06 +08:00
Catouse 11f71b3cf4 * fix table setting button now show after hot refresh table. 2020-07-24 09:30:35 +08:00
leiyong 809da4766b * Fix menu. 2020-07-23 01:22:17 -07:00
z be145c47e6 Merge branch 'master' of github.com:easysoft/zentaopms 2020-07-23 13:02:53 +08:00
Catouse 38a7d60b21 * task #7414, bug #3095, fix file manager not work on upload images in kindeditor. 2020-07-23 11:08:25 +08:00