Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
54,257 Commits 2 Branches 292 Tags
44794fcd431baef6935ea7dd2ee365bdefa3bb7d
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
王怡栋 86c1dc4280 Merge branch 'fix_bug_qxz' into 'master' 
* Fix bug#33386.

See merge request easycorp/zentaopms!7480
 2023-04-19 07:51:27 +00:00
王怡栋 78b5c4e16f Merge branch 'goview' into 'master' 
* Update go-view dist.

See merge request easycorp/zentaopms!7479
 2023-04-19 07:51:06 +00:00
王怡栋 01c8d5d893 Merge branch 'tsj_fixbug' into 'master' 
Tsj fixbug

See merge request easycorp/zentaopms!7474
 2023-04-19 07:49:35 +00:00
王怡栋 cd2c399484 Merge branch 'dev/gfl_fixbug' into 'master' 
Dev/gfl fixbug

See merge request easycorp/zentaopms!7477
 2023-04-19 07:28:52 +00:00
wangyidong 4e05f5d566 * fix bug. 2023-04-19 15:15:25 +08:00
wangyidong d9e21d706a * fix bug #34362,34365,34361. 2023-04-19 14:50:43 +08:00
王怡栋 200a0c6635 Merge branch 'fixbug/liumengyi_20185' into 'master' 
* Fix bug #20185.

See merge request easycorp/zentaopms!7473
 2023-04-19 05:59:52 +00:00
wangyidong 7659babe92 * fix bug #34364. 2023-04-19 13:55:17 +08:00
王怡栋 5d56042091 Merge branch 'cyy_fixbug' into 'master' 
* Modify book doc type.

See merge request easycorp/zentaopms!7468
 2023-04-19 05:34:00 +00:00
王怡栋 1af597ef22 Merge branch 'tsj_fixbug' into 'master' 
Tsj fixbug

See merge request easycorp/zentaopms!7465
 2023-04-19 05:33:42 +00:00
wangyidong 506b786a33 * fix bug #34367. 2023-04-19 11:20:44 +08:00
wangyidong 17c3ba6b68 * fix bug. 2023-04-19 10:08:38 +08:00
wangyidong 64ee5c7625 * code for remove empty data in block. 2023-04-19 09:44:24 +08:00
王怡栋 e3b14714fb Merge branch 'cyy_fixbug' into 'master' 
* Modify catalog sort.

See merge request easycorp/zentaopms!7463
 2023-04-19 00:58:43 +00:00
王怡栋 a2eddc80bc Merge branch 'dev/gfl_zentaopms_307' into 'master' 
* Code for task #91380 .

See merge request easycorp/zentaopms!7464
 2023-04-19 00:56:21 +00:00
wangyidong dffb74c07d * code for task #91381. 2023-04-18 17:35:22 +08:00
王怡栋 a88eaaeace Merge branch 'dev/gfl_zentaopms_307' into 'master' 
* Adjust code for task #91379 .

See merge request easycorp/zentaopms!7462
 2023-04-18 09:13:54 +00:00
王怡栋 0af66d19bb Merge branch 'fixbug/liumengyi_33143' into 'master' 
* Fix bug #33143.

See merge request easycorp/zentaopms!7460
 2023-04-18 09:13:07 +00:00
王怡栋 3c85d5aac3 Merge branch 'cyy_fixbug' into 'master' 
Cyy fixbug

See merge request easycorp/zentaopms!7457
 2023-04-18 09:12:42 +00:00
wangyidong d9f382b101 * fix bug for delete api in api view. 2023-04-18 17:10:39 +08:00
wangyidong 39138ca85b * fix bug. 2023-04-18 15:23:36 +08:00
王怡栋 a3648f0ec5 Merge branch 'goview' into 'master' 
* Updata go-view dist.

See merge request easycorp/zentaopms!7455
 2023-04-18 06:45:02 +00:00
王怡栋 248d0c30f3 Merge branch 'cyy_fixbug' into 'master' 
* Modify unlink file.

See merge request easycorp/zentaopms!7454
 2023-04-18 06:44:42 +00:00
王怡栋 6c74871804 Merge branch 'tsj_fixbug' into 'master' 
Tsj fixbug

See merge request easycorp/zentaopms!7453
 2023-04-18 06:43:52 +00:00
