Commit Graph
45909 Commits
Author SHA1 Message Date
wangyidong cd92d5bc1b * code for task #71604. 2022-10-09 10:45:23 +08:00
liyuchun 8196e36134 Merge branch 'zentaopms_239_wangjianhua_70793' into zentaopms_239 2022-10-09 10:25:39 +08:00
李玉春 ffc0440271 Merge branch 'zentaopms_239' into 'zentaopms_239_wangjianhua_70793'
# Conflicts:
#   module/project/lang/de.php
#   module/project/lang/en.php
#   module/project/lang/fr.php
#   module/project/lang/zh-cn.php
2022-10-09 02:25:26 +00:00
wangyidong 96f993d108 * code for task #71603. 2022-10-09 10:04:38 +08:00
liugang 973583b14d * Fix bug #28277. 2022-10-09 10:01:45 +08:00
liugang 3b0a126ab0 * Fix bug #28273. 2022-10-09 09:44:47 +08:00
wangjianhua 7edfc6d6c8 * Add lang item and fix codes format. 2022-10-09 09:43:57 +08:00
liugang d65fb0321c * Fix bug #28279. 2022-10-09 09:35:32 +08:00
wangyidong bd2f3df6af * code for task #71602. 2022-10-09 09:24:04 +08:00
wangyidong 13cf3070a1 * code for task #71601. 2022-10-09 09:16:07 +08:00
wangyidong e3658d178f * code for task #71601. 2022-10-09 09:04:06 +08:00
wangyidong 91b8e84e13 * code for task #71601. 2022-10-09 08:35:06 +08:00
wangyidong 260a32bfad * fix bug for change project in 1.5 menu. 2022-10-09 08:23:26 +08:00
sunguangming 7efbb7d6ca * Fix bug #28227. 2022-10-08 17:02:01 +08:00
sunguangming 6a0665a1c4 * Fix bug #28235. 2022-10-08 16:28:38 +08:00
liugang 9afece1385 * Fix bug #27892. 2022-10-08 15:55:18 +08:00
liugang ce0b20e2ef * Fix bug 27892 - activate or close the shadow product of a project. 2022-10-08 15:45:31 +08:00
liugang f0aec63a7c * Add a function to activate a product. 2022-10-08 15:33:59 +08:00
liugang 65e0211cc8 * Remove useless codes. 2022-10-08 15:30:37 +08:00
sunguangming 1670e654c9 * Fix bug #28267. 2022-10-08 13:36:47 +08:00
sunguangming 7b2af7a523 * Fix bug #28245. 2022-10-08 13:25:30 +08:00
sunguangming 783e03d722 * Fix bug #28246. 2022-10-08 13:17:34 +08:00
sunguangming bd32930628 * Fix bug #28247. 2022-10-08 13:02:54 +08:00
李玉春 bd8b7243dc Merge branch 'zentaopms_239_wangjianhua_70790' into 'zentaopms_239'
* Fix bug #28255.

See merge request easycorp/zentaopms!5661
2022-10-08 03:09:03 +00:00
liugang 55483c6fcb * Fix bug #27611. 2022-10-08 10:50:11 +08:00
sunguangming 22955353b1 * Fix bug #28249. 2022-10-08 10:39:06 +08:00
sunguangming d8db81e009 * Fix bug #28249. 2022-10-08 10:28:16 +08:00
liugang d325519d52 * Fix bug #27903. 2022-10-08 09:51:11 +08:00
sunguangming bdf73ff038 * Fix bug #28140. 2022-10-08 08:52:01 +08:00
王 于听 4e47aa431c Merge branch 'zentaopms_239_wangyuting' into 'zentaopms_239'
* Optimize code.

See merge request easycorp/zentaopms!5665
2022-10-08 00:34:56 +00:00
wangyuting2 a3b9b7bb52 * Optimize code. 2022-10-08 00:34:06 +00:00
wangjianhua 75cd31c905 * Fix bug #28255. 2022-09-30 15:46:14 +08:00
wangjianhua 804cf64783 * Improve css and js of manage repo page. 2022-09-30 15:01:31 +08:00
王怡栋 a445dc463b Merge branch 'zentaopms_239_wangyuting' into 'zentaopms_239'
* Optimize code.

See merge request easycorp/zentaopms!5650
2022-09-30 06:28:00 +00:00
wangyidong 9b403e8b64 * fix bug #28075. 2022-09-30 14:20:53 +08:00
wangjianhua 04702a6139 * Finish task #70792: link project without product to code repository. 2022-09-30 14:20:19 +08:00
wangyidong 50c3315428 * fix bug #28250. 2022-09-30 14:10:22 +08:00
wangyuting2 606ea74471 * Optimize code. 2022-09-30 05:52:05 +00:00
liugang 1645dbd263 * Fix bug #27896,27898. 2022-09-30 13:48:12 +08:00
liugang 7311802c2c * Fix bug of call undefined property. 2022-09-30 13:47:07 +08:00
wangyidong acc7774419 * adjust for manage members and products for no multiple project. 2022-09-30 13:23:22 +08:00
王怡栋 7a0fc238bf Merge branch 'sprint/daitingting_check_edition' into 'zentaopms_239'
* Count assetlib if edition is max.

See merge request easycorp/zentaopms!5644
2022-09-30 03:25:00 +00:00
daitingting 7ba36be668 * Count assetlib if edition is max. 2022-09-30 03:21:09 +00:00
刘刚 245bba1eb7 Merge branch 'zentaopms_239_tanghucheng' into 'zentaopms_239'
* Task#70756 Reduction shadow product.

See merge request easycorp/zentaopms!5640
2022-09-30 02:39:14 +00:00
liugang e1540a49ff * Fix bug. 2022-09-30 10:21:59 +08:00
liugang b288745d89 * Add the projectplan module to the whitelist. 2022-09-30 10:21:27 +08:00
tanghucheng f6bb08d1e2 * Task#70756 Reduction shadow product. 2022-09-30 10:18:25 +08:00
liugang 0c11f5b232 * Optimize. 2022-09-30 09:36:41 +08:00
wangyidong d300ee00da Merge branch 'master' into zentaopms_239 2022-09-30 09:07:53 +08:00
wangyidong daa0ea847c * rename update sql to 18.0. 2022-09-30 08:51:22 +08:00