Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
45,920 Commits 2 Branches 292 Tags
54467575261a7c6056fe93e8e6dc145881e83d5b
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
朱金勇 5446757526 Merge branch 'sprint/sunhao/fix_burn_chart_precision' into 'master' 
* fix burn chart precision

See merge request easycorp/zentaopms!5860
 2022-10-24 07:51:04 +00:00
朱金勇 784ad83104 Merge branch 'sprint/remove-useless-load' into 'master' 
- Remove useless loadModel search.

See merge request easycorp/zentaopms!5832
 2022-10-20 06:27:14 +00:00
朱金勇 902381fa7b Merge branch 'sprint/scx_testtaskapi' into 'master' 
* Finish testtask api create method.

See merge request easycorp/zentaopms!5747
 2022-10-17 04:25:52 +00:00
朱金勇 2721b934bf Merge branch 'sprint/fix-92' into 'master' 
* Fix GH-92: Uncaught TypeError: Unsupported operand types: array + null.

See merge request easycorp/zentaopms!5745
 2022-10-13 04:13:42 +00:00
朱金勇 1f3796fcde Merge branch 'sprint/readme' into 'master' 
* Optimize README.

See merge request easycorp/zentaopms!5662
 2022-10-08 00:46:59 +00:00
朱金勇 445bbb276a Merge branch 'ci' into 'master' 
change the gitlab ci file, adjust the jobs name and the style

See merge request easycorp/zentaopms!5603
 2022-09-29 01:22:58 +00:00
朱金勇 d3911c77e6 Merge branch 'sprint/241_tianshujie_fixbug' into 'master' 
Sprint/241 tianshujie fixbug

See merge request easycorp/zentaopms!5518
 2022-09-23 16:05:19 +00:00
朱金勇 c8d127ac3f Merge branch 'sprint/master_zhaoke_67308' into 'master' 
Finish task 67308

See merge request easycorp/zentaopms!5211
 2022-09-06 07:52:47 +00:00
朱金勇 da5f72ad2e Merge branch 'sprint/return' into 'master' 
* Fix return value declaration error of getFeishuData.

See merge request easycorp/zentaopms!5260
 2022-09-05 00:19:14 +00:00
朱金勇 3cf6c73263 Merge branch 'sprint/remove-composer' into 'master' 
- Remove composer.json.

See merge request easycorp/zentaopms!5009
 2022-08-18 03:16:25 +00:00
zhujinyong 61802828b3 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-08-16 15:02:50 +08:00
zhujinyong c8f3aec35b + Add vendor of sqlparser. 2022-08-16 15:02:27 +08:00
zhujinyong b6dcbaa519 + Add libraries for bi. 2022-08-15 12:02:11 +08:00
zhujinyong d21ed6a72f Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-08-15 11:10:46 +08:00
zhujinyong 7e67e54fe9 * Define table. 2022-08-15 11:10:09 +08:00
zhujinyong 9ebd84ddcb + Add bi sql. 2022-08-15 10:09:32 +08:00
zhujinyong 50479852ea Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-08-15 08:47:48 +08:00
zhujinyong 1c64aed9b1 Merge branch 'sprint/sunhao/table_overflow_type' 2022-08-15 08:44:56 +08:00
朱金勇 6d82afe4fa Merge branch 'sprint/sunhao/table_overflow_type' into 'master' 
* change text overflow style in table.

See merge request easycorp/zentaopms!4787
 2022-08-08 09:08:11 +00:00
朱金勇 d14a1dafad Merge branch 'sprint/sunhao/optimize_blue_theme' into 'master' 
* update blue theme.

See merge request easycorp/zentaopms!4746
 2022-08-08 09:07:57 +00:00
朱金勇 d73e628563 Merge branch 'sprint/hufangzhou_changelog' into 'master' 
* Add the story record of xuan to changelog.

See merge request easycorp/zentaopms!4724
 2022-08-01 00:18:29 +00:00
朱金勇 04cc07475b Merge branch 'sprint/hufangzhou_closeApp' into 'master' 
* Remove the unsed code.

See merge request easycorp/zentaopms!4696
 2022-07-27 09:57:17 +00:00
朱金勇 0bb37ccf10 Merge branch 'fix_open_tab' into 'master' 
* fix open tab with same url occurs blank page.

See merge request easycorp/zentaopms!4694
 2022-07-27 09:57:07 +00:00
朱金勇 7c9e7430e8 Merge branch 'sprint/xuanxuan_111' into 'master' 
Sprint/xuanxuan 111

See merge request easycorp/zentaopms!4665
 2022-07-27 07:30:08 +00:00
