Commit Graph
99 Commits
Author SHA1 Message Date
xieqiyu 74c1b31476 * Fix bug#16051. 2021-11-08 16:37:19 +08:00
xieqiyu b483b28d80 * Conflict resolution. 2021-11-08 14:18:57 +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
李玉春 9fe54a903c Merge branch 'sprint/170' into 'sprint/170_hufangzhou_43891_new'
# Conflicts:
#   module/branch/control.php
2021-11-08 05:53:39 +00:00
xieqiyu 866c7adc75 * Code for task#43902. 2021-11-08 13:53:16 +08:00
xieqiyu c15b6e7e61 * Code for task#43902. 2021-11-08 13:36:43 +08:00
李玉春 c65c9b2384 Merge branch 'sprint/170_tianshujie_43893' into 'sprint/170'
* Finish task #43893.

See merge request easycorp/zentaopms!325
2021-11-08 01:36:37 +00:00
tianshujie c5779575c1 * Modify code logic. 2021-11-08 09:29:45 +08:00
xieqiyu acf5b15c06 * Code for task#43902. 2021-11-08 09:20:57 +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
xieqiyu 988bb5c774 * Code for task#44028. 2021-11-05 17:25:27 +08:00
tianshujie 77da777064 * Finish task #43893. 2021-11-05 15:46:52 +08:00
胡方舟 21cd984c78 Merge branch 'sprint/170' into 'sprint/170_xieqiyu_43919'
# Conflicts:
#   db/zentao.sql
2021-11-05 06:56:47 +00: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
tianshujie fcfa4a9064 * Add all options in the branch drop-down. 2021-11-05 09:25:47 +08:00
tianshujie 6cb70ab01d * Finish task #43903. 2021-11-05 08:59:55 +08:00
xieqiyu d74ce66445 * Code for task#43919. 2021-11-05 08:45:34 +08:00
qiyu-xie c9ee925c65 * When execution manage products, make the normal product without 'has-branch' class. 2021-07-20 08:24:19 +08:00
Yagami fbd2d87db8 * Verify branch name. 2021-06-16 16:01:57 +08:00
wangyidong 769e6b433b * merge from 15.0.beta3. 2021-06-05 13:01:53 +08:00
holan20180123 39a273978c * Fix task #36447. 2021-03-12 15:01:08 +08:00
leiyong 4f2775d77a * Adjust the projectstory module. 2020-11-26 13:10:08 +08:00
wangyidong 7dc69e1f83 * code for htmlspecialchars_decode branch name. 2020-05-15 11:21:06 +08:00
wangyidong 630c2a87e7 * get all branch for workflowdatasource. 2019-11-07 11:29:29 +08:00
wangyidong 17b53acaa9 * finish task #6161. 2019-07-30 15:38:49 +08:00
jinianlan c90aac3512 * finish task #6166,#6149,6139 2019-07-29 15:54:08 +08:00
wangyidong 2671f7a044 * finish task #6090. 2019-07-15 15:56:31 +08:00
wangyidong 3b54364860 * code for task #5673. 2019-06-11 08:20:49 +08:00
wangyidong e825abcc97 * finish task #5410. 2019-04-26 13:59:45 +08:00
daitingting cb6495a63a * When creating a project with plan, multi-platform product need to display option of all platform if there is no platform. 2018-07-13 14:01:42 +08:00
wangyidong 02a5b86697 * adjust for ux. 2018-06-22 16:20:37 +08:00
wangyidong 886153a0db * adjust for delete branch. 2018-03-20 13:11:53 +08:00
chenfeiCF cefe16af35 * finish task #2782. 2016-11-24 14:18:15 +08:00
wangyidong f3f18a3401 * finish task #2761,2732. 2016-11-21 17:02:44 +08:00
wangyidong 9d4733dc2a * fix bug #872. 2016-10-28 14:40:53 +08:00
wangyidong a0d475720b * fix error. 2016-01-05 15:22:04 +08:00
wangyidong 2d61ca8d34 * change zh-tw. 2015-11-13 10:55:50 +08:00
wangyidong 45fb1f0c92 * finish task #2380,2389,2390. 2015-11-11 11:07:59 +08:00
wangyidong 273bf0a237 * finish task #2378,2379,2381. 2015-11-10 17:12:33 +08:00
wangyidong a0c97d7e01 * adjust for branch name by product name. 2015-11-10 10:55:34 +08:00
wangyidong 015401d1e0 * change zpl 1.1 to 1.2. 2015-11-05 14:09:52 +08:00
wangyidong b65a72e141 * change code and add notice. 2015-11-03 16:05:40 +08:00
wangyidong e1d907628c * finish task #2346 2347 2348. 2015-10-28 14:33:06 +08:00
wangyidong c4bd3be15d * code for task #2353. 2015-10-26 14:40:49 +08:00
wangyidong 66af5e5183 * finish task #2344. 2015-10-26 09:35:22 +08:00
wangyidong 9ad38472fc * finish task #2336,2337,2338,2339. 2015-10-20 10:11:46 +08:00