Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
42,490 Commits 2 Branches 292 Tags
3cb2736d3be32bbbb6f1422ffddefcecaab718cd
Commit Graph
198 Commits
Author SHA1 Message Date
孙广明 b896377846 * Change zentao license. 2022-06-08 10:02:29 +08:00
孙广明 b528156589 * Change license. 2022-06-08 09:34:46 +08:00
宋辰轩 53c84c3480 * Delete /tmp/patch and patch actions after upgrade. 2022-05-26 17:10:33 +08:00
tianshujie f652d15c2f * Fix bug #22693. 2022-05-19 17:39:04 +08:00
wangyidong c04ec4db8f * fix for merge program when upgrade. 2022-05-12 13:46:57 +08:00
孙广明 3a7a46e836 Merge branch 'liyuchun_fixbug_15975' into 'master' 
* Fix bug #15975.

See merge request easycorp/zentaopms!3126
 2022-04-26 07:49:34 +00:00
liyuchun e8b57c9889 * Fix bug #17230. 2022-04-26 06:28:57 +00:00
wangyidong 668637fc18 * adjust for web page. 2022-04-25 15:20:05 +08:00
王怡栋 d78a7aeb2a Merge branch '165_package' 2022-04-08 13:55:52 +08:00
tanghucheng 6f8d2334fd * Fix upgrade vision for litevip. 2022-04-07 14:12:57 +08:00
孙广明 9065d0527e * Add upgrade logic. 2022-04-07 11:29:49 +08:00
tianshujie b2e99c8dd4 * Modify the jump link mode. 2022-04-02 10:37:43 +08:00
王怡栋 e051df4562 * fix for merge program. 2022-03-29 11:01:22 +08:00
王怡栋 fe91dc8481 Merge branch 'pailei2' 2022-03-22 09:01:03 +08:00
tianshujie 13102d5b80 * Modify the code logic. 2022-03-18 09:35:28 +08:00
tianshujie aadec120db * Delete encrypt module folder when upgrading. 2022-03-17 17:01:40 +08:00
sgm0422 ca5624db56 * Fix upgrade error. 2022-03-10 14:16:48 +08:00
tianshujie 2ef598afcc * Fix the problem of white screen after upgrade. 2022-03-02 09:35:34 +08:00
tianshujie 35dc1de44d * Fix code review issues. 2022-03-01 09:35:52 +08:00
孙广明 6b1c882cac * Fix upgrade lang. 2022-02-28 10:16:30 +08:00
tianshujie 941bba2658 * Modify the repeated upgrade problem. 2022-02-28 09:51:53 +08:00
tianshujie e1e2686493 * Modify the issue of feature review. 2022-02-23 16:56:22 +08:00
孙广明 7be1378030 Merge branch 'sprint/186/tianshujie_upgrade' into 'sprint/185' 
Sprint/186/tianshujie upgrade

See merge request easycorp/zentaopms!1912
 2022-02-23 06:17:37 +00:00
tianshujie 2d1c81a4fe * Modify the code format. 2022-02-23 13:42:54 +08:00
tianshujie 339f282210 * Added confirmation to view files page. 2022-02-23 11:07:21 +08:00
tianshujie 5a4cf04ed0 * Finish task #49459. 2022-02-23 09:29:40 +08:00
xieqiyu 4e1767b2df * Fix bug. 2022-02-22 17:08:09 +08:00
王怡栋 09aae17895 Merge branch 'upgrade' into 'sprint/185' 
Upgrade

See merge request easycorp/zentaopms!1880
 2022-02-22 07:09:14 +00:00
zhujinyong 408f8d4d91 * Move die to return. 2022-02-22 14:15:00 +08:00
tianshujie 9e85e74822 * Finish task #49459. 2022-02-21 17:22:34 +08:00
xieqiyu d5d09b1e93 * Code for task#46521. 2021-12-28 17:18:11 +08:00
孙广明 22ac002432 * Fix code error. 2021-12-06 13:59:36 +08:00
孙广明 9144c435bc * Fix bug #17068. 2021-12-03 13:49:57 +08:00
孙广明 fe3e96de2d * Fix bug #17051. 2021-12-03 09:46:58 +08:00
李玉春 392463cace Merge branch 'sprint/168_sgm_45161' into 'sprint/168' 
Sprint/168 sgm 45161

See merge request easycorp/zentaopms!641
 2021-11-30 05:16:08 +00:00
孙广明 19e08aafdc * Finish task #45161. 2021-11-29 10:29:56 +08:00
孙广明 8656350081 * Remove noproject merge method. 2021-11-25 15:28:54 +08:00
孙广明 182106be13 * Finish task #45153. 2021-11-25 15:14:10 +08:00
hufangzhou 5377de8a81 * Fix bug #15817. 2021-10-28 14:24:36 +08:00
hufangzhou cf3654bd0d * Modify the variable name. 2021-10-18 16:34:33 +08:00
hufangzhou 20fbf2436c * Modify the variable name. 2021-10-18 16:32:31 +08:00
hufangzhou 5691e39633 * Fix bug #15557. 2021-10-18 16:27:36 +08:00
tianshujie 264a20d583 * Fix bug #15516. 2021-10-14 10:47:07 +08:00
tianshujie 880c8893c8 * Fix bug #15484. 2021-10-13 15:11:26 +08:00
liyuchun e4ab2d8a80 * Fix bug #15245. 2021-09-18 11:19:12 +08:00
王怡栋 003f03589c * finish task #42159. 2021-09-02 16:47:50 +08:00
tianshujie 4d65433171 * Finish task #41607. 2021-08-27 08:34:16 +08:00
王怡栋 808932285c Merge branch '15.2' 2021-08-23 10:02:31 +08:00
wangyidong 509afaa6f7 * adjust upgrade. 2021-08-06 18:12:18 +08:00
tianshujie98 e246f4b2a1 * Title the merged repository page. 2021-08-06 08:30:05 +08:00