Commit Graph
256 Commits
Author SHA1 Message Date
daitingting 208cf519ca * Format codes. 2023-11-10 07:35:22 +00:00
daitingting 5b98c8c9c3 * Format codes. 2023-11-10 01:47:05 +00:00
liumengyi 4577951786 * Change return to locate. 2023-10-25 08:53:50 +08:00
liumengyi c7f4be90f7 * Move upgrade code from 18.x. 2023-10-23 16:40:31 +08:00
zhouxin 33c11e079c * Add method for test old measurement. 2023-09-05 10:11:00 +08:00
wangyuting 0b4a034adb * Finish mergeprogram. 2023-08-16 10:26:13 +08:00
wangyuting 18e03cd6d8 * Optimize mergeprogram.ui.js. 2023-08-09 17:18:14 +08:00
liumengyi d867baae00 * Refactor ui of upgrade::afterExec. 2023-08-03 16:01:29 +08:00
wangyuting ba2f673a53 * Finish renameobject zin page on upgrade module. 2023-08-03 14:54:06 +08:00
liumengyi a0736309a1 * Refactor ui of upgrade::mergeRepo. 2023-08-03 11:26:32 +08:00
wangyuting b6186e2f32 * Finish checkextension zin page on upgrade. 2023-08-03 11:15:36 +08:00
liumengyi 5b98f7a317 * Refactor ui of upgrade::selectMergeMode. 2023-08-03 09:02:33 +08:00
liumengyi cbaf17ed1b * Fix incorrect title. 2023-08-02 13:24:42 +08:00
朱金勇 e636eaf108 - Remove array('' => '') for select. 2023-07-12 04:15:29 +00:00
liugang b58cda66db - Remove unused code: $this->view->position. 2023-05-22 14:43:26 +08:00
hufangzhou 4e05ed02ed * Finish task #91015. 2023-04-11 15:31:58 +08:00
田淑杰 3bcbe37b8f * Fix bug #33074. 2023-03-17 15:21:31 +08:00
tianshujie 5c84a44f0d * Fix bug 31232. 2023-03-10 09:42:07 +08:00
hufangzhou f3cd2e7d4d * Change the Easy Soft to ZenTao Software. 2023-02-15 17:01:22 +08:00
daitingting a2aa5c325a * Fix bug #30020. 2022-11-25 07:36:53 +00:00
王怡栋 647547faac * fix for upgrade. 2022-11-25 15:13:23 +08:00
wangyuting 84f9b7b36a * Fix bug #30193. 2022-11-24 02:12:02 +00:00
daitingting 8b35153a3c * Fix bug #30104. 2022-11-23 02:42:41 +00:00
daitingting 3750be48c5 * Finish task #77143. 2022-11-22 08:17:17 +00:00
daitingting cb90a2e25b * Finish task #74176. 2022-11-02 06:30:01 +00:00
wangyuting2 64b22cb464 * Fix bug. 2022-09-29 08:04:53 +00:00
daitingting 20a5b36a9d * Disable features when upgrade from classic to lean. 2022-09-28 06:35:07 +00:00
wangyuting2 23abb36523 * Disable features during upgrade and installation. 2022-09-27 06:29:55 +00:00
daitingting dc8b4f4ccd * Optimize codes. 2022-09-27 05:19:40 +00:00
daitingting 799ec7aeeb * Finish task 70572. 2022-09-27 03:19:27 +00:00
daitingting f7d564e837 * Finish task #70200. 2022-09-26 09:38:11 +00:00
lanzongjun a478be994f * fix bug #27792 2022-09-23 10:12:14 +08:00
wangyuting2 e5976d126c * Optimize lang file. 2022-09-22 02:42:36 +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
lanzongjun 222a65223f * fix meeting 2022-09-21 16:30:05 +08:00
wangyuting2 75771bafd2 * Fix bug #27656. 2022-09-21 05:50:44 +00:00
lanzongjun 7bc2071cc7 Merge branch 'sprint/zentaopms240' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/zentaopms240_lanzongjun 2022-09-21 08:40:34 +08:00
lanzongjun 7fd743aef6 * fix upgrade selectmode 2022-09-21 08:39:35 +08:00
王怡栋 47d0b6e08a Merge branch 'sprint/zentaopms240_lanzongjun' into 'sprint/zentaopms240'
* finish task #69706

See merge request easycorp/zentaopms!5429
2022-09-20 08:34:01 +00:00
lanzongjun 701e75324b Merge branch 'sprint/zentaopms240' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/zentaopms240_lanzongjun 2022-09-20 15:39:47 +08:00
lanzongjun d3cec62717 * finish task #69706 2022-09-20 15:38:00 +08:00
wangyuting2 f546d9a1a6 * Fix back button bug. 2022-09-20 07:30:13 +00:00
wangyuting2 4134b15aa5 * Optimize mergeprogram css. 2022-09-20 06:53:18 +00:00
wangyuting2 fbde75c48b * Fix default program bug. 2022-09-20 00:28:31 +00:00
王怡栋 92ae907e16 Merge branch 'sprint/zentaopms240_wangyuting' into 'sprint/zentaopms240'
* Optimize code.

See merge request easycorp/zentaopms!5394
2022-09-19 06:15:08 +00:00
wangyuting2 12c566a9ab * Optimize code. 2022-09-19 05:42:06 +00:00
王怡栋 4aafe0c67d Merge branch 'sprint/zentaopms240_processconflict' into 'sprint/zentaopms240'
* Process conflict.

See merge request easycorp/zentaopms!5382
2022-09-19 05:34:15 +00:00
lanzongjun bd59282401 modify upgrade 2022-09-19 13:13:12 +08:00
daitingting 86c7dc5061 * Process conflict.
* Call classic2Lean function when upgrade from classic of 15.
2022-09-16 09:01:08 +00:00
wangyidong 6b541a7c60 Merge branch 'sprint/zentaopms240_lanzongjun' into sprint/zentaopms240 2022-09-16 16:26:29 +08:00