Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
36,422 Commits 2 Branches 292 Tags
93d7e2dd1de2d3747494edc8260c51c76a007b14
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
朱金勇 7d6e2bac72 Merge branch 'sprint/sunhao/bug21174' into 'master' 
* bug #21174, fix markdown preview not work as expected.

See merge request easycorp/zentaopms!2577
 2022-03-28 09:01:06 +00:00
朱金勇 863f39ea81 Merge branch 'sprint/sunhao/bug19123' into 'master' 
* bug #19123, skip to check iframe when url has "_single" param for debug mode.

See merge request easycorp/zentaopms!2584
 2022-03-28 09:00:49 +00:00
朱金勇 0bb360f80c Merge branch 'sprint/sunhao/bug20927' into 'master' 
* bug #20927, limit affixed header in kanban container.

See merge request easycorp/zentaopms!2585
 2022-03-28 09:00:40 +00:00
朱金勇 e1e5d8caff Merge branch 'sprint/sunhao/bug20928' into 'master' 
* bug #20928, support to affix region scrollbar in kanban.

See merge request easycorp/zentaopms!2591
 2022-03-28 09:00:30 +00:00
朱金勇 a0a1995807 Merge branch 'sprint/autoTest_liumengyi_kanban' into 'master' 
* Modify auto test of product.

See merge request easycorp/zentaopms!2569
 2022-03-28 02:49:39 +00:00
朱金勇 9c675f316c Merge branch 'sprint/sunhao/bug19123' into 'master' 
* try to redirect to index/index when access iframe page directly.

See merge request easycorp/zentaopms!2557
 2022-03-28 02:32:57 +00:00
朱金勇 6b03905a08 Merge branch 'sprint/sunhao/theme_blue' into 'master' 
* fix version switcher button style for theme "blue".

See merge request easycorp/zentaopms!2562
 2022-03-28 02:32:40 +00:00
朱金勇 0901a14d5d Merge branch 'app_zhengrunyu' into 'master' 
* Change api for story.

See merge request easycorp/zentaopms!2535
 2022-03-28 02:32:18 +00:00
朱金勇 530f055e7b Merge branch 'sgm_storytest' into 'master' 
* Remove unused code and fix bug.

See merge request easycorp/zentaopms!2545
 2022-03-25 06:29:10 +00:00
朱金勇 d097a892cf Merge branch 'sprint/sunhao/bug11279' into 'master' 
* bug #11279, fix hotkey up/down with datetimepicker not work in batch action page.

See merge request easycorp/zentaopms!2540
 2022-03-25 06:28:32 +00:00
朱金勇 dbdbe26be7 Merge branch 'sprint/scx_getproductsbyproject' into 'master' 
* Get products by projectID.

See merge request easycorp/zentaopms!2541
 2022-03-25 06:28:12 +00:00
朱金勇 339ac919c6 Merge branch 'sgm_autotest' into 'master' 
Sgm autotest

See merge request easycorp/zentaopms!2533
 2022-03-25 02:30:24 +00:00
朱金勇 71756da30e Merge branch 'sgm_autotest' into 'master' 
Sgm autotest

See merge request easycorp/zentaopms!2532
 2022-03-25 02:24:35 +00:00
朱金勇 01310e31ce Merge branch 'sprint/scx_englishfeatures' into 'master' 
*English features.

See merge request easycorp/zentaopms!2528
 2022-03-25 01:28:09 +00:00
朱金勇 5900a80918 Merge branch 'sprint/sunhao/fix_maincontent_confusion' into 'master' 
* fix columns layout confusion.

See merge request easycorp/zentaopms!2523
 2022-03-25 01:11:44 +00:00
朱金勇 4369a3e2c3 Merge branch 'sprint/sunhao/fix_merge_mistake' into 'master' 
* fix mistable  for merging zui.js.

See merge request easycorp/zentaopms!2526
 2022-03-25 01:11:31 +00:00
zhujinyong eaf550b617 Merge branch 'sprint/sunhao/bug15206' 2022-03-24 21:23:36 +08:00
朱金勇 47dc604e6d Merge branch 'sprint/sunhao/fix_maincontent_confusion' into 'master' 
* fix maincontent confution.

See merge request easycorp/zentaopms!2522
 2022-03-24 13:20:37 +00:00
朱金勇 c6077f7c40 Merge branch 'sgm_storytest' into 'master' 
* Add story test.

