Commit Graph
54808 Commits
Author SHA1 Message Date
guofeilong 4ed0820f74 * Code for delete leftLine before leftTree . 2023-04-21 10:16:36 +08:00
guofeilong 682d386e7d * Adjust code for css in left-tree . 2023-04-21 10:08:23 +08:00
刘刚 e69f47c233 Merge branch 'zentaobiz39_bi_wangyuting' into 'master'
Zentaobiz39 bi wangyuting

See merge request easycorp/zentaopms!7530
2023-04-21 02:05:43 +00:00
刘刚 9867267260 Merge branch 'sprint/308_liumengyi_fixbug' into 'master'
* Fix bug of show icon-help data-content.

See merge request easycorp/zentaopms!7529
2023-04-21 02:04:42 +00:00
wangyuting2 6473ae0ce0 * Finish task #91811. 2023-04-21 10:01:46 +08:00
刘刚 22edfab041 Merge branch 'fix_bug_qxz' into 'master'
* Fix bug#34187 again.

See merge request easycorp/zentaopms!7528
2023-04-21 01:59:06 +00:00
liumengyi 39c69a2dc2 * Fix bug of show icon-help data-content. 2023-04-21 09:56:00 +08:00
刘刚 8ec658f0c2 Merge branch 'dev/gfl_fixbug' into 'master'
* Adjust code for bug icon-diamond in btn-group .

See merge request easycorp/zentaopms!7526
2023-04-21 01:52:19 +00:00
hufangzhou 05a3165b2a Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2023-04-21 09:49:38 +08:00
hufangzhou 2170647ab8 * Add the fields name for replace sql. 2023-04-21 09:49:26 +08:00
guofeilong 74d165887e * Code for bug #34521 . 2023-04-21 09:49:14 +08:00
wangyuting2 eee83dc5d4 * Add pivot browse priv name. 2023-04-21 09:46:34 +08:00
qixinzhi 2232da91cb * Fix bug#34187 again. 2023-04-21 01:40:05 +00:00
wangyuting2 807fac723a * Show pivot for zentao open version. 2023-04-21 09:35:17 +08:00
guofeilong 7a89f0b6d3 * Adjust code for bug icon-diamond in btn-group . 2023-04-21 09:28:35 +08:00
刘刚 ad6975f7d9 Merge branch 'daitingting_upgradesql' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!7523
2023-04-21 01:21:18 +00:00
刘刚 63edb641df Merge branch 'tsj_fixbug' into 'master'
Tsj fixbug

See merge request easycorp/zentaopms!7522
2023-04-21 01:20:57 +00:00
胡方舟 06d6ce7b48 Merge branch 'pipeline_jenkins_ly' into 'master'
* Adjust pipeline concurrent rules for dynamic concurrency.

See merge request easycorp/zentaopms!7525
2023-04-21 01:20:01 +00:00
liyang c1e76f0bfe * Fix syntax error. 2023-04-21 09:19:16 +08:00
liyang 12cd7f6ec6 * Adjust pipeline concurrent rules for dynamic concurrency. 2023-04-21 09:14:48 +08:00
daitingting 0c6bad428a * Fix bug. 2023-04-21 09:11:04 +08:00
tianshujie d27d489adc * Fix the style problem of creating the document library. 2023-04-21 09:05:50 +08:00
tianshujie e2c553cf02 * Modify the Create Document button. 2023-04-21 09:00:22 +08:00
tianshujie 8f15eb15e6 * Fixed the interface details page skip problem. 2023-04-21 08:55:51 +08:00
hufangzhou fb3c888626 * Fix bug for priv fields. 2023-04-21 08:27:21 +08:00
刘刚 560cd6f61e Merge branch 'tsj_fixbug' into 'master'
* Modify default value.

See merge request easycorp/zentaopms!7521
2023-04-20 09:44:17 +00:00
刘刚 2a0661d59d Merge branch 'daitingting_upgrade' into 'master'
* Process privelege for dataview.

See merge request easycorp/zentaopms!7520
2023-04-20 09:44:02 +00:00
刘刚 303e17a25c Merge branch 'zentaobiz39_bi_wangyuting' into 'master'
* Fix db bug.

See merge request easycorp/zentaopms!7517
2023-04-20 09:42:42 +00:00
王怡栋 b540679939 Merge branch 'tsj_fixbug' into 'master'
* Add a field default.

See merge request easycorp/zentaopms!7519
2023-04-20 09:32:43 +00:00
caoyanyi f450ee8aa9 * Modify default value. 2023-04-20 17:32:30 +08:00
daitingting b19b86f789 * Process privelege for dataview. 2023-04-20 17:31:28 +08:00
王怡栋 e0d163f5fd Merge branch 'zentaopms_304' into 'master'
Zentaopms 304

See merge request easycorp/zentaopms!7518
2023-04-20 09:31:13 +00:00
caoyanyi 6a95890f77 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug 2023-04-20 17:27:29 +08:00
caoyanyi 59e5ce1d2f * Modify table name escape. 2023-04-20 17:22:13 +08:00
caoyanyi c49f559d09 * Add a field default. 2023-04-20 17:19:24 +08:00
hufangzhou b7bbb9cb16 * Adjst the code. 2023-04-20 17:12:19 +08:00
wangyuting2 0e3fb627e0 * Fix db bug. 2023-04-20 17:01:10 +08:00
hufangzhou 8c06cac8aa * Fix bug. 2023-04-20 16:55:10 +08:00
刘刚 1ef42bdb8b Merge branch 'fix_bug_qxz' into 'master'
* Fix bug#33357.

See merge request easycorp/zentaopms!7516
2023-04-20 08:51:00 +00:00
刘刚 531f242593 Merge branch 'daitingting_upgrade' into 'master'
* Process fields to match dataview.

See merge request easycorp/zentaopms!7515
2023-04-20 08:48:26 +00:00
刘刚 833fd65fbd Merge branch 'tsj_fixbug' into 'master'
* Modify the installation SQL.

See merge request easycorp/zentaopms!7514
2023-04-20 08:48:17 +00:00
qixinzhi f6c6c55ad2 * Fix bug#33357. 2023-04-20 08:47:54 +00:00
daitingting 63580d733e * Process fields to match dataview. 2023-04-20 16:41:18 +08:00
caoyanyi 69d294280a * Modify the installation SQL. 2023-04-20 16:39:16 +08:00
刘刚 41935d4ee2 Merge branch 'master_xieqiyu_fixbug' into 'master'
* Fix bug of radar error of select no data filter.

See merge request easycorp/zentaopms!7513
2023-04-20 08:33:33 +00:00
刘刚 7bc747da95 Merge branch 'zentaobiz39_bi_wangyuting' into 'master'
* Fix screen bug for open version.

See merge request easycorp/zentaopms!7512
2023-04-20 08:26:08 +00:00
hufangzhou 6bc6fc5ed3 * Init data. 2023-04-20 16:24:48 +08:00
wangyuting2 8c710c241d * Fix screen bug for open version. 2023-04-20 16:20:19 +08:00
刘刚 3054d45b6a Merge branch 'goview' into 'master'
* Fix bug#34300.

See merge request easycorp/zentaopms!7508
2023-04-20 08:19:28 +00:00
王怡栋 d71cb7f238 Merge branch 'bugfix/konglignmao-f2866' into 'master'
* Resolved feedback f2866, handle extend field when sync multiple sprint.

See merge request easycorp/zentaopms!7510
2023-04-20 08:18:20 +00:00