王怡栋 dc1b7fa857 Merge branch 'dev/gfl_zentaopms_307' into 'master' 
Dev/gfl zentaopms 307

See merge request easycorp/zentaopms!7456
 2023-04-18 06:42:52 +00:00
王怡栋 f79c5063a4 Merge branch 'fixbug/liumengyi_33917' into 'master' 
* Fix bug #33917.

See merge request easycorp/zentaopms!7452
 2023-04-18 05:50:39 +00:00
王怡栋 70a1625a13 Merge branch 'cyy_fixbug' into 'master' 
* Fix bug #34288, Modify bottom height.

See merge request easycorp/zentaopms!7450
 2023-04-18 05:49:05 +00:00
wangyidong dcc3fd9331 * fix bug #34278. 2023-04-18 13:33:09 +08:00
wangyidong 0d31625643 * code for task #91388. 2023-04-18 13:05:14 +08:00
王怡栋 05217c63e9 Merge branch 'tsj_sort' into 'master' 
Tsj sort

See merge request easycorp/zentaopms!7448
 2023-04-18 02:44:57 +00:00
王怡栋 af4d04889c Merge branch 'fixbug/liumengyi_34022' into 'master' 
* Fix bug #34022, #34028.

See merge request easycorp/zentaopms!7446
 2023-04-18 02:41:41 +00:00
王怡栋 29f2ba65e3 Merge branch 'cyy_fixbug' into 'master' 
* Fix bug #34293,34299.

See merge request easycorp/zentaopms!7444
 2023-04-18 02:41:20 +00:00
王怡栋 46aea7bf9e Merge branch 'dev/gfl_zentaopms_307' into 'master' 
* Code for task #91379 .

See merge request easycorp/zentaopms!7449
 2023-04-18 02:41:01 +00:00
wangyidong 0ef2c25165 * fix bug. 2023-04-18 09:16:34 +08:00
wangyidong b97eb01ace Merge branch 'tsj_fixbug' 2023-04-18 08:26:25 +08:00
王怡栋 d78cb60d48 Merge branch 'master' into 'tsj_fixbug' 
# Conflicts:
#   module/doc/model.php
#   module/group/lang/resource.php
 2023-04-18 00:25:53 +00:00
王怡栋 7399979c28 Merge branch 'sprint/scx_bug34275' into 'master' 
* Fix bug #34275.

See merge request easycorp/zentaopms!7442
 2023-04-18 00:24:26 +00:00
wangyidong fed027e5a7 * fix bug. 2023-04-17 17:39:42 +08:00
wangyidong 5399ec46be * code for task #91381. 2023-04-17 17:14:56 +08:00
王怡栋 cf9d4348ab Merge branch 'tsj_sort' into 'master' 
Tsj sort

See merge request easycorp/zentaopms!7440
 2023-04-17 08:42:15 +00:00
王怡栋 7eb325f6a9 Merge branch 'dev/gfl_zentaopms_307' into 'master' 
Dev/gfl zentaopms 307

See merge request easycorp/zentaopms!7439
 2023-04-17 08:02:41 +00:00
王怡栋 da0259927a Merge branch 'goview' into 'master' 
* Updata go-view dist.

See merge request easycorp/zentaopms!7438
 2023-04-17 07:34:54 +00:00
王怡栋 dd33c54395 Merge branch 'sprint/scx_addUpdate2BI_func' into 'master' 
Add func for update18_3.

See merge request easycorp/zentaopms!7436
 2023-04-17 07:34:35 +00:00
王怡栋 c976249f68 Merge branch 'jenkins_test' into 'master' 
Jenkins ui

See merge request easycorp/zentaopms!7435
 2023-04-17 07:34:01 +00:00
王怡栋 0dc041fbcf Merge branch 'dyl_fixbug' into 'master' 
* fix upload files totalSize.

See merge request easycorp/zentaopms!7437
 2023-04-17 07:32:37 +00:00
王怡栋 ae2d8120ae Merge branch 'cyy_fixbug' into 'master' 
Cyy fixbug

See merge request easycorp/zentaopms!7433
 2023-04-17 06:23:03 +00:00
王怡栋 e5583f34ee Merge branch 'tsj_view' into 'master' 
* Code for task #91378.

See merge request easycorp/zentaopms!7430
 2023-04-17 06:22:31 +00:00
