Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
29,013 Commits 2 Branches 292 Tags
7d496eebc2438f3ef0530593adb679b44b4dbcbe
Commit Graph
29013 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
mayue 7d496eebc2 * Finish task #44493,44494. 2021-11-16 17:05:03 +08:00
孙广明 f18441ad73 Merge branch 'sprint/170_zhengrunyu_44498' into sprint/170 2021-11-16 13:47:49 +08:00
孙广明 102d718ecf Merge branch 'sprint/170' into 'sprint/170_zhengrunyu_44498' 
# Conflicts:
#   module/project/model.php
 2021-11-16 05:47:29 +00:00
zhengrunyu d5783e71b3 *Finish task #44498. 2021-11-16 13:43:05 +08:00
zhengrunyu a76ec95e69 *Finish task #44498. 2021-11-16 13:09:51 +08:00
李玉春 b74f5ab258 Merge branch 'sprint/170_zhouxin_43916' into 'sprint/170' 
Fix bug #43916.

See merge request easycorp/zentaopms!465
zentaopms_15.8.beta1_20211116 		2021-11-16 03:20:54 +00:00
zhouxin b521b7f6d0 Fix bug. 2021-11-16 11:19:02 +08:00
zhouxin dd5cf8c7bd Fix bug #43916. 2021-11-15 19:15:20 +08:00
李玉春 b0d992a335 Merge branch 'sprint/170_xieqiyu_16297' into 'sprint/170' 
* Fix bug#16297.

See merge request easycorp/zentaopms!463
 2021-11-15 08:53:43 +00:00
xieqiyu bdb5d1ee01 * Fix bug#16297. 2021-11-15 16:51:12 +08:00
李玉春 3342b38f9e Merge branch 'sprint/170_tianshujie_16303' into 'sprint/170' 
* Fix bug #16303.

See merge request easycorp/zentaopms!462
 2021-11-15 08:36:58 +00:00
tianshujie 432ffc6602 * Fix bug #16303. 2021-11-15 16:27:30 +08:00
李玉春 eee668f6d9 Merge branch 'sprint/170_tianshujie_16293' into 'sprint/170' 
* Fix bug #16293.

See merge request easycorp/zentaopms!461
 2021-11-15 08:18:02 +00:00
tianshujie b175a5057b * Fix bug #16293. 2021-11-15 16:13:51 +08:00
李玉春 8620758bfc Merge branch 'sprint/170_tianshujie_16304' into 'sprint/170' 
* Fix bug 16304.

See merge request easycorp/zentaopms!458
 2021-11-15 07:54:25 +00:00
tianshujie 4bc73b9223 * Fix bug 16304. 2021-11-15 15:49:00 +08:00
李玉春 152326a33e Merge branch 'sprint/170_songchenxuan_16297' into 'sprint/170' 
* Fix bug #16297

See merge request easycorp/zentaopms!457
 2021-11-15 07:09:54 +00:00
李玉春 182ab9a55b Merge branch 'sprint/170_tianshujie_16296' into 'sprint/170' 
* Fix bug #16296.

See merge request easycorp/zentaopms!455
 2021-11-15 06:47:26 +00:00
songchenxuan f77166bfb3 * Fix bug #16297 2021-11-15 14:47:13 +08:00
tianshujie f849667ce3 * Fix bug #16296. 2021-11-15 14:36:48 +08:00
李玉春 46ce0e09e8 Merge branch 'sprint/170_songchenxuan_bug' into 'sprint/170' 
* Product-Settings-Branch/platform-Language item

See merge request easycorp/zentaopms!454
 2021-11-15 05:46:24 +00:00
songchenxuan 73b5f5e057 * Product-Settings-Branch/platform-Language item 2021-11-15 13:44:26 +08:00
李玉春 878b22f8ca Merge branch 'sprint/170_songchenxuan_codeforbug' into 'sprint/170' 
* Product->Setting Language item modification.

See merge request easycorp/zentaopms!444
 2021-11-15 05:32:14 +00:00
李玉春 ba6a2cd512 Merge branch 'sprint/170_zhouxin_16209' into 'sprint/170' 
Fix bug #16209.

