Commit Graph
100 Commits
Author SHA1 Message Date
hufangzhou 73394d0435 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-13 18:20:52 +08:00
hufangzhou a4db5380eb * Finish task #40000. 2021-07-13 18:20:48 +08:00
hufangzhou b76d6f2b3e Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-13 15:49:27 +08:00
hufangzhou fd4b4f3b35 * Adjust the font color in drop menu. 2021-07-13 15:49:23 +08:00
hufangzhou 51eb6980c1 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-13 14:23:03 +08:00
hufangzhou 7626959450 * Adjust the label background color. 2021-07-13 14:22:59 +08:00
hufangzhou d11e847832 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-13 14:11:37 +08:00
hufangzhou 09b2caf838 * Adjust the project order in project drop menu. 2021-07-13 14:11:32 +08:00
hufangzhou dafebe5d95 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-13 13:33:34 +08:00
hufangzhou e007087966 * Finish task #39999. 2021-07-13 13:33:14 +08:00
hufangzhou 230193cbf4 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-13 10:16:19 +08:00
hufangzhou f30d5627d5 * Task #39998: Adjust the tab active in project drop menu. 2021-07-13 10:16:05 +08:00
hufangzhou 28744fa822 * Finish task #39998. 2021-07-12 16:04:48 +08:00
hufangzhou 34a35d4c80 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-12 13:11:48 +08:00
hufangzhou b996d2556d * Task#39998: Adjust the project counts style. 2021-07-12 13:11:44 +08:00
hufangzhou 504b448e3c * Adjust the code. 2021-07-09 15:27:58 +08:00
hufangzhou 5ee795330e Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-06-18 09:25:54 +08:00
hufangzhou b7caec933d * Adjust the code. 2021-06-18 09:25:50 +08:00
hufangzhou db2212743b * Finish task #39452. 2021-06-18 08:05:38 +08:00
hufangzhou 23206c4ea8 * Finish task #39453. 2021-06-17 17:43:56 +08:00
hufangzhou b09234b272 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-06-16 17:26:06 +08:00
hufangzhou 0dd6c819a9 * Adjust the code. 2021-06-16 17:26:01 +08:00
hufangzhou 69538f2cb7 * Adjust the source select control width in batch create page. 2021-06-16 17:12:25 +08:00
hufangzhou 387899f28e Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-06-16 15:05:21 +08:00
hufangzhou 8a5d9c8bb5 * Adjust the code. 2021-06-16 15:05:18 +08:00
hufangzhou 1f9f3a9d17 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-06-11 15:34:38 +08:00
hufangzhou 48353b2897 * Finish task #39093. 2021-06-11 15:34:31 +08:00
hufangzhou e4023e6b99 * Adjust the code. 2021-06-09 11:47:22 +08:00
hufangzhou f67ee188dc * Fix bug #13004. 2021-06-07 14:26:03 +08:00
hufangzhou fedd2ddc87 Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0 2021-06-07 12:26:32 +08:00
hufangzhou 0942d6a4f7 * Adjust the code. 2021-06-07 12:26:28 +08:00
hufangzhou 3f7d702a82 * Fix bug #13066. 2021-06-05 18:32:13 +08:00
hufangzhou fcf1d669d7 * Revert the changed code of task #38644. 2021-06-05 18:14:44 +08:00
hufangzhou 778c8c79eb Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-06-05 15:26:36 +08:00
hufangzhou bc207f4700 * Finish task #38900. 2021-06-05 15:26:26 +08:00
hufangzhou f4f0e83f28 * Fix a bug. 2021-06-05 00:57:02 +08:00
hufangzhou 0b25ff55bd * Finish task #38895. 2021-06-05 00:43:20 +08:00
hufangzhou b3d33fd10f Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-06-04 23:54:10 +08:00
hufangzhou dd4999de53 * Finish task #38896. 2021-06-04 23:54:03 +08:00
hufangzhou cf74e5728c Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-06-04 22:22:13 +08:00
hufangzhou b645d23e55 * Finish task #38923. 2021-06-04 22:22:07 +08:00
hufangzhou fc473ab743 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-06-04 22:15:03 +08:00
hufangzhou 15ee092857 * Finish task #38925. 2021-06-04 22:14:54 +08:00
hufangzhou d83af0420d * Finish task #38898. 2021-06-04 17:28:48 +08:00
hufangzhou 7c1e69e3e0 * Finish task #38901, task #38899. 2021-06-04 17:25:07 +08:00
hufangzhou fdb263a4f2 * Adjust the code. 2021-06-04 08:03:02 +08:00
hufangzhou 2ad0a9319a Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-06-03 09:29:28 +08:00
hufangzhou 0537771b0f * Add getbyid method testcase of gapanalysis module. 2021-06-03 09:29:24 +08:00
hufangzhou cf6dfd8a3f Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-06-02 17:31:20 +08:00
hufangzhou f4947017f4 * Adjust the code. 2021-06-02 17:31:15 +08:00
hufangzhou 82014234d4 * Adjust the status and stage of story when batch create in project or execution module. 2021-06-02 13:19:21 +08:00
hufangzhou e18e065a59 * Fix a bug. 2021-06-02 11:40:57 +08:00
hufangzhou c21ce93554 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-06-02 10:47:31 +08:00
hufangzhou d7d324f78f * Fix bug #12840. 2021-06-02 10:47:26 +08:00
hufangzhou f0f36ee496 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-06-01 16:16:12 +08:00
hufangzhou f98e23cf15 * Fix bug #12837. 2021-06-01 16:16:08 +08:00
hufangzhou 2840c4007e Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-06-01 15:55:23 +08:00
hufangzhou 59f09a1fb5 * Fix bug #12836. 2021-06-01 15:55:19 +08:00
hufangzhou ec8ff5d72d Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-06-01 15:29:19 +08:00
hufangzhou 7456301e30 * Fix bug #12482. 2021-06-01 15:29:15 +08:00
hufangzhou 7c9125b779 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-06-01 14:25:08 +08:00
hufangzhou 970dd000e2 * Fix bug #12720. 2021-06-01 14:25:03 +08:00
hufangzhou 014a2152e2 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-06-01 13:06:42 +08:00
hufangzhou 42374c2c84 * Fix an error. 2021-06-01 13:06:35 +08:00
hufangzhou 8667b83f17 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-06-01 11:05:38 +08:00
hufangzhou f7cc368902 * Finish task #38636. 2021-06-01 11:05:28 +08:00
hufangzhou fae8fb6bb0 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-06-01 10:53:53 +08:00
hufangzhou 9fb469a9ac * Add the language item. 2021-06-01 10:53:49 +08:00
hufangzhou 5d2a13673c Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-06-01 09:29:35 +08:00
hufangzhou b0291eeba4 * Fix bug #38644. 2021-06-01 09:29:30 +08:00
hufangzhou 23dd18af7e Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-05-31 11:03:30 +08:00
hufangzhou 31b10ab2ac * Fix a bug. 2021-05-31 11:03:26 +08:00
hufangzhou f2a4de0a42 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-05-31 10:22:13 +08:00
hufangzhou 2384e37658 Adjust the code. 2021-05-31 10:22:08 +08:00
hufangzhou 3bc71badd7 * Adjust the code. 2021-05-28 15:43:40 +08:00
hufangzhou dabb26abbf Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-05-28 11:34:21 +08:00
hufangzhou 2c5347622f * Adjust the code. 2021-05-28 11:34:16 +08:00
hufangzhou 5553c101e6 * Finish task #38393. 2021-05-28 10:21:46 +08:00
hufangzhou 2670d1840e * Add the trainplanList session. 2021-05-28 09:16:52 +08:00
hufangzhou 1441f64b63 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-05-27 17:50:49 +08:00
hufangzhou ac6cabfeca * Add the lang items. 2021-05-27 17:50:45 +08:00
hufangzhou adc77673d9 * Fix bug #12786. 2021-05-25 08:58:40 +08:00
hufangzhou 0751031d0a Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-05-24 17:02:48 +08:00
hufangzhou 2d39d6e69d * Fix bug #12789, bug #12788. 2021-05-24 17:02:41 +08:00
hufangzhou 97d582a859 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-05-24 13:06:49 +08:00
hufangzhou d2688a7eab * Fix bug #12784, bug #12783. 2021-05-24 13:06:44 +08:00
hufangzhou 16ffbd5b44 * Fix bug #12782. 2021-05-24 12:03:53 +08:00
hufangzhou 1c7573cbef * Fix bug #12780. 2021-05-24 11:36:45 +08:00
hufangzhou b978d2967c Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-05-24 11:10:43 +08:00
hufangzhou 9376551b52 * Do not allow remove the reviewer who has been reviewed when edit the story. 2021-05-24 11:10:38 +08:00
hufangzhou 772a358c46 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-05-24 09:30:18 +08:00
hufangzhou e9eb91aebe * Adjust the code. 2021-05-24 09:30:14 +08:00
hufangzhou d4d96d6478 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-05-21 17:23:30 +08:00
hufangzhou f477c9f4f7 * Fix bug #12785. 2021-05-21 17:23:24 +08:00
hufangzhou 265d38cf7e * Fix a bug. 2021-05-21 16:16:09 +08:00
hufangzhou ab8a03d6d4 * Fix an error. 2021-05-21 16:00:06 +08:00
hufangzhou 2e81e60f55 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-05-21 15:44:00 +08:00
hufangzhou b221f21a42 * Fix bug #12774. 2021-05-21 15:43:56 +08:00
hufangzhou 01ce722fbe Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-05-21 14:14:31 +08:00
hufangzhou cb624d49bd * Fix bug #12669. 2021-05-21 14:14:27 +08:00