Commit Graph
133 Commits
Author SHA1 Message Date
lanzongjun d2cb9938b5 * Finish Task #79670 2022-12-12 17:34:43 +08:00
Yagami b70f00842f * Finish task #79462. 2022-12-12 10:01:40 +08:00
Yagami 55ea43c5aa Merge branch 'zentaopms_256' 2022-12-05 10:36:22 +08:00
孙广明 ff8f35fc49 Merge branch 'master' into 'tianshujie_lang'
# Conflicts:
#   module/project/lang/de.php
#   module/project/lang/en.php
#   module/project/lang/fr.php
2022-12-05 02:30:02 +00:00
lanzongjun a835220fe1 resolve conflict master 2022-12-02 10:28:31 +08:00
tianshujie facbb47832 * Modify long-term language items. 2022-12-02 10:01:53 +08:00
lanzongjun 59c7949f9a change copyproject to copyProject 2022-12-02 09:53:03 +08:00
lanzongjun 8e1172e955 fix cp project js error 2022-12-02 08:50:07 +08:00
孙广明 71f18cd3b3 Merge branch 'sprint/zentaopms256_lanzongjun' into 'zentaopms_256'
fix cp project js error

See merge request easycorp/zentaopms!6442
2022-12-01 07:42:25 +00:00
lanzongjun a13ae45bd1 fix cp project js error 2022-12-01 15:36:17 +08:00
Yagami cfc70e8176 * Code for task #77800. 2022-12-01 15:15:07 +08:00
Yagami 7a843ece37 * Code for task #77800. 2022-12-01 13:52:46 +08:00
Yagami e4a80e800d * Finish task #76953. 2022-11-22 14:27:38 +08:00
lanzongjun d07579f5eb * fix bug #29877#29878 2022-11-16 15:52:08 +08:00
Yagami 7da90a3b7b * Finish task #76106. 2022-11-15 09:12:11 +08:00
Yagami 8e481418df * Finish task #76107. 2022-11-14 16:20:32 +08:00
wangyidong 8ee88df5de Merge branch 'zentaopms_252' 2022-11-08 09:23:23 +08:00
wangyuting2 0cefde5d28 * Optimize code for review code. 2022-11-04 06:35:21 +00:00
daitingting cb90a2e25b * Finish task #74176. 2022-11-02 06:30:01 +00:00
Yagami bce03159e7 * Code for code review. 2022-10-27 16:22:09 +08:00
daitingting 4e9109c5a7 * Finish task #72756. 2022-10-27 05:11:55 +00:00
wangyidong 148d3d6d6b Merge branch 'master' into zentaopms_239 2022-10-27 11:39:47 +08:00
Yagami 1875b5be0e * Fix bug #73233. 2022-10-25 09:25:07 +08:00
Yagami c232ec7c7d * Code for task #73233. 2022-10-24 15:43:36 +08:00
daitingting 6948b02a8c * Finish task #71568. 2022-10-19 03:01:18 +00:00
wangyuting2 aa9bc2b8ec * Fix systemMode bug. 2022-10-10 07:32:11 +00:00
tianshujie 531f5d2cb8 * Finish task #71905. 2022-10-10 14:14:55 +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
wangjianhua 7edfc6d6c8 * Add lang item and fix codes format. 2022-10-09 09:43:57 +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
wangjianhua 04702a6139 * Finish task #70792: link project without product to code repository. 2022-09-30 14:20:19 +08:00
wangyidong a88cc7454d Merge branch 'sprint/zentaopms240' into zentaopms_239 2022-09-30 08:49:33 +08:00
wangyidong 1e928ed625 * code for task #70541. 2022-09-29 09:50:11 +08:00
wangyidong 2d42ff9e55 * code for task #70197. 2022-09-27 14:25:44 +08:00
daitingting f7d564e837 * Finish task #70200. 2022-09-26 09:38:11 +00:00
王怡栋 e5cad7fd7a Merge branch 'sprint/zentaopms240_lanzongjun' into 'sprint/zentaopms240'
* fix bug #27684#27607

See merge request easycorp/zentaopms!5460
2022-09-21 09:14:08 +00:00
wangyidong 6bb5b51ca8 * adjus for create story for no sprint project. 2022-09-21 16:41:39 +08:00
lanzongjun 222a65223f * fix meeting 2022-09-21 16:30:05 +08:00
lanzongjun 24f686b75a fix noSprint 2022-09-21 13:35:42 +08:00
lanzongjun 305e8cd794 * finish task #69698#69703#69704#69705 2022-09-20 08:58:41 +08:00
lanzongjun 49faebaad7 * task #69250#69251 2022-09-16 14:58:39 +08:00
liuruogu 04824e964b * Finish task #69016. 2022-09-15 05:12:30 +00:00
lanzongjun 2578a14d63 * task #69250 2022-09-15 10:45:05 +08:00
liuruogu 04cd8275fe * Finish task #69016. 2022-09-15 02:42:40 +00:00
liugang 4a7986fa00 * Add lang items of the hasProduct field of project. 2022-09-14 10:57:51 +08:00
wangyidong 249913cd5a * code for bug #68205. 2022-09-06 14:01:41 +08:00
tianshujie 915baa54b5 * Fix bug #26936. 2022-08-29 10:09:10 +08:00
tianshujie aa0f16c8e8 * Fix bug #26936. 2022-08-26 16:31:41 +08:00
dongli f3b8e63376 * Finsh task #64972,64973,64969. 2022-08-23 10:46:03 +00:00