See merge request easycorp/zentaopms!452
 2021-11-15 05:23:45 +00:00
李玉春 1b2cf5ca09 Merge branch 'sprint/170_xieqiyu_upgrade' into 'sprint/170' 
Sprint/170 xieqiyu upgrade

See merge request easycorp/zentaopms!453
 2021-11-15 05:14:37 +00:00
xieqiyu f6884fd700 * Modify comment. 2021-11-15 13:09:42 +08:00
xieqiyu 55e0e9591b * Process branch and module when upgrade. 2021-11-15 13:07:07 +08:00
李玉春 a8523d317a Merge branch 'sprint/170_zhouxin_43916' into 'sprint/170' 
Finish task #43916.

See merge request easycorp/zentaopms!437
 2021-11-15 05:05:00 +00:00
songchenxuan de30e9216d * Product->Setting Language item modification. 2021-11-15 11:03:54 +08:00
songchenxuan 7cebe10e8d * Product->Setting Language item modification. 2021-11-15 10:55:24 +08:00
zhouxin ccb98adb41 Fix bug #16209. 2021-11-15 10:44:29 +08:00
zhouxin b5ab5a03d7 Finish task #43916. 2021-11-15 10:07:01 +08:00
李玉春 4719289333 Merge branch 'sprint/170_tianshujie_16248' into 'sprint/170' 
* Fix bug #16248.

See merge request easycorp/zentaopms!450
 2021-11-15 02:04:36 +00:00
tianshujie 17ee3c0980 * Fix bug #16248. 2021-11-15 09:55:18 +08:00
songchenxuan c2d3d4a24b * Product->Setting Language item modification. 2021-11-15 09:42:16 +08:00
李玉春 dbf8840697 Merge branch 'sprint/170_mayue_16223' into 'sprint/170' 
* Fix bug #16223.

See merge request easycorp/zentaopms!449
 2021-11-15 01:40:34 +00:00
李玉春 ca0f02be21 Merge branch 'sprint/170_hufangzhou_tree' into 'sprint/170' 
* Fix bug #16179.

See merge request easycorp/zentaopms!448
 2021-11-15 01:35:56 +00:00
hufangzhou 12054383a6 * Fix bug #16179. 2021-11-15 09:28:58 +08:00
mayue 92c5221f26 * Fix bug #16223. 2021-11-15 09:08:40 +08:00
李玉春 9e74d7204a Merge branch 'sprint/170_hufangzhou_tree' into 'sprint/170' 
* Fix the bugs.

See merge request easycorp/zentaopms!447
 2021-11-15 01:05:55 +00:00
李玉春 5ede27a2c6 Merge branch 'sprint/170_xieqiyu_16094' into 'sprint/170' 
* Fix bug#16094.

See merge request easycorp/zentaopms!445
 2021-11-15 01:04:47 +00:00
李玉春 6839a8e23c Merge branch 'sprint_xieqiyu_16188' into 'sprint/170' 
* Fix bug#16188.

See merge request easycorp/zentaopms!446
 2021-11-15 01:04:13 +00:00
hufangzhou e441e4a28d * Fix the bugs. 2021-11-15 08:50:05 +08:00
朱金勇 2adb14ae19 Merge branch 'sprint/170_sunhao/improve_pie_chart' into 'sprint/170' 
* Fix CanvasRenderingContext2D error when init progress-pie plugin.

See merge request easycorp/zentaopms!439
 2021-11-14 09:46:04 +00:00
xieqiyu a9ba1c9344 * Fix bug#16094. 2021-11-14 14:18:40 +08:00
xieqiyu cce14cef80 * Fix bug#16188. 2021-11-14 10:47:12 +08:00
mayue 3921075895 * Fix bug #16223. 2021-11-12 17:55:58 +08:00
songchenxuan 9ae77a2765 * Product->Setting Language item modification. 2021-11-12 15:54:10 +08:00
李玉春 8851c7878b Merge branch 'sprint/170_tianshujie_merge' into 'sprint/170' 
* Merge conflict.

See merge request easycorp/zentaopms!443
 2021-11-12 07:37:34 +00:00
tianshujie bc2560fd95 * Remove spaces. 2021-11-12 15:36:29 +08:00