See merge request easycorp/zentaopms!2521
 2022-03-24 09:21:41 +00:00
朱金勇 b2b30ea4bc Merge branch 'sprint/sunhao/optimize_dropmenu' into 'master' 
* optimize UI for dropmenu.

See merge request easycorp/zentaopms!2519
 2022-03-24 09:20:45 +00:00
朱金勇 b59ec4b785 Merge branch 'sprint/scx_branch_codeformat' into 'master' 
*AjaxGetBranches function code format.

See merge request easycorp/zentaopms!2515
 2022-03-24 07:41:58 +00:00
朱金勇 5f1f55d874 Merge branch 'sprint/scx_storyestimate' into 'master' 
*Record and get story efforts.

See merge request easycorp/zentaopms!2481
 2022-03-23 08:59:16 +00:00
朱金勇 e0d07d0fc8 Merge branch 'sgm_autotest' into 'master' 
Sgm autotest

See merge request easycorp/zentaopms!2469
 2022-03-23 03:27:30 +00:00
朱金勇 b7d1948967 Merge branch 'app_zhengrunyu' into 'master' 
* Change api for create bug and change stroy.

See merge request easycorp/zentaopms!2467
 2022-03-23 02:45:34 +00:00
朱金勇 f04583c827 Merge branch 'app_zhengrunyu' into 'master' 
*Fix api for user.

See merge request easycorp/zentaopms!2457
 2022-03-22 08:58:25 +00:00
朱金勇 68dc7ba793 Merge branch 'app_zhengrunyu' into 'master' 
*Fix api .

See merge request easycorp/zentaopms!2454
 2022-03-22 08:27:17 +00:00
朱金勇 297a9969dc Merge branch 'sprint/scx_api' into 'master' 
*Task batchCreate API.

See merge request easycorp/zentaopms!2420
 2022-03-22 07:38:53 +00:00
朱金勇 743f6b685a Merge branch 'sprint/scx_estimate' into 'master' 
*Get task estimates.;

See merge request easycorp/zentaopms!2441
 2022-03-22 07:38:04 +00:00
朱金勇 f523d8f121 Merge branch 'sgm_storytest' into 'master' 
* Add story test and fix bug.

See merge request easycorp/zentaopms!2439
 2022-03-22 06:09:37 +00:00
zhujinyong b621511457 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-22 11:14:52 +08:00
zhujinyong 43af3185e2 * Support case group. 2022-03-22 11:14:08 +08:00
zhujinyong 0cf390702c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-22 10:55:21 +08:00
zhujinyong 0c39542c38 Merge branch 'Zentao_app1.1' 2022-03-22 10:55:09 +08:00
zhujinyong e91bf2520c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-22 09:55:03 +08:00
zhujinyong e3ec91da2a + Add modules api. 2022-03-22 09:54:35 +08:00
朱金勇 6272c75817 Merge branch 'sprint/sunhao/fix_paste_image' into 'master' 
* Fix paste image from dingding not work @mayue.

See merge request easycorp/zentaopms!2408
 2022-03-22 00:55:47 +00:00
朱金勇 d4ae966ebc Merge branch 'sprint/xuanxuan_93' into 'master' 
Zentaoclient related changes from xuanxuan sprint 93

See merge request easycorp/zentaopms!2398
 2022-03-22 00:55:07 +00:00
zhujinyong f5d5f89ec2 - Remove exit. 2022-03-21 15:02:28 +08:00
zhujinyong 46f8103c26 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-21 14:54:48 +08:00
zhujinyong 56bb77baa9 * Batch create tasks. 2022-03-21 14:54:03 +08:00
zhujinyong 8432f93094 Merge branch 'Zentao_app1.1' 2022-03-21 14:13:05 +08:00
朱金勇 ec7c5022c8 Merge branch 'master' into 'Zentao_app1.1' 
# Conflicts:
#   module/execution/control.php
 2022-03-21 06:12:21 +00:00
zhujinyong c131cb891f * Fix data of testtask api. 2022-03-21 09:58:20 +08:00
zhujinyong d96d58ef0d * Fix params of testresults. 2022-03-21 09:28:13 +08:00
zhujinyong 79deb1dd03 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-21 09:20:31 +08:00
zhujinyong 65412bb5b5 + Add testresult. 2022-03-21 09:20:18 +08:00
zhujinyong 9fcb03b0fd + Add api of tetsuite. 2022-03-21 08:25:20 +08:00
朱金勇 7caeb0bde9 Merge branch 'sprint/autoTest_liumengyi_bug' into 'master' 
* Add auto test of bug.