王怡栋 d776871aca Merge branch 'tsj_block' into 'master' 
Tsj block

See merge request easycorp/zentaopms!7428
 2023-04-14 09:31:50 +00:00
王怡栋 9a79eb42e4 Merge branch 'dev/gfl_zentaopms_305' into 'master' 
* Adjust code for css in tree-item .

See merge request easycorp/zentaopms!7426
 2023-04-14 09:21:53 +00:00
王怡栋 317a7ee205 Merge branch 'sprint/scx_task91131' into 'master' 
* Finish task #91131.

See merge request easycorp/zentaopms!7427
 2023-04-14 09:21:39 +00:00
王怡栋 537833366d Merge branch 'dev/gfl_zentaopms_305' into 'master' 
* Adjust code for css in right menu .

See merge request easycorp/zentaopms!7425
 2023-04-14 08:48:15 +00:00
王怡栋 85aeb533b4 Merge branch 'cyy_fixbug' into 'master' 
* Add collections for doc view.

See merge request easycorp/zentaopms!7424
 2023-04-14 08:19:12 +00:00
wangyidong e5ff2093cb * code for change collector field to collects. 2023-04-14 16:14:42 +08:00
王怡栋 ecd6e5a511 Merge branch 'dev/gfl_zentaopms_305' into 'master' 
* Adjust code for bug #34193.

See merge request easycorp/zentaopms!7423
 2023-04-14 08:12:51 +00:00
wangyidong 6f2d0db971 * fix for convert collector in upgrade. 2023-04-14 15:57:23 +08:00
王怡栋 368fbe6f57 Merge branch 'cyy_fixbug' into 'master' 
* Add edited by me doc list.

See merge request easycorp/zentaopms!7421
 2023-04-14 07:49:35 +00:00
王怡栋 2ba0b5cef3 Merge branch 'dev/gfl_zentaopms_305' into 'master' 
Dev/gfl zentaopms 305

See merge request easycorp/zentaopms!7422
 2023-04-14 07:48:44 +00:00
wangyidong 53983dffef * fix bug #32976. 2023-04-14 14:37:20 +08:00
王怡栋 db3e7c2b70 Merge branch 'dev/gfl_addIcon' into 'master' 
* ZUI: update icon files .

See merge request easycorp/zentaopms!7420
 2023-04-14 06:31:00 +00:00
王怡栋 600b9c4949 Merge branch 'cyy_fixbug' into 'master' 
Cyy fixbug

See merge request easycorp/zentaopms!7410
 2023-04-14 06:30:31 +00:00
wangyidong f7a5d31793 Merge branch 'tsj_issue' 2023-04-14 14:29:47 +08:00
王怡栋 d4eee84a04 Merge branch 'master' into 'tsj_issue' 
# Conflicts:
#   module/doc/css/common.css
 2023-04-14 06:29:28 +00:00
王怡栋 65e15bbf25 Merge branch 'tsj_task' into 'master' 
Tsj task

See merge request easycorp/zentaopms!7419
 2023-04-14 06:27:52 +00:00
王怡栋 2c4f45ffcc Merge branch 'dev/gfl_zentaopms_305' into 'master' 
* Adjust code for bug #34164 .

See merge request easycorp/zentaopms!7417
 2023-04-14 02:48:57 +00:00
王怡栋 2edd5bc5e8 Merge branch 'dev/gfl_zentaopms_305' into 'master' 
* Code for task #34163 .

See merge request easycorp/zentaopms!7416
 2023-04-14 02:36:08 +00:00
王怡栋 f58a67cfc3 Merge branch 'dev/gfl_zentaopms_305' into 'master' 
Dev/gfl zentaopms 305

See merge request easycorp/zentaopms!7415
 2023-04-14 02:29:23 +00:00
wangyidong bcd61687c6 * fix bug for style. 2023-04-14 10:25:56 +08:00
王怡栋 739a26440c Merge branch 'dev/gfl_zentaopms_305' into 'master' 
* Adjust code for css in docDetail .

See merge request easycorp/zentaopms!7407
 2023-04-14 02:07:49 +00:00
