Commit Graph
333 Commits
Author SHA1 Message Date
Yagami 225189e217 * Fix details. 2020-11-02 13:22:57 +08:00
leiyong 680c880b5a * Fix bug. 2020-10-30 17:32:19 +08:00
z 5644b81408 Merge branch '12.x' 2020-10-30 16:58:47 +08:00
leiyong 5002be3199 * Modify whitelist related logic. 2020-10-27 13:10:54 +08:00
leiyong aff516e659 * Project add whitelist function. 2020-10-26 14:38:41 +08:00
leiyong 969b52508c * Product add white list function. 2020-10-26 13:04:56 +08:00
leiyong c0f44f6465 * Adding a white list. 2020-10-25 17:30:41 +08:00
Yagami d6b59ef125 * Fix bugs. 2020-10-21 16:01:39 +08:00
leiyong 6af8ff9971 * modulePageActions is modified to TRActions. 2020-10-21 09:17:33 +08:00
leiyong c1e6e6a82c modulePageActions is modified to TRActions. 2020-10-21 09:11:19 +08:00
Yagami c9ea9c7d2e * Meger code. 2020-10-13 16:56:13 +08:00
holan20180123 7f49f1f614 * Finish task #8085. 2020-10-12 15:49:46 +08:00
holan20180123 b849999023 Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x 2020-10-10 16:57:05 +08:00
holan20180123 02eb03583d * Finish task #8085. 2020-10-10 16:56:36 +08:00
leiyong 81d9b1de5d * Finish task#8059. 2020-10-09 17:42:15 +08:00
leiyong b60e13adff * Finish task#8076. 2020-09-30 14:16:17 +08:00
leiyong 036ccf82f5 * Finish task#7864. 2020-09-28 14:14:28 +08:00
Yagami abd35a44c5 * Fix sql and add branch menu. 2020-09-28 10:51:12 +08:00
holan20180123 fd6f9f5ac9 * Finish task #7951. 2020-09-28 10:46:14 +08:00
holan20180123 ed523a1442 * Finish task #7951. Fix bug 3369. 2020-09-28 08:54:14 +08:00
leiyong 475c058ee1 * Adjust product batch editing. 2020-09-24 11:21:18 +08:00
leiyong c43960d7c3 * Adjust product list width. 2020-09-24 10:08:29 +08:00
Yagami d9e57180de * Add group. 2020-09-23 17:21:30 +08:00
Yagami 1b9c6b0e98 * Merge code. 2020-09-23 14:54:16 +08:00
holan20180123 4b1c0ced7b * Finish task #7932. Fix bug #3422. 2020-09-23 13:55:32 +08:00
leiyong ab6ea6f7e0 * Project add sort. 2020-09-23 13:27:18 +08:00
holan20180123 d85d370800 * Finish task #7932. Fix bug #3422. 2020-09-23 13:27:08 +08:00
Yagami a95a72b579 * Fix product lang. 2020-09-23 10:27:49 +08:00
leiyong dcede98789 * Modify product list sort. 2020-09-22 16:19:34 +08:00
Yagami 73b9a880cb * Fix common menu. 2020-09-22 16:12:08 +08:00
Yagami c1d1d71eaf * Add menu active. 2020-09-22 15:45:07 +08:00
leiyong 24cbde3b3d * Add a productlist method. 2020-09-22 15:09:15 +08:00
leiyong c8d2c5957d * Delete invalid method under product. 2020-09-22 09:46:46 +08:00
qiyu-xie bd93c680fa * Change lowercase to uppercase. 2020-09-22 08:52:24 +08:00
Yagami 3cb892fc4e * Fix product menu. 2020-09-21 16:45:06 +08:00
leiyong 484490eaa5 * Add zdata to the database script automatically. 2020-09-16 14:13:59 +08:00
Yagami 66f4f5403a * Fix sql and rename program to PRJ. 2020-09-16 11:28:55 +08:00
Yagami 11bc9076ac * Code for task #7825. 2020-09-07 14:18:32 +08:00
leiyong 47642ededd * Adjust URAndSR Judgment condition. 2020-09-02 23:26:46 +08:00
holan20180123 7a661001da * Finish task #7758. 2020-08-31 14:57:44 +08:00
holan20180123 1062033526 * Finish Task #7711. 2020-08-27 13:42:16 +08:00
Yagami b72a7dee43 Merge branch 'master' into 20.x 2020-08-26 16:10:36 +08:00
Catouse 79c2decff2 * task #7660, add UI for cmmigantt block. 2020-08-25 15:52:13 +08:00
Yagami ad619c4909 * Code for story and requirement. 2020-08-25 11:09:42 +08:00
Yagami 5639a2a7f1 * Fix details. 2020-08-19 08:30:12 +08:00
z 4acf8e3990 * finish task #7603,7603. 2020-08-07 15:14:20 +08:00
tianshujie98 548b5655b0 Merge branch 'master' of github.com:easysoft/zentaopms 2020-08-05 17:22:22 +08:00
tianshujie98 a99aab00ea *Finish task #7587. 2020-08-05 17:04:47 +08:00
z a748df7c3c * code for task #7600. 2020-08-04 14:05:41 +08:00
leiyong edf7d6448b * Fix bug,task#7549. 2020-07-27 03:29:59 -07:00