Commit Graph
1107 Commits
Author SHA1 Message Date
tianshujie 2ef598afcc * Fix the problem of white screen after upgrade. 2022-03-02 09:35:34 +08:00
liumengyi fe98c033c7 * Remove empty line. 2022-03-01 10:41:11 +08:00
孙广明 bd01479b5a * Merge code. 2022-03-01 10:40:52 +08:00
王怡栋 2b08931a49 Merge branch 'sgm_fixbug' into 'master'
* Fix code detail.

See merge request easycorp/zentaopms!2016
2022-03-01 02:14:27 +00:00
孙广明 3a55c67a51 Merge branch 'sprint/186_tianshujie_optimize' into 'master'
* Fix code review issues.

See merge request easycorp/zentaopms!2019
2022-03-01 01:44:10 +00:00
tianshujie 35dc1de44d * Fix code review issues. 2022-03-01 09:35:52 +08:00
孙广明 4e3f46d87a * Fix code detail. 2022-03-01 08:34:06 +08:00
孙广明 04b8ba2360 * Rename var. 2022-03-01 08:26:01 +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
孙广明 ec16236bb5 * Fix upgrade bug. 2022-02-28 08:45:04 +08:00
孙广明 4f1ed945dc Merge branch 'sprint/186_tianshujie_20045' into 'sprint/185'
* Fix bug #20045.

See merge request easycorp/zentaopms!1978
2022-02-25 02:47:32 +00:00
tianshujie 9e9181ccfb * Fix bug #20045. 2022-02-25 10:44:53 +08:00
孙广明 583550ecb2 * Add pro version. 2022-02-25 10:31:39 +08:00
孙广明 fd9e6fb79d * Fix upgrade. 2022-02-25 09:28:16 +08:00
孙广明 3989ed849b * Add version. 2022-02-25 09:09:48 +08:00
孙广明 353e3bc11a * Add version. 2022-02-25 09:05:58 +08:00
tianshujie 30c5d7a991 * Modify the prompt page for deleting files。 2022-02-24 15:47:03 +08:00
孙广明 0fb9182101 * Fix bug. 2022-02-24 13:07:25 +08:00
孙广明 bde32fd381 * Refactor code. 2022-02-24 08:19:04 +08:00
孙广明 cca313c355 Merge branch 'sprint/186/tianshujie_upgrade' into 'sprint/185'
* Modify the issue of feature review.

See merge request easycorp/zentaopms!1925
2022-02-23 09:02:51 +00:00
tianshujie e1e2686493 * Modify the issue of feature review. 2022-02-23 16:56:22 +08:00
王怡栋 923741ca79 Merge branch 'sprint/185' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/185 2022-02-23 16:45:09 +08:00
zhujinyong 891b914fc9 * Format code. 2022-02-23 16:39:15 +08:00
孙广明 914a00e83a * Code for upgrade. 2022-02-23 16:35:36 +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 40fec08bb5 * Modify the load module path. 2022-02-23 14:08:25 +08:00
tianshujie 20fb3044d5 * Modify the code format. 2022-02-23 13:58:50 +08:00
tianshujie 2d1c81a4fe * Modify the code format. 2022-02-23 13:42:54 +08:00
tianshujie 90bd75ea02 * Modify the style of the migration files page. 2022-02-23 13:26:45 +08:00
tianshujie 85982b6cf0 * Modify the style of the migration files page. 2022-02-23 13:21:37 +08:00
liumengyi 103b9ca9c3 * Finish task #49661. 2022-02-23 11:31:11 +08:00
tianshujie 339f282210 * Added confirmation to view files page. 2022-02-23 11:07:21 +08:00
孙广明 2276e1430f * Code for upgrade. 2022-02-23 10:49:29 +08:00
孙广明 2d2270b477 * Code for upgrade. 2022-02-23 10:13:14 +08:00
liumengyi f0c6a6933c * Finish task #49661. 2022-02-23 09:37:52 +08:00
孙广明 88dd4ea767 * Code for upgrade. 2022-02-23 09:30:05 +08:00
tianshujie 5a4cf04ed0 * Finish task #49459. 2022-02-23 09:29:40 +08:00
王怡栋 09aae17895 Merge branch 'upgrade' into 'sprint/185'
Upgrade

See merge request easycorp/zentaopms!1880
2022-02-22 07:09:14 +00:00
孙广明 10679fa684 * Add upgrade. 2022-02-22 14:32:47 +08:00
tianshujie 7b83097539 * Modify query file logic. 2022-02-22 14:26:30 +08: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
zhangzilong fede832aa2 * Finish task #49284. 2022-02-18 14:00:53 +08:00
zhangzilong 504e7738b2 * Finish task #49284. 2022-02-18 13:56:17 +08:00
zhangzilong 0c4035711f * Finish task #49284. 2022-02-18 13:15:48 +08:00
zhangzilong 4e84e5cbd7 * Finish task #49284. 2022-02-17 17:35:11 +08:00
hufangzhou aaeeaf1743 * Add the new version. 2022-02-15 08:47:29 +08:00
李玉春 5520423d87 Merge branch 'tianshujie_bug_19046' into 'master'
* Fix bug #19046.

See merge request easycorp/zentaopms!1663
2022-01-27 02:43:47 +00:00
tianshujie 6ca88e549e * Fix bug #19046. 2022-01-27 10:25:44 +08:00