Commit Graph
51964 Commits
Author SHA1 Message Date
daitingting cacdb7bd63 * Format codes. 2023-03-10 01:25:12 +00:00
daitingting 5c0a882793 * Adjust database. 2023-03-10 01:24:14 +00:00
wangyuting2 7f67dc6608 * Upgrade to new goview. 2023-03-09 16:20:16 +08:00
qixinzhi 6bc74c2d09 * Update go-view dist. 2023-03-09 13:15:45 +08:00
wangyuting2 bdd9564fc4 * Fix bug #32677. 2023-03-09 10:51:50 +08:00
wangyuting2 f63da9390a * Fix bug #32683. 2023-03-07 16:59:01 +08:00
wangyuting2 152b7d656b * Upgrade to new goview. 2023-03-07 15:11:15 +08:00
wangyuting2 f5623142c7 * Upgrade to new goview. 2023-03-07 15:07:43 +08:00
wangyuting2 d14143c340 * Add new goview css. 2023-03-07 10:47:28 +08:00
qixinzhi b4e8de97e5 Merge branch 'master' into sprint/biz17 2023-03-06 09:04:52 +08:00
qixinzhi 0423e8e279 * Update goview. 2023-03-06 09:04:08 +08:00
Yagami f95691948a Merge branch 'zentaopms_294' 2023-03-06 08:37:11 +08:00
Yagami eebc016b4a * Remove unused code. 2023-03-03 15:18:41 +08:00
wangxuepeng f5699a3420 * Fix bug #85660. 2023-03-03 06:58:17 +00:00
wangyuting2 f0cff6cc1e * Upgrade to new goview. 2023-03-03 14:53:48 +08:00
wangxuepeng b611790d8c * Fix bug #85660. 2023-03-03 06:52:39 +00:00
wangyuting2 90ff15524d * Upgrade to new goview. 2023-03-03 14:41:54 +08:00
qixinzhi 239d8e9999 * Upgrade to new goview. 2023-03-03 14:23:42 +08:00
qixinzhi 2e3fccbbfc Merge branch 'sprint/biz17' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/biz17 2023-03-03 14:14:44 +08:00
qixinzhi 8c5a1ef766 * Fix view css file import. 2023-03-03 14:13:56 +08:00
wangyuting2 0420fdee09 * Upgrade to new goview. 2023-03-03 14:10:49 +08:00
liumengyi 7851944450 * Finish task #85640. 2023-03-03 03:19:04 +00:00
xieqiyu 640d36893c * Code for task of process dataset. 2023-03-03 11:12:01 +08:00
孙广明 9d3a52f0af Merge branch 'lyk_fixbug' into 'master'
* Fix bug #32374.

See merge request easycorp/zentaopms!7138
zentaopms_18.2
2023-03-03 02:15:41 +00:00
liuyongkai 10478231d8 * Fix bug #32374. 2023-03-03 10:11:06 +08:00
王怡栋 b80d37fcfb Merge branch 'daitingting_bug_postparentisempty' into 'master'
* Fix bug for the post parent is empty.

See merge request easycorp/zentaopms!7136
2023-03-03 02:03:05 +00:00
孙广明 dc2e0858af Merge branch 'lyk_fixbug' into 'master'
* Fix bug #32374.

See merge request easycorp/zentaopms!7137
2023-03-03 01:59:31 +00:00
Yagami 46661419f6 * Code for stage path. 2023-03-03 09:59:15 +08:00
liuyongkai c2bfa8c8ab * Fix bug #32374. 2023-03-03 09:56:31 +08:00
daitingting 6880b7428b * Fix bug for the post parent is empty. 2023-03-03 01:53:23 +00:00
wangyuting2 0717136489 * Upgrade to new goview. 2023-03-03 09:39:33 +08:00
孙广明 6c22d36b40 Merge branch 'lyk_fixbug_32374' into 'master'
* Fix bug #32374.

See merge request easycorp/zentaopms!7135
2023-03-02 12:19:37 +00:00
Yagami 1ce1a24f1d * Fix execution-stage list bug. 2023-03-02 17:40:47 +08:00
liuyongkai 846129297d * Fix bug #32374. 2023-03-02 17:32:47 +08:00
liuyongkai bc54729fff * Fix bug #32374. 2023-03-02 17:27:44 +08:00
王怡栋 179d3998f2 Merge branch 'dev/gfl_views_refacotrs_admin' into 'master'
* Adjust code in admin.

See merge request easycorp/zentaopms!7133
2023-03-02 09:08:27 +00:00
王怡栋 2534dd97e4 Merge branch 'admin_bug_32593' into 'master'
Admin bug 32593

See merge request easycorp/zentaopms!7134
2023-03-02 09:08:12 +00:00
caoyanyi 58d9fd2ee9 * Fix bug #32593. 2023-03-02 17:04:44 +08:00
郭飞龙 95184b53a3 * Adjust code in control.php. 2023-03-02 09:00:04 +00:00
guofeilong f1c5c8c82c * Adjust code in admin. 2023-03-02 16:58:42 +08:00
wangyidong d693d5884c * fix bug #32431. 2023-03-02 16:20:40 +08:00
孙广明 067461a66d Merge branch 'fixbug_liumengyi_32592' into 'master'
* Fix bug 32592 32603.

See merge request easycorp/zentaopms!7132
2023-03-02 08:09:44 +00:00
Yagami e8ae96f563 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2023-03-02 16:06:17 +08:00
Yagami fda9efd09c * Remove request stages in bug batch-create page. 2023-03-02 16:05:35 +08:00
wangyidong 3935b86775 * fix bug #32306. 2023-03-02 16:01:53 +08:00
wangxuepeng 843d2898fa * Fix bug #85660. 2023-03-02 07:57:13 +00:00
liumengyi 285dcf409b * Fix bug #32513. 2023-03-02 07:56:48 +00:00
liumengyi fc44446224 * Fix bug #32603. 2023-03-02 07:49:41 +00:00
liumengyi 17bc1bfacc * Fix bug #32592. 2023-03-02 07:47:56 +00:00
zhujinyong baedeadce7 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2023-03-02 15:39:19 +08:00