朱金勇 5ff47f2bd4 Merge branch 'sprint/scx_api' into 'master' 
* Fix api bug.

See merge request easycorp/zentaopms!4628
 2022-07-22 02:35:20 +00:00
朱金勇 e938a86fb5 Merge branch 'sprint/sunhao/zui_table' into 'master' 
* update zui table, optimize UI for nested mode.

See merge request easycorp/zentaopms!4626
 2022-07-21 08:21:43 +00:00
朱金勇 76934f4dcd Merge branch 'sprint/master_zhaoke_60818' into 'master' 
* Add test task name param to ciresults api.

See merge request easycorp/zentaopms!4554
 2022-07-14 08:31:11 +00:00
朱金勇 ca9adecd3f Merge branch 'sprint/xuanxuan_108' into 'master' 
合并小喧喧通知卡片相关代码

See merge request easycorp/zentaopms!4452
 2022-07-13 05:58:05 +00:00
朱金勇 1a9fd62e71 Merge branch 'sprint/tianshujie_25034' into 'master' 
* Fix bug #25034.

See merge request easycorp/zentaopms!4435
 2022-07-08 05:49:32 +00:00
朱金勇 cb21396b98 Merge branch 'sprint/sunhao/optimize_apps_loading' into 'master' 
* optimize apps loading state.

See merge request easycorp/zentaopms!4256
 2022-06-30 05:29:12 +00:00
zhujinyong 467b958ba0 * If run in container, no need check ok.txt. 2022-06-29 16:35:39 +08:00
朱金勇 972449c77a Merge branch 'sprint/209_hufangzhou_package' into 'master' 
* Add the new version.

See merge request easycorp/zentaopms!4207
 2022-06-29 05:29:10 +00:00
朱金勇 0766e36e20 Merge branch 'sprint/scx_api' into 'master' 
* Update api.

See merge request easycorp/zentaopms!4185
 2022-06-28 05:57:43 +00:00
朱金勇 921f8a0950 Merge branch 'sprint/sunhao/picker' into 'master' 
* change default option for picker.

See merge request easycorp/zentaopms!4169
 2022-06-28 01:54:52 +00:00
朱金勇 9601d68cf8 Merge branch 'sprint/scx_bugapi' into 'master' 
Sprint/scx bugapi

See merge request easycorp/zentaopms!4150
 2022-06-27 06:33:33 +00:00
朱金勇 4f017f5e1d Merge branch 'sprint/sunhao/picker' into 'master' 
* hide picker dropmenu on page scrolling.

See merge request easycorp/zentaopms!4142
 2022-06-27 06:11:14 +00:00
朱金勇 88e2ca8a01 Merge branch 'sprint/scx_tokenlogin' into 'master' 
* Login action are recorded by default.

See merge request easycorp/zentaopms!4130
 2022-06-24 07:42:01 +00:00
zhujinyong ac574675d8 Merge branch 'sprint/sunhao/picker' 2022-06-23 17:52:13 +08:00
朱金勇 251593ac46 Merge branch 'sprint/sunhao/bug24187' into 'master' 
* bug #24187, update picker to support for using picker for form controls with same id.

See merge request easycorp/zentaopms!4107
 2022-06-23 09:18:34 +00:00
朱金勇 a53e503dc2 Merge branch 'sprint/sunhao/task57850' into 'master' 
* task #57850, fix selected options not show in picker.

See merge request easycorp/zentaopms!4099
 2022-06-23 05:23:28 +00:00
朱金勇 46f3d0d26a Merge branch 'sprint/sunhao/task57850' into 'master' 
* update picker lib.

See merge request easycorp/zentaopms!4081
 2022-06-23 00:36:55 +00:00
朱金勇 bdca637fcf Merge branch 'sprint/205_hufangzhou_24153' into 'master' 
* Fix bug #24157,#24155,#24154,#24153.

See merge request easycorp/zentaopms!4080
 2022-06-22 09:44:34 +00:00
朱金勇 626fc121a1 Merge branch 'sprint/sunhao/task57850' into 'master' 
* update picker with new option "checkable".

See merge request easycorp/zentaopms!4077
 2022-06-22 09:43:04 +00:00
朱金勇 89357c1100 Merge branch 'sprint/wangzemei/bug23265' into 'master' 
* Fix bug #23265

See merge request easycorp/zentaopms!4045
 2022-06-22 00:15:59 +00:00
朱金勇 1b8d0637b5 Merge branch 'sprint/wangzemei/bug24000' into 'master' 
* Fix bug #24000

See merge request easycorp/zentaopms!4041
 2022-06-22 00:15:48 +00:00
