Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
31,143 Commits 2 Branches 292 Tags
45cdfc8f59793fa9b8d5278cae591281b22716a3
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
zhujinyong 45cdfc8f59 Merge branch 'xuan' 2021-12-14 09:08:15 +08:00
zhujinyong e3b686cf57 * Fix merge. 2021-12-14 08:48:49 +08:00
朱金勇 78e51a5900 Merge branch 'sprint/176_songchenxuan_45535' into 'master' 
*Finish task #45535.

See merge request easycorp/zentaopms!911
 2021-12-13 05:54:19 +00:00
朱金勇 ea39b28199 Merge branch 'sprint/176_songchenxuan_45543' into 'master' 
*Finish task #45543.

See merge request easycorp/zentaopms!909
 2021-12-13 05:10:02 +00:00
朱金勇 58fb407b19 Merge branch 'sprint/176_songchenxuan_45535' into 'master' 
*Finish task #45535.

See merge request easycorp/zentaopms!908
 2021-12-13 05:01:45 +00:00
zhujinyong ad8b03c73f * Refactoring of getDynamic. 2021-12-13 11:03:58 +08:00
朱金勇 f1e97497a3 Merge branch 'sprint/176_xieqiyu_45536' into 'master' 
Sprint/176 xieqiyu 45536

See merge request easycorp/zentaopms!903
 2021-12-13 00:46:27 +00:00
朱金勇 40e1b04661 Merge branch 'sprint/176_songchenxuan_45545' into 'master' 
Sprint/176 songchenxuan 45545

See merge request easycorp/zentaopms!880
 2021-12-10 07:16:22 +00:00
朱金勇 56081eb2e3 Merge branch 'sprint/176_mayue_16964' into 'master' 
* Fix bug #16964.

See merge request easycorp/zentaopms!892
 2021-12-10 06:17:11 +00:00
朱金勇 161233a64f Merge branch 'sprint/176_xieqiyu_45536' into 'master' 
Sprint/176 xieqiyu 45536

See merge request easycorp/zentaopms!884
 2021-12-10 06:15:15 +00:00
朱金勇 e8feeca41e Merge branch 'sprint/176_songchenxuan_45538' into 'master' 
*Finish task #45538.

See merge request easycorp/zentaopms!886
 2021-12-10 06:07:32 +00:00
朱金勇 d148ae7cf4 Merge branch 'sprint/176_songchenxuan_45535' into 'master' 
*Finish task #45535.

See merge request easycorp/zentaopms!872
 2021-12-10 06:04:55 +00:00
朱金勇 5ee11088b8 Merge branch 'sprint/176_songchenxuan_45539' into 'master' 
Sprint/176 songchenxuan 45539

See merge request easycorp/zentaopms!870
 2021-12-10 06:04:23 +00:00
朱金勇 c5bce17ef3 Merge branch 'sprint/176_songchenxuan_45537' into 'master' 
*Finish task #45337.

See merge request easycorp/zentaopms!871
 2021-12-10 02:45:06 +00:00
朱金勇 0a16828af9 Merge branch 'sprint/xieqiyu_fixbug_build' into 'master' 
* Update project linked branch.

See merge request easycorp/zentaopms!853
 2021-12-09 07:42:17 +00:00
zhujinyong 2d91f6d395 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-12-09 13:39:52 +08:00
zhujinyong e0217a1569 * Fix bugs of repo api. 2021-12-09 13:39:37 +08:00
zhujinyong 91e620e2b5 * Products of repo is array. 2021-12-09 11:12:27 +08:00
zhujinyong 8224bdc83f Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-12-09 11:08:14 +08:00
zhujinyong b6cfb2a715 + Add repos api. 2021-12-09 11:07:58 +08:00
朱金勇 847071497d Merge branch 'sprint/174_hufangzhou_sql' into 'master' 
* Modify the editedBy field in zt_apistruct table and add the standard sql.

See merge request easycorp/zentaopms!798
 2021-12-07 05:24:43 +00:00
