Commit Graph
45891 Commits
Author SHA1 Message Date
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
王怡栋 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
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
wangyidong a88cc7454d Merge branch 'sprint/zentaopms240' into zentaopms_239 2022-09-30 08:49:33 +08:00
wangyidong 94e12f2c0a Merge branch 'sprint/zentaopms240' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/zentaopms240 2022-09-30 08:31:56 +08:00
王怡栋 8e28c42e0f Merge branch 'bug_28011' into 'master'
* Fix bug#28011

See merge request easycorp/zentaopms!5617
2022-09-30 00:30:17 +00:00
王怡栋 d278c0be48 Merge branch 'master_xieqiyu_27008' into 'master'
* Fix bug#27008.

See merge request easycorp/zentaopms!5628
2022-09-30 00:29:46 +00:00
王怡栋 846ee00dd2 Merge branch 'master_xieqiyu_27048' into 'master'
* Fix bug#27048.

See merge request easycorp/zentaopms!5626
2022-09-30 00:29:21 +00:00
王怡栋 f0be075cfe Merge branch 'master_xieqiyu_27125' into 'master'
* Fix bug#27125.

See merge request easycorp/zentaopms!5624
2022-09-30 00:29:03 +00:00
liugang 6b014b187b * Fix bug of edit bug. 2022-09-30 08:28:41 +08:00
王怡栋 e9d7dea3e5 Merge branch 'master_xieqiyu_28107' into 'master'
* Fix bug#28107.

See merge request easycorp/zentaopms!5621
2022-09-30 00:28:10 +00:00
王怡栋 fb0ef6c81d Merge branch 'sprint/zentaopms240_bug#27928' into 'sprint/zentaopms240'
* Fix bug #27928.

See merge request easycorp/zentaopms!5623
2022-09-30 00:27:24 +00:00
王怡栋 eec861592f Merge branch 'sprint/zentaopms240_bug#28147' into 'sprint/zentaopms240'
* Fix bug #28147.

See merge request easycorp/zentaopms!5616
2022-09-30 00:26:15 +00:00
王 于听 1802012184 Merge branch 'sprint/zentaopms240_bug#28182' into 'sprint/zentaopms240'
* Fix bug # 28182.

See merge request easycorp/zentaopms!5630
2022-09-29 09:18:45 +00:00
wangyuting2 e438c9f3ab * Fix bug # 28182. 2022-09-29 09:17:45 +00:00
孙广明 85e5d5c0a8 Merge branch 'sprint/244_tianshujie_70494' into 'master'
Sprint/244 tianshujie 70494

See merge request easycorp/zentaopms!5627
2022-09-29 09:17:37 +00:00
sunguangming ad826bf92b * Fix bug #28202. 2022-09-29 17:14:02 +08:00
sunguangming 7c59e436e4 * Fix bug #28204. 2022-09-29 17:06:30 +08:00
tianshujie d2568442eb * Finish task #70494. 2022-09-29 16:54:35 +08:00
李玉春 fc09ce2d86 Merge branch 'sprint/wzm/28207' into 'master'
* Fix bug #28207

See merge request easycorp/zentaopms!5618
2022-09-29 08:49:47 +00:00
xieqiyu bc0aba20b9 * Fix bug#27008. 2022-09-29 08:42:57 +00:00