Commit Graph
54 Commits
Author SHA1 Message Date
李玉春 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
lichengjun fdb1aa702f * Adjust branch view manage code. 2021-09-14 03:32:20 +00:00
lichengjun 0dc8bcf781 * Add the back button. 2021-09-14 03:18:39 +00:00
lichengjun 4bc78961be * Fix bug id15128. 2021-09-13 07:36:33 +00:00
Catouse 4b0c06412d * fix search-list style in dropMenu. 2021-04-12 16:39:51 +08:00
hufangzhou b8138c41cc * Fix bug #11953. 2021-04-12 10:27:45 +08:00
hufangzhou 7528daadd1 * Fix bug #11952. 2021-04-12 09:31:13 +08:00
leiyong 4f2775d77a * Adjust the projectstory module. 2020-11-26 13:10:08 +08:00
wangyidong 1148ff0f7c * finish task #4892. 2018-09-19 16:00:38 +08:00
滔哥 0b83fffbe0 * Finished task#4854 2018-09-19 07:41:28 +08:00
daitingting 0056609d9c * Adjust button style. 2018-05-16 17:44:42 +08:00
wangyidong f1db15d15b * adjust for branch manage page. 2018-04-18 13:14:07 +08:00
wangyidong d3e861e212 * adjust for release page. 2018-04-18 11:54:37 +08:00
wangyidong eec949396e * adjust for ajaxgetdropmenu. 2018-04-04 16:39:21 +08:00
wangyidong 9d16d860c9 * finish task #3761. 2018-04-03 17:03:49 +08:00
wangyidong 48432b3e41 Merge branch 'master' of github.com:easysoft/zentaopms 2017-03-21 15:08:51 +08:00
wangyidong dc812fd161 * adjust code. 2017-03-21 15:06:38 +08:00
wangyidong f3f18a3401 * finish task #2761,2732. 2016-11-21 17:02:44 +08:00
wangyidong 625a21684b * fix bug #915. 2016-10-28 11:16:32 +08:00
wangyidong 97c2c1b7db * adjust for manage branch. 2016-05-23 16:27:50 +08:00
wangyidong 4cf14c3e43 Merge branch 'master' of github.com:easysoft/zentaopms 2015-11-10 10:56:35 +08:00
wangyidong a0c97d7e01 * adjust for branch name by product name. 2015-11-10 10:55:34 +08:00
chenfeiCF 6b92b40e4c * remove back button for manage method of branch. 2015-11-09 15:10:48 +08:00