Commit Graph
76 Commits
Author SHA1 Message Date
孙广明 b896377846 * Change zentao license. 2022-06-08 10:02:29 +08:00
孙广明 b528156589 * Change license. 2022-06-08 09:34:46 +08:00
hufangzhou 9b6857a689 * Fix bug #17933. 2022-04-19 15:47:26 +08:00
孙华伟 fb57638d07 *Hide change default branch feature. 2022-04-11 13:47:26 +08:00
mayue db41ae487b * Fix bug #17360. 2022-04-01 09:15:57 +08:00
mayue ba263d1b90 * Fix bug #17342. 2022-03-31 14:14:36 +08:00
hufangzhou 897f930f48 * Adjust the merge branch page style. 2021-12-23 14:01:25 +08:00
hufangzhou e1075ca205 * Finish task #46096. 2021-12-23 11:29:51 +08:00
hufangzhou 872a8b2bbd * Finish task #46096. 2021-12-21 14:30:38 +08:00
xieqiyu b67911b304 * Pass the data of the merged branch. 2021-12-16 17:19:25 +08:00
xieqiyu b300ca39da * Change branch language for manage. 2021-12-16 11:09:02 +08:00
hufangzhou f02ca7df03 * Code for task #45756. 2021-12-15 08:40:25 +08:00
hufangzhou 6eeaa44aa0 * Fix bug #17077. 2021-12-06 08:58:58 +08:00
xieqiyu 3755502cf5 * Fix bug : Unit test product drop-down error. 2021-12-02 09:12:50 +08:00
hufangzhou 0965e74d0e * Finish task #45085. Fix bug #16792. 2021-11-29 13:19:55 +08:00
songchenxuan 9be4ee136f * Fix bug #16560. 2021-11-23 15:35:21 +08:00
zhouxin b8783ecd5c Fix bug 16408. 2021-11-18 17:32:02 +08:00
孙广明 66dd543027 Merge branch 'sprint/170_zhengrunyu_44597' into 'sprint/170'
*Finish task #44597.

See merge request easycorp/zentaopms!492
2021-11-18 00:58:13 +00:00
zhengrunyu 36d7e664e6 *Finish task #44597. 2021-11-17 16:20:54 +08:00
songchenxuan 73b5f5e057 * Product-Settings-Branch/platform-Language item 2021-11-15 13:44:26 +08:00
songchenxuan 7cebe10e8d * Product->Setting Language item modification. 2021-11-15 10:55:24 +08:00
songchenxuan 9ae77a2765 * Product->Setting Language item modification. 2021-11-12 15:54:10 +08:00
李玉春 62e5231ec2 Merge branch 'sprint/170_xieqiyu' into 'sprint/170'
Sprint/170 xieqiyu

See merge request easycorp/zentaopms!385
2021-11-11 01:38:37 +00:00
xieqiyu 48a32457d8 * Add space. 2021-11-11 08:41:00 +08:00
hufangzhou 98ec568b0f * Fix bug #16140. 2021-11-10 14:48:09 +08:00
xieqiyu 8d9aebb855 * Fix bug#16142. 2021-11-10 14:29:32 +08:00
xieqiyu 089238bd79 * Modify review questions. 2021-11-10 12:26:55 +08:00
xieqiyu 820fbef7b4 * Hidden merge button. 2021-11-10 10:09:46 +08:00
xieqiyu 36b8752cdd * Fix a bug. 2021-11-10 10:03:10 +08:00
hufangzhou a80cdfd6ec Merge branch 'sprint/170_xieqiyu_43920' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/170_xieqiyu_43920 2021-11-10 09:49:31 +08:00
hufangzhou 9fa76f6912 * Modify the action of main branch. 2021-11-10 09:49:29 +08:00
xieqiyu 4f90b186ea * Fix a bug: batch edit main branch error. 2021-11-10 09:37:59 +08:00
xieqiyu 76651524d9 * Add order. 2021-11-09 20:10:07 +08:00
xieqiyu 0a3dc10f4a * Finish task#43905. 2021-11-09 19:46:08 +08:00
hufangzhou c14d00e710 * Code for task #43898. 2021-11-09 19:23:51 +08:00
hufangzhou 9f77cc6fb6 * Finish task #43898. 2021-11-09 17:16:30 +08:00
xieqiyu d889184204 * Finish task#43920. 2021-11-09 16:17:15 +08:00
xieqiyu 74c1b31476 * Fix bug#16051. 2021-11-08 16:37:19 +08:00
李玉春 7692460500 Merge branch 'sprint/170_xieqiyu_44028' into 'sprint/170'
Finish task#44028.

See merge request easycorp/zentaopms!327
2021-11-08 06:08:31 +00:00
xieqiyu c15b6e7e61 * Code for task#43902. 2021-11-08 13:36:43 +08:00
qiyu-xie f22b3ea149 * Code for task#43902. 2021-11-07 18:12:57 +08:00
qiyu-xie f94e0ecb08 * Code for task#44028. 2021-11-07 16:05:02 +08:00
qiyu-xie 8f902ccf2d * Code fot task#44028. 2021-11-07 13:44:24 +08:00
hufangzhou d279c5d7d7 * Finish task #43891. 2021-11-05 18:47:39 +08:00
xieqiyu 988bb5c774 * Code for task#44028. 2021-11-05 17:25:27 +08:00
xieqiyu f7d99dd38c * Add lang item. 2021-11-05 15:37:08 +08:00
xieqiyu 7992f18ea3 * Code for task#43919. Modify review questions. 2021-11-05 14:50:15 +08:00
xieqiyu 8b7616a626 * Code for task#43919. Add lang and main default. 2021-11-05 13:48:09 +08:00
xieqiyu d74ce66445 * Code for task#43919. 2021-11-05 08:45:34 +08:00
chenfeiCF 746b7c85a7 * Fix bug #15173. 2021-09-14 12:54:42 +00:00