朱金勇 3ec3e6d29a Merge branch 'sprint/gfl_fix_bug_#23659' into 'master' 
* fix bug #23659

See merge request easycorp/zentaopms!4020
 2022-06-22 00:15:37 +00:00
朱金勇 e07244e67e Merge branch 'sprint/wangzemei/bug23919' into 'master' 
* fix bug 23919

See merge request easycorp/zentaopms!4021
 2022-06-20 07:49:56 +00:00
zhujinyong 0f311a2e2b * Fix recTotal of product list. 2022-06-20 15:25:18 +08:00
zhujinyong 03b12b84f1 * Fix count of product. 2022-06-20 15:19:38 +08:00
zhujinyong c2bff85082 * Fix fail of ciresult. 2022-06-20 08:50:47 +08:00
朱金勇 8c3d68552f Merge branch 'sprint/sunhao/bug23877' into 'master' 
* bug #23877, fix user picker not work as expected.

See merge request easycorp/zentaopms!4003
 2022-06-17 05:01:46 +00:00
朱金勇 03dfe512ef Merge branch 'liyuchun_api' into 'master' 
* Finish task #57065.

See merge request easycorp/zentaopms!3982
 2022-06-16 08:14:15 +00:00
zhujinyong a0d1f7cd4b Merge branch 'sprint/sunhao/task56927' 2022-06-16 08:30:31 +08:00
zhujinyong b2bf48c7d3 Merge branch 'sprint/sunhao/task56942' 2022-06-15 17:58:22 +08:00
朱金勇 1a5b537ec7 Merge branch 'cyy_zcli' into 'master' 
* Add api for jobs and repos.

See merge request easycorp/zentaopms!3941
 2022-06-15 09:54:22 +00:00
zhujinyong b8189edbf7 Merge branch 'sprint/sunhao/picker' 2022-06-15 17:53:37 +08:00
zhujinyong dfcada81f1 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-06-15 17:52:37 +08:00
zhujinyong b2169d334a Merge branch 'sprint/sunhao/task56394' 2022-06-15 17:47:15 +08:00
朱金勇 a9b1f8e224 Merge branch 'cyy_zcli' into 'master' 
* Modify login times limit.

See merge request easycorp/zentaopms!3925
 2022-06-15 02:32:27 +00:00
朱金勇 cb360f23fe Merge branch 'master_conflictResolution' into 'master' 
* Conflict resolution.

See merge request easycorp/zentaopms!3922
 2022-06-15 00:06:01 +00:00
朱金勇 cb9a0b6af9 Merge branch 'sprint202_leiyong_fix_bug' into 'master' 
* Finish task#56933.

See merge request easycorp/zentaopms!3916
 2022-06-14 09:44:45 +00:00
zhujinyong 87f50aa3be Merge branch 'sprint/sunhao/task56391' 2022-06-14 17:12:21 +08:00
zhujinyong d4a23c5d00 Merge branch 'sprint/sunhao/task56924' 2022-06-14 16:03:23 +08:00
朱金勇 4d960b1ff3 Merge branch 'sprint/sunhao/kanban' into 'master' 
* update kanban lib, fix option "sortable" not work sometimes.

See merge request easycorp/zentaopms!3901
 2022-06-14 05:45:25 +00:00
朱金勇 a3483fc425 Merge branch 'sprint/hufangzhou_ciyml' into 'master' 
* Add the make package job.

See merge request easycorp/zentaopms!3889
 2022-06-13 09:47:58 +00:00
朱金勇 a6060e91f1 Merge branch 'sprint/hufangzhou_minify' into 'master' 
* Change the minify tools.

See merge request easycorp/zentaopms!3888
 2022-06-13 09:47:26 +00:00
朱金勇 6620381bc7 Merge branch 'sprint/scx_fixapibug' into 'master' 
* Fix api bug.

See merge request easycorp/zentaopms!3871
 2022-06-13 06:01:56 +00:00
朱金勇 832b923c7a Merge branch 'sprint/hufangzhou_zuicss' into 'master' 
* Remove the unused code.

See merge request easycorp/zentaopms!3882
 2022-06-13 05:58:16 +00:00
朱金勇 cb488e5635 Merge branch 'sgm_productorder' into 'master' 
* Fix product order bug.

See merge request easycorp/zentaopms!3828
 2022-06-09 06:57:24 +00:00
朱金勇 5a32a1374b Merge branch 'liwenrui-master-patch-52046' into 'master' 
* reword xuan message title.

See merge request easycorp/zentaopms!3829
 2022-06-09 06:55:53 +00:00
朱金勇 fbab734791 Merge branch 'sprint/200_sunhao/task56369' into 'sprint_200' 
* task #56369, optimize btn style in kanban header.

See merge request easycorp/zentaopms!3784
 2022-06-08 07:53:22 +00:00
zhujinyong 7f95ea2c09 * Check unique for api doc. 2022-06-06 09:24:44 +08:00
zhujinyong 9f322ef866 * Renew apis. 2022-06-06 08:53:54 +08:00
朱金勇 b4936703f1 Merge branch 'master_xieqiyu_23159' into 'master' 
* Fix bug#23159.

See merge request easycorp/zentaopms!3732
 2022-06-02 10:17:21 +00:00
朱金勇 f8e47338fc Merge branch 'sprint/197_tianshujie_fixbug' into 'master' 
* Fixed editing RD Kanban error.

See merge request easycorp/zentaopms!3711
 2022-06-02 04:00:38 +00:00
zhujinyong 9a2933df72 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-06-02 08:33:12 +08:00
zhujinyong cc42a0e685 Merge branch 'sprint/sunhao/fix_picker' 2022-06-02 08:33:01 +08:00
朱金勇 ec29b05431 Merge branch 'sprint/193_hufangzhou_branch' into 'master' 
* Handle modules without non-trunk branches.

See merge request easycorp/zentaopms!3672
 2022-05-31 09:45:10 +00:00
朱金勇 4410f1fb0b Merge branch 'master_liwenrui_bugfix_xuan' into 'master' 
* fix client related issues.

See merge request easycorp/zentaopms!3653
 2022-05-31 03:35:32 +00:00
朱金勇 3e53fed7b7 Merge branch 'sprint/sunhao/bug22690' into 'master' 
* bug #22690, optimize style for custom pri labels.

See merge request easycorp/zentaopms!3636
 2022-05-27 05:34:56 +00:00
zhujinyong d31518fc2e * Set visions for api. 2022-05-26 09:02:59 +08:00
zhujinyong 089eb573e1 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-05-24 09:16:00 +08:00
zhujinyong 632c0a569c * Fix array type. 2022-05-24 09:15:44 +08:00
zhujinyong e07457cd29 * Update16.5. 2022-05-19 16:28:45 +08:00
朱金勇 ea0ef0ee1a Merge branch 'sprint/189_hufangzhou_22669' into 'sprint/189_package' 
* Fix bug #22669.

See merge request easycorp/zentaopms!3524
 2022-05-19 08:12:42 +00:00
zhujinyong f5f32118e6 Merge branch 'sprint/189_package' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint_189 2022-05-19 15:56:45 +08:00
zhujinyong e71094decc * Fix code style. 2022-05-19 15:56:19 +08:00
zhujinyong abc5364d45 Merge branch 'sprint/189_package' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint_189 2022-05-19 15:53:09 +08:00
zhujinyong 6f46cbfb0c * Add approval sql. 2022-05-19 15:52:41 +08:00
朱金勇 0d88bcd390 Merge branch 'sprint/sunhao/refactor' into 'master' 
* refactor: remove console.log

See merge request easycorp/zentaopms!3500
 2022-05-19 02:05:06 +00:00
朱金勇 7646473eda Merge branch 'sprint/sunhao/kanban' into 'master' 
* update kanban lib, and optimize dragging style for it.

See merge request easycorp/zentaopms!3493
 2022-05-18 08:51:18 +00:00
zhujinyong 56413a2748 Merge branch 'sprint/sunhao/zui_chart' 2022-05-18 12:18:07 +08:00
zhujinyong 34954c70e4 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-05-18 11:59:46 +08:00
zhujinyong ec9b521a31 Merge branch 'sprint/sunhao/zui' 2022-05-18 11:55:38 +08:00
zhujinyong 2c3756a915 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-05-16 10:02:33 +08:00
zhujinyong f97bb8f1b5 + Fix api: parent field of project. 2022-05-16 10:02:05 +08:00
朱金勇 f6bad14832 Merge branch 'sprint/189_hufangzhou_refer' into 'master' 
* Fix the bug of login failed.

See merge request easycorp/zentaopms!3408
 2022-05-16 01:04:08 +00:00
朱金勇 15a3e584f8 Merge branch 'sgm_approval' into 'master' 
* Code for approval.

See merge request easycorp/zentaopms!3404
 2022-05-15 02:13:33 +00:00
zhujinyong 9efef2692b + Add no-referrer. 2022-05-14 16:47:44 +08:00
朱金勇 c60e32238c Merge branch 'ci' into 'master' 
Add gitlab-ci and sonar properties files for ci

See merge request easycorp/zentaopms!3307
 2022-05-10 13:16:33 +00:00