wangyidong 2380df4a49 * remove default save path. 2023-04-14 09:52:51 +08:00
wangyidong 3ee191bd66 * remove save path when create doc. 2023-04-14 09:49:57 +08:00
wangyidong 44db4dd94f * code for doc sidebarHeader. 2023-04-14 09:35:20 +08:00
wangyidong ed0f4c3d0e * fix bug #32088. 2023-04-14 09:27:16 +08:00
wangyidong c5681e0433 * code for issue #767. 2023-04-14 09:10:00 +08:00
王怡栋 78aded1bcc Merge branch 'dev/gfl_zentaopms_305' into 'master' 
- Delete code for crumbs in docDetail .

See merge request easycorp/zentaopms!7406
 2023-04-14 00:52:09 +00:00
wangyidong da5a823a86 * code for issue #773. 2023-04-13 17:15:15 +08:00
wangyidong 2c8af4f674 Merge branch 'tsj_task' 2023-04-13 17:03:34 +08:00
王怡栋 e6be417612 Merge branch 'master' into 'tsj_task' 
# Conflicts:
#   module/doc/view/lefttree.html.php
 2023-04-13 09:03:14 +00:00
王怡栋 ac0347ae6c Merge branch 'dev/gfl_zentaopms_305' into 'master' 
Dev/gfl zentaopms 305

See merge request easycorp/zentaopms!7402
 2023-04-13 08:58:07 +00:00
wangyidong ad6e538eca * code for issue #772. 2023-04-13 16:17:21 +08:00
wangyidong 17ce13af75 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2023-04-13 16:01:05 +08:00
wangyidong 8a69021d9b * code for issue #776. 2023-04-13 16:00:40 +08:00
wangyidong eab4c77775 Merge branch 'cyy_fixbug' 2023-04-13 13:30:55 +08:00
王怡栋 5ac6adcb09 Merge branch 'master' into 'cyy_fixbug' 
# Conflicts:
#   module/doc/view/lefttree.html.php
 2023-04-13 05:30:11 +00:00
王怡栋 7dcfba812e Merge branch 'dev/gfl_zentaopms_305' into 'master' 
* Code for task 90776 .

See merge request easycorp/zentaopms!7396
 2023-04-13 05:28:57 +00:00
wangyidong 548a0c453c * fix bug #33700. 2023-04-13 13:03:42 +08:00
王怡栋 40e2ae98d5 Merge branch 'dev/gfl_zentaopms_305' into 'master' 
Dev/gfl zentaopms 305

See merge request easycorp/zentaopms!7393
 2023-04-13 03:10:18 +00:00
王怡栋 b2bf0e58ac Merge branch 'tsj_task' into 'master' 
* Code for task #90781.

See merge request easycorp/zentaopms!7391
 2023-04-13 00:42:54 +00:00
wangyidong c6512b3b8d * fix bug #33722. 2023-04-13 08:41:27 +08:00
wangyidong 7cbeeb33c3 * fix bug #33745. 2023-04-12 17:46:35 +08:00
wangyidong bb5ced8e4d * fix bug #33745. 2023-04-12 17:42:49 +08:00
王怡栋 0c6c34b46f Merge branch 'tsj_fixbug' into 'master' 
* Restore code.

See merge request easycorp/zentaopms!7390
 2023-04-12 09:16:37 +00:00
wangyidong bf4c487742 * fix bug. 2023-04-12 17:00:48 +08:00
王怡栋 25c2d64d8c Merge branch 'tsj_task' into 'master' 
Tsj task

See merge request easycorp/zentaopms!7385
 2023-04-12 08:52:27 +00:00
王怡栋 0e9151fe3c Merge branch 'dev/gfl_addIcon' into 'master' 
ZUI: update Icons files .

See merge request easycorp/zentaopms!7387
 2023-04-12 08:49:31 +00:00
wangyidong a3715fa226 * fix bug. 2023-04-12 16:20:53 +08:00
wangyidong 49ce03d757 * fix bug #34074. 2023-04-12 15:36:01 +08:00
wangyidong e1295a89e4 * fix bug #34088. 2023-04-12 15:30:21 +08:00
wangyidong 4180510b79 * fix bug #33994. 2023-04-12 15:20:32 +08:00
wangyidong bc58f409f7 * fix bug #34015. 2023-04-12 15:20:32 +08:00
王怡栋 54d50f0f02 Merge branch 'tsj_fixbug' into 'master' 
* Fix bug.

See merge request easycorp/zentaopms!7382
 2023-04-12 06:37:24 +00:00