See merge request easycorp/zentaopms!2381
 2022-03-18 09:20:17 +00:00
朱金勇 97f1e1f68d Merge branch 'sgm_storytest' into 'master' 
* Add story auto test.

See merge request easycorp/zentaopms!2378
 2022-03-18 09:13:26 +00:00
朱金勇 c3cf329773 Merge branch 'sprint/pailei2_tianshujie_fixbug' into 'pailei2' 
Sprint/pailei2 tianshujie fixbug

See merge request easycorp/zentaopms!2367
 2022-03-18 05:40:59 +00:00
朱金勇 678e438a27 Merge branch 'sprint/pailei2_zhouxudong_20112' into 'pailei2' 
* Fix bug #20112.

See merge request easycorp/zentaopms!2368
 2022-03-18 05:38:29 +00:00
朱金勇 65306e362a Merge branch 'sprint/master_lanzongjun_fixbug_lite' into 'master' 
Sprint/master lanzongjun fixbug lite

See merge request easycorp/zentaopms!2370
 2022-03-18 05:35:36 +00:00
朱金勇 939f7b9944 Merge branch 'sprint/pailei2_tianshujie_upgrade' into 'pailei2' 
* Delete encrypt module folder when upgrading.

See merge request easycorp/zentaopms!2348
 2022-03-18 05:25:01 +00:00
朱金勇 4f2780027d Merge branch 'sgm_usercase' into 'master' 
Sgm usercase

See merge request easycorp/zentaopms!2355
 2022-03-18 01:24:42 +00:00
朱金勇 04b88a9e49 Merge branch 'tianshujie_upgrade' into 'master' 
* Fix bug of ext files.

See merge request easycorp/zentaopms!2346
 2022-03-17 08:43:08 +00:00
朱金勇 daeedd520b Merge branch 'sgm_usercase' into 'master' 
* Add user test unit.

See merge request easycorp/zentaopms!2332
 2022-03-17 06:01:12 +00:00
朱金勇 2ae97554eb Merge branch 'sprint/187_hufangzhou_sql' into 'master' 
* Fix sql.

See merge request easycorp/zentaopms!2322
 2022-03-17 02:07:57 +00:00
朱金勇 dd15735c4f Merge branch 'sgm_upgrade' into 'master' 
* Remove unused code.

See merge request easycorp/zentaopms!2312
 2022-03-16 07:49:13 +00:00
zhujinyong 38a53e94df Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-16 13:38:53 +08:00
zhujinyong 56c0ef9064 * Fix sql. 2022-03-16 13:38:33 +08:00
zhujinyong 489be02f3f * Fix review. 2022-03-16 12:11:09 +08:00
朱金勇 8a4bda1fb8 Merge branch 'sgm_upgrade' into 'master' 
* Change version.

See merge request easycorp/zentaopms!2283
 2022-03-16 00:40:49 +00:00
朱金勇 9ae2933c5e Merge branch 'sgm_unittest' into 'master' 
Sgm unittest

See merge request easycorp/zentaopms!2273
 2022-03-15 07:44:47 +00:00
zhujinyong 841897faca Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-15 12:24:24 +08:00
zhujinyong 28c73c8ec6 * Fix error of task api. 2022-03-15 12:23:57 +08:00
朱金勇 1ce864d374 Merge branch 'sgm_sql' into 'master' 
* Fix bug #20725

See merge request easycorp/zentaopms!2241
 2022-03-14 08:37:12 +00:00
zhujinyong ea63748351 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-14 15:12:53 +08:00
zhujinyong 976299d506 * Fix type of fields. 2022-03-14 15:12:32 +08:00
朱金勇 0ba0e25d66 Merge branch 'sgm_upgrade' into 'master' 
* Fix upgrade bug.

See merge request easycorp/zentaopms!2230
 2022-03-14 06:36:24 +00:00
zhujinyong b5da3ce7d5 * Execute xuanxuan update sql. 2022-03-14 13:55:52 +08:00
朱金勇 89aea98b25 Merge branch 'sgm_upgrade' into 'master' 
* Fix upgrade bug.

See merge request easycorp/zentaopms!2227
 2022-03-14 03:32:07 +00:00
zhujinyong 32d12d4ef2 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-14 10:35:18 +08:00
zhujinyong 7a3e077afa * The setting of system.common has no vision. 2022-03-14 10:34:47 +08:00
zhujinyong ee8298f9f6 * Check login. 2022-03-13 23:57:59 +08:00
zhujinyong 87909913c8 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-13 22:42:56 +08:00
朱金勇 9851110785 Merge branch 'sprint/187_hufangzhou_zentaosql' into 'master' 
* Add the functions to zentao.sql .

See merge request easycorp/zentaopms!2218
 2022-03-13 14:32:46 +00:00
zhujinyong 7f32ac7f61 * Fix error when updating. 2022-03-13 22:30:40 +08:00
朱金勇 2b429cc75b Merge branch 'sprint/187_hufangzhou_sql' into 'master' 
* Modify the default value of visions field.

See merge request easycorp/zentaopms!2217
 2022-03-13 13:07:23 +00:00
zhujinyong 12ed4a79b3 * Fix upgrade. 2022-03-13 19:19:13 +08:00
朱金勇 ceb1df9bdc Merge branch 'sgm_waterfall' into 'master' 
* Fix weekly bug.

See merge request easycorp/zentaopms!2216
 2022-03-13 11:01:04 +00:00
zhujinyong abb301884f Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-11 15:55:03 +08:00
zhujinyong bebc33acb4 * Fix bug#20651. 2022-03-11 15:54:36 +08:00
zhujinyong ad46d46e81 * Fix comment. 2022-03-11 15:28:43 +08:00
朱金勇 148f093d38 Merge branch 'sgm_upgrade' into 'master' 
* Code for upgrade bug.

See merge request easycorp/zentaopms!2194
 2022-03-11 01:20:40 +00:00
zhujinyong f32ff3980b Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-10 16:22:58 +08:00
zhujinyong 819fad539e * Finish story#31282, story#31284. 2022-03-10 16:21:27 +08:00
朱金勇 6efc1fad24 Merge branch 'sgm_upgrade' into 'master' 
* Fix upgrade error.

See merge request easycorp/zentaopms!2185
 2022-03-10 06:21:24 +00:00
朱金勇 e591bf4c98 Merge branch 'sgm_upgrade' into 'master' 
* Add pro upgrade to biz.

See merge request easycorp/zentaopms!2179
 2022-03-10 02:46:36 +00:00
朱金勇 9fb53de457 Merge branch 'sgm_upgrade' into 'master' 
Sgm upgrade

See merge request easycorp/zentaopms!2177
 2022-03-10 02:30:28 +00:00
朱金勇 8a9d8c5a24 Merge branch 'sgm_upgrade' into 'master' 
* Fix upgrade bug.

See merge request easycorp/zentaopms!2174
 2022-03-10 01:50:14 +00:00
zhujinyong 1076396a79 * Refactor upgrade. 2022-03-09 16:20:53 +08:00
zhujinyong 27bd1de1d1 * Fix code error. 2022-03-08 16:22:41 +08:00
zhujinyong ec019ab0ab Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-08 13:16:19 +08:00
zhujinyong 89aaefc8c6 * Fix upgrade. 2022-03-08 13:15:47 +08:00
朱金勇 ec5dade7d6 Merge branch 'sgm_upgrade' into 'master' 
* Add from version.

See merge request easycorp/zentaopms!2138
 2022-03-08 03:15:55 +00:00
朱金勇 8206e65301 Merge branch 'sgm_upgrade' into 'master' 
* Fix upgrade error.

See merge request easycorp/zentaopms!2130
 2022-03-08 02:09:00 +00:00
zhujinyong 445bd93d3e * Check version. 2022-03-08 09:41:38 +08:00
zhujinyong 01c96e266c * Format. 2022-03-08 08:58:27 +08:00
朱金勇 48d94bd7af Merge branch 'sgm_db' into 'master' 
* Add pro/biz/max sql to open.

See merge request easycorp/zentaopms!2126
 2022-03-08 00:58:11 +00:00
朱金勇 610f42ca09 Merge branch 'autotest_ly' into 'master' 
Add execution model

See merge request easycorp/zentaopms!2090
 2022-03-08 00:25:42 +00:00