zhujinyong e5873a07e0 + Add demo lib for api. 2021-12-07 11:06:56 +08:00
zhujinyong 035c35d2e2 * Fix status of testcase. 2021-12-06 08:19:15 +08:00
zhujinyong 5f3b5817c9 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-12-05 23:51:59 +08:00
zhujinyong f6d7234156 * Fix bugs of api. 2021-12-05 23:51:27 +08:00
zhujinyong d73d395995 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-12-03 12:37:58 +08:00
zhujinyong e660a67e40 * Fix product api. 2021-12-03 12:37:45 +08:00
zhujinyong fc9fe1ac84 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-12-03 10:01:17 +08:00
zhujinyong 861e92107c + Add user type for api. 2021-12-03 10:01:01 +08:00
朱金勇 789a419696 Merge branch 'sprint/168_sunhao/improve_kanban' into 'master' 
* Support for using kanban in old browsers without CSS flex.

See merge request easycorp/zentaopms!757
 2021-12-03 00:50:26 +00:00
zhujinyong ebf78059e8 * Rename actions of productplan. 2021-12-02 15:55:20 +08:00
zhujinyong a238baf77c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-12-02 15:46:55 +08:00
zhujinyong ddcdaf4319 * Fix api of users. 2021-12-02 15:46:24 +08:00
zhujinyong c1750bffca Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-12-01 11:32:38 +08:00
zhujinyong 8ee3e5ce16 Merge branch 'sprint/168_sunhao/task45145' 2021-12-01 11:32:08 +08:00
朱金勇 ac94dadfd4 Merge branch 'sprint/174_xieqiyu_fixOptionMenu' into 'master' 
* Fix option menu in doc and caselib.

See merge request easycorp/zentaopms!693
 2021-12-01 02:51:38 +00:00
zhujinyong d8cefe71d9 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-12-01 10:01:02 +08:00
zhujinyong 74a4cd7470 + Add productplan methods for api. 2021-12-01 10:00:06 +08:00
zhujinyong 0d88abfcdb Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-11-29 13:09:19 +08:00
zhujinyong be26a7c731 * Fix errors of api. 2021-11-29 13:09:05 +08:00
zhujinyong 4b57e8627b * Fix api of program. 2021-11-28 22:17:33 +08:00
朱金勇 8c1b5a2a5b Merge branch 'sprint/168_sunhao/task44627' into 'sprint/168' 
* task #44627, add web client entry button to bottom navbar in index page.

See merge request easycorp/zentaopms!632
 2021-11-26 07:43:15 +00:00
朱金勇 e372b49a31 Merge branch 'sprint/174_hufangzhou_45085' into 'master' 
* Modify the branch switcher in qa menu.

See merge request easycorp/zentaopms!617
 2021-11-25 06:59:32 +00:00
zhujinyong e86878e5c6 * Fix tree of product and branch. 2021-11-25 14:49:15 +08:00
朱金勇 293a375ec8 Merge branch 'sprint/174_mayue_16605' into 'master' 
Fix bug #16605.

See merge request easycorp/zentaopms!616
 2021-11-25 06:45:58 +00:00
朱金勇 8cdf02366c Merge branch 'sprint/174_hufangzhou_45079' into 'master' 
* Add the branch switcher in tree browse page.

See merge request easycorp/zentaopms!614
 2021-11-25 05:05:20 +00:00
zhujinyong 49bff6df49 * Fix router of api. 2021-11-25 10:26:17 +08:00
朱金勇 40e772acea Merge branch 'sprint/168_chaideqing_44636' into 'sprint/168' 
modify zentao bug/task/story card page's srollbar and actionbar

See merge request easycorp/zentaopms!604
 2021-11-24 05:01:16 +00:00
zhujinyong 0d520d03d3 Merge branch 'sprint/170_package_bug' of https://gitlab.zcorp.cc/easycorp/zentaopms into 170_package_bug 2021-11-23 19:47:10 +08:00
zhujinyong 80010bb881 * Adjust batchEdit of story. 2021-11-23 19:46:35 +08:00
朱金勇 5b84227610 Merge branch 'spring/170_xiawenlong' into 'sprint/170' 
* Fix code error

See merge request easycorp/zentaopms!603
 2021-11-23 11:16:20 +00:00
zhujinyong 724d2ae39e * Format code style. 2021-11-23 14:28:49 +08:00
朱金勇 542adaa80d Merge branch 'spring/170_xiawenlong' into 'sprint/170' 
* Fix create api doc Bug.

See merge request easycorp/zentaopms!599
 2021-11-23 02:42:54 +00:00
朱金勇 9d2bb37821 Merge branch 'sprint/168_sunhao/task44358' into 'sprint/168' 
* Task #44358, drop card immediately on mouse leave page.

See merge request easycorp/zentaopms!598
 2021-11-22 09:40:44 +00:00
朱金勇 4801bd8ea7 Merge branch 'sprint/168_sunhao/client_integrated' into 'sprint/168' 
* task #44639, task #44637, support for using zentao apps in client left navbar.

See merge request easycorp/zentaopms!581
 2021-11-22 07:47:53 +00:00
zhujinyong 56417d12a0 Merge branch 'sprint/170' of https://gitlab.zcorp.cc/easycorp/zentaopms into 170 2021-11-22 09:59:53 +08:00
zhujinyong e7606af189 * Fix english language. 2021-11-22 09:59:21 +08:00
zhujinyong 0d7c8a5e2d * Add array type for params type. 2021-11-22 09:55:20 +08:00
zhujinyong 9bfa67680f Merge branch 'sprint/168_chaideqing_44636' into sprint/168 2021-11-22 08:56:02 +08:00
朱金勇 da9dee64bc Merge branch 'sprint/170_liwenrui_xuan_integration' into 'sprint/170' 
* add owt settings, and remove useless group permissions, xuan task #43732.

See merge request easycorp/zentaopms!387
 2021-11-22 00:55:22 +00:00
zhujinyong 3d89875eb0 Merge branch 'sprint/168_chaideqing_44634' into sprint/168 2021-11-22 08:53:58 +08:00
zhujinyong b5706189c3 Merge branch 'sprint/168_chaideqing_44635' into sprint/168 2021-11-22 08:51:49 +08:00
朱金勇 b3762e84aa Merge branch 'sprint/168_qixinzhi_44632' into 'sprint/168' 
* beautify scroll bar for task/bug/story card

See merge request easycorp/zentaopms!519
 2021-11-22 00:14:33 +00:00
zhujinyong c236f3b221 Merge branch 'sprint/170' of https://gitlab.zcorp.cc/easycorp/zentaopms into 170 2021-11-22 08:11:01 +08:00
zhujinyong 5f8c33d682 * Move chinese to $lang->api. 2021-11-22 08:10:05 +08:00
zhujinyong 39b22de67b Merge branch 'sprint/170' of https://gitlab.zcorp.cc/easycorp/zentaopms into 170 2021-11-19 08:42:40 +08:00
zhujinyong 0ee281b800 * Fix version of api request. 2021-11-18 14:37:26 +08:00
zhujinyong a796848a49 Merge branch 'sprint/170' of https://gitlab.zcorp.cc/easycorp/zentaopms into 170 2021-11-18 14:35:50 +08:00
zhujinyong 6175d59ce3 * Compatiblity for ubb. 2021-11-18 14:35:21 +08:00
zhujinyong 98a3b04e99 * Compatibility in scm. 2021-11-18 13:39:01 +08:00
zhujinyong 8c1cc5c875 * Update purifier library. 2021-11-18 13:35:32 +08:00
朱金勇 ea65af554a Merge branch 'sprint/168_sunhao/kanban_lib' into 'sprint/168' 
* Update kanban component and fix rerender not work with sub columns.

See merge request easycorp/zentaopms!432
 2021-11-14 09:46:19 +00:00
朱金勇 2adb14ae19 Merge branch 'sprint/170_sunhao/improve_pie_chart' into 'sprint/170' 
* Fix CanvasRenderingContext2D error when init progress-pie plugin.

See merge request easycorp/zentaopms!439
 2021-11-14 09:46:04 +00:00
zhujinyong 1515e07c04 * Fix bugs: Compatibility for old version. 2021-11-11 17:19:55 +08:00
朱金勇 4082d78ff0 Merge branch 'sprint/170_sunhao/task44164' into 'sprint/170' 
* Task #44164, update task list after close modal.

See merge request easycorp/zentaopms!404
 2021-11-11 08:50:53 +00:00
zhujinyong f77b0e6d2d * Check compatibility. 2021-11-11 05:10:38 +08:00
zhujinyong 326a9f4ce1 Merge branch 'sprint/170' of https://gitlab.zcorp.cc/easycorp/zentaopms into 170 2021-11-10 16:02:17 +08:00
zhujinyong 9e996b6deb * Fix code error of compatibility. 2021-11-10 16:01:47 +08:00
zhujinyong 37b486ad1c * Replace htmlspecialchars to htmlSpecialString for compatibility. 2021-11-10 14:57:48 +08:00
zhujinyong 3ec178de54 * Fix sql error. 2021-11-10 13:52:25 +08:00
zhujinyong c2feb4164f Merge branch 'sprint/170' of https://gitlab.zcorp.cc/easycorp/zentaopms into 170 2021-11-10 13:50:45 +08:00
zhujinyong 40e2faf15e * Fix sql error. 2021-11-10 13:50:29 +08:00
zhujinyong ea45b8f9ea * Fix compatibility. 2021-11-09 20:43:53 +08:00
zhujinyong 489eac1696 Merge branch 'sprint/170' of https://gitlab.zcorp.cc/easycorp/zentaopms into 170 2021-11-09 15:53:36 +08:00
zhujinyong d99765633e + Add compatibility check. 2021-11-09 15:52:28 +08:00
zhujinyong 8b9f09e5e8 Merge branch 'sprint/169' of https://gitlab.zcorp.cc/easycorp/zentaopms into 169 2021-11-09 14:57:52 +08:00
朱金勇 976f3b80ad Merge branch 'sprint/169' into 'sprint/169' 
* Adjust and correct codes for gitlab module.

See merge request easycorp/zentaopms!222
 2021-11-01 02:11:15 +00:00
朱金勇 ad9ddb07d4 Merge branch 'sprint/168_sunhao/improve_kanban' into 'sprint/168' 
* Limit range for iframe modal triggers.

See merge request easycorp/zentaopms!234
 2021-11-01 02:10:25 +00:00
朱金勇 a98c6931e0 Merge branch 'sprint/169' into 'sprint/169' 
Fix the bug in the compile submodule of DevOps module.

See merge request easycorp/zentaopms!172
 2021-10-27 05:00:43 +00:00
zhujinyong ec8b31e847 Merge branch 'sprint/169' of https://gitlab.zcorp.cc/easycorp/zentaopms into 169 2021-10-27 11:06:45 +08:00
朱金勇 57995a6e7f Merge branch 'sprint/168_sunhao/refactor_avatar_helper' into 'sprint/168' 
* Refactor avatar helper, the $user param cannot be an avatar url now.

See merge request easycorp/zentaopms!161
 2021-10-27 03:01:59 +00:00
zhujinyong 759ab4c815 * Rewrite p function. 2021-10-21 15:18:28 +08:00
朱金勇 53cccbed9f Merge branch 'sprint/167_api_doc' into 'sprint/167' 
fix many subfiled bug

See merge request easycorp/zentaopms!122
 2021-10-20 05:59:34 +00:00
zhujinyong 04d67237b7 * Cannot change account. 2021-10-20 11:26:43 +08:00
zhujinyong 9ca19c49d1 Merge branch 'sprint/167' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/167 2021-10-20 11:23:20 +08:00
zhujinyong 48e7adeb39 * Check gender value. 2021-10-20 11:23:00 +08:00
朱金勇 9a7c381540 Merge branch 'sprint/167_hufangzhou_package1' into 'sprint/167' 
* Adjust the lang file.

See merge request easycorp/zentaopms!120
 2021-10-19 13:02:13 +00:00
朱金勇 f0793bf911 Merge branch 'sprint/167_api_doc' into 'sprint/167' 
fix api lib default access control

See merge request easycorp/zentaopms!119
 2021-10-19 12:53:20 +00:00
朱金勇 2b04f2ba14 Merge branch 'sprint/167_xiawenlong' into 'sprint/167' 
fix default body type.

See merge request easycorp/zentaopms!118
 2021-10-19 12:42:52 +00:00
zhujinyong 20c2314588 Merge branch 'sprint/167' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/167 2021-10-19 20:41:10 +08:00