Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
29,157 Commits 2 Branches 292 Tags
f89071b9e7c90352cf0ca1d76d90e26b11d056b6
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
朱金勇 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
朱金勇 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
朱金勇 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 9bfa67680f Merge branch 'sprint/168_chaideqing_44636' into sprint/168 2021-11-22 08:56:02 +08: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
朱金勇 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
朱金勇 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
朱金勇 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
zhujinyong 3f5c7fed0f Merge branch 'sprint/167_liyuchun_15639' into sprint/167 2021-10-19 20:40:59 +08:00
朱金勇 235fa53d01 Merge branch 'sprint/167' into 'sprint/167_liyuchun_15639' 
# Conflicts:
#   module/api/lang/en.php
 2021-10-19 12:40:17 +00:00
朱金勇 b21e0a29d3 Merge branch 'sprint/167_hufangzhou_package1' into 'sprint/167' 
* Check the api module for package.

See merge request easycorp/zentaopms!116
 2021-10-19 12:16:42 +00:00
zhujinyong d3a6af49b6 + Add charset of zentao15.7.sql. 2021-10-19 19:34:42 +08:00
朱金勇 b0ba5cff66 Merge branch 'sprint/167_xiawenlong' into 'sprint/167' 
update sql.

See merge request easycorp/zentaopms!114
 2021-10-19 11:32:35 +00:00
zhujinyong 5f40b9b51d Merge branch 'sprint/167' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/167 2021-10-19 19:28:11 +08:00
zhujinyong f81f49ea5d + Add charset of zentao.sql. 2021-10-19 19:27:53 +08:00
朱金勇 ef970d5005 Merge branch 'spirnt/167_liyuchun_15636' into 'sprint/167' 
* Fix bug #15636.

See merge request easycorp/zentaopms!113
 2021-10-19 11:19:28 +00:00
zhujinyong 879066853e + Add charset of table. 2021-10-19 19:17:09 +08:00
zhujinyong f17a9bd5f6 Merge branch 'sprint/167' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/167 2021-10-19 19:10:01 +08:00
朱金勇 3bebe533db Merge branch 'sprint/167_xiawenlong' into 'sprint/167' 
fix code style.

See merge request easycorp/zentaopms!112
 2021-10-19 11:09:40 +00:00
zhujinyong d6db6a965b Merge branch 'sprint/167' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/167 2021-10-19 18:57:36 +08:00
zhujinyong 823fd5db59 * Format code. 2021-10-19 18:57:15 +08:00
zhujinyong b913fbb993 * Fix location. 2021-10-19 18:45:01 +08:00
朱金勇 cf2f61ddb3 Merge branch 'sprint/167_xiawenlong' into 'sprint/167' 
Sprint/167 xiawenlong

See merge request easycorp/zentaopms!109
 2021-10-19 10:18:18 +00:00
朱金勇 46b0477852 Merge branch 'sprint/167_xieqiyu_15628' into 'sprint/167' 
* Fix bug#15628.

See merge request easycorp/zentaopms!103
 2021-10-19 09:37:43 +00:00
朱金勇 06a91b0175 Merge branch 'sprint/167_xieqiyu_15614' into 'sprint/167' 
* Fix bug#15614.

See merge request easycorp/zentaopms!101
 2021-10-19 09:15:14 +00:00
zhujinyong 3653106d27 + Add action name of api. 2021-10-19 17:14:30 +08:00
zhujinyong 6e50785589 Merge branch 'sprint/167' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/167 2021-10-19 16:54:44 +08:00
zhujinyong 17cf1b620a * Fix bug#15586. 2021-10-19 16:53:55 +08:00
zhujinyong 8f7c0e6f47 * Merge manually. 2021-10-19 16:24:10 +08:00
zhujinyong 62b2b79a24 Merge branch 'sprint/167_xiawenlong_api' into sprint/167 2021-10-19 16:20:47 +08:00
朱金勇 e770ce54d1 Merge branch 'sprint/167' into 'sprint/167_xiawenlong_api' 
# Conflicts:
#   module/api/view/editlib.html.php
 2021-10-19 08:18:16 +00:00
zhujinyong 8bba71d6bb * Fix get method of user api. 2021-10-19 16:14:51 +08:00
zhujinyong fc2e75eeb8 * Fix languages. 2021-10-19 15:59:07 +08:00
朱金勇 c6b2921dc0 Merge branch 'sprint/167_xiawenlong_api' into 'sprint/167' 
Sprint/167 xiawenlong api

See merge request easycorp/zentaopms!95
 2021-10-19 07:14:48 +00:00
zhujinyong 68e738fdd7 * Reformat code style. 2021-10-19 13:21:22 +08:00
zhujinyong 64af527b27 * Adjust code for api. 2021-10-19 12:11:43 +08:00
zhujinyong 4bb27b624e * Adjust code for Api doc. 2021-10-19 11:00:55 +08:00
zhujinyong abc5c4a302 * Fix code error. 2021-10-18 09:20:56 +08:00
zhujinyong 7ec9315a9b Merge branch 'sprint/167' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/167 2021-10-18 09:18:48 +08:00
zhujinyong 4fe24e06a5 + Add test for api. 2021-10-18 09:18:19 +08:00
朱金勇 2864a8301c Merge branch 'sprint/167_sunhao/task43181' into 'sprint/167' 
* Task #43181, bug #15371, fix nest toggle in program table not work when...

See merge request easycorp/zentaopms!77
 2021-10-15 09:03:35 +00:00
朱金勇 1ac68a832d Merge branch 'sprint/167_sunhao/task43195' into 'sprint/167' 
* Task #43195, fix project creating guide modal not show as expected sometimes.

See merge request easycorp/zentaopms!73
 2021-10-15 06:17:06 +00:00
朱金勇 733d12bab4 Merge branch 'sprint/167_sunhao/task43183' into 'sprint/167' 
* Task #43183, bug #15163, make tutorial tooltip visible in small screen.

See merge request easycorp/zentaopms!72
 2021-10-15 05:57:04 +00:00
朱金勇 e50c3c65d9 Merge branch 'sprint/167_zenggang_43179' into 'sprint/167' 
* Finish task#43179

See merge request easycorp/zentaopms!49
 2021-10-15 01:05:33 +00:00
zhujinyong 22dab31b5f Merge branch 'sprint/167' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/167 2021-10-14 17:10:32 +08:00
zhujinyong b3cfb77e0b + Add api test. 2021-10-14 17:10:11 +08:00
朱金勇 4d208b36a6 Merge branch 'spirnt/167_liyuchun_43178' into 'sprint/167' 
* Finish task #43178.

See merge request easycorp/zentaopms!48
 2021-10-13 00:55:20 +00:00
朱金勇 8fa2e839fb Merge branch 'sprint/167_tianshujie_43190' into 'sprint/167' 
*Finish task #43190

See merge request easycorp/zentaopms!50
 2021-10-12 14:02:03 +00:00
朱金勇 a7b043f7b2 Merge branch 'sprint/165_zenggang_15439' into '15.6' 
Sprint/165 zenggang 15439

See merge request easycorp/zentaopms!52
 2021-10-12 14:01:00 +00:00
朱金勇 c280d772c2 Merge branch 'sprint/165_wangyidong' into 'sprint/165' 
* fix for todo data.

See merge request easycorp/zentaopms!46
 2021-10-10 14:13:27 +00:00
朱金勇 b90e78d4c9 Merge branch 'sprint/165_liyuchun_42859' into 'sprint/165' 
* Finish task #42859，modify the syntax of Notification.

See merge request easycorp/zentaopms!47
 2021-10-10 12:08:18 +00:00
zhujinyong 6abe8d32a2 Merge branch 'sprint/165_test' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/165_test 2021-10-09 09:34:05 +08:00
朱金勇 ff09127219 Merge branch 'sprint/165_wangyidong' into 'sprint/165' 
* finish task #42846.

See merge request easycorp/zentaopms!41
 2021-10-09 01:32:30 +00:00
zhujinyong bc33f19a67 + Add postfix for debug. 2021-10-09 09:30:16 +08:00
朱金勇 85fb57086c Merge branch 'sprint/165_tianshujie_42867' into 'sprint/165' 
*Finish task #42867

See merge request easycorp/zentaopms!43
 2021-10-09 01:21:22 +00:00
朱金勇 4e0207d7e4 Merge branch 'sprint/165_zenggang' into 'sprint/165' 
Sprint/165 zenggang

See merge request easycorp/zentaopms!40
 2021-10-09 01:10:05 +00:00
zhujinyong 0c6c024bb1 * Fix menu vars. 2021-10-08 13:48:10 +08:00
zhujinyong 83d598745f * Finish task#43059. 2021-10-08 08:01:53 +08:00
zhujinyong 658ad668c0 * Format code. 2021-10-07 00:38:06 +08:00
zhujinyong 533c559b0c + Add api for zdisk. 2021-09-29 14:47:41 +08:00
zhujinyong a224eed92b * Ajust code style. 2021-09-29 08:18:05 +08:00
朱金勇 8ef308be2f Merge branch 'sprint/165_zenggang' into 'sprint/165' 
* Fix bug#15368

See merge request easycorp/zentaopms!35
 2021-09-28 08:11:15 +00:00
朱金勇 d31182c9f0 Merge branch 'sprint/165_sunguangming' into 'sprint/165' 
* Fix bug #15335.

See merge request easycorp/zentaopms!33
 2021-09-28 07:49:28 +00:00
朱金勇 79a020c0f5 Merge branch 'sprint/165_dingna_task42827' into 'sprint/165' 
* Finish task 42827.

See merge request easycorp/zentaopms!36
 2021-09-28 07:46:19 +00:00
朱金勇 98f93d563d Merge branch 'spirnt/165_tianshujie_42867' into 'sprint/165' 
* Finish task #42867.

See merge request easycorp/zentaopms!28
 2021-09-28 07:42:48 +00:00
朱金勇 aa86fdea50 Merge branch 'sprint/165_liyuchun_42854' into 'sprint/165' 
* Finish task #42854.

See merge request easycorp/zentaopms!38
 2021-09-28 07:37:30 +00:00
朱金勇 fa879ae303 Merge branch 'sprint/165_tianshujie_42854' into 'sprint/165' 
* Finish task #42854.

See merge request easycorp/zentaopms!39
 2021-09-28 07:35:23 +00:00
朱金勇 1173e8b65d Merge branch 'sprint/165_wangyidong' into 'sprint/165' 
Sprint/165 wangyidong

See merge request easycorp/zentaopms!37
 2021-09-28 07:31:10 +00:00
朱金勇 1bf1ac1156 Merge branch 'sprint/165_test' into 'sprint/165' 
* Copy common folder to tmp.

See merge request easycorp/zentaopms!34
 2021-09-27 07:30:03 +00:00
zhujinyong 1cf925a37c * Copy common folder to tmp. 2021-09-27 15:27:29 +08:00
朱金勇 978cfdbdc8 Merge branch 'sprint/165_test' into 'sprint/165' 
* Init test framework

See merge request easycorp/zentaopms!32
 2021-09-27 06:47:51 +00:00
zhujinyong f1151c37c7 * Adjust code for test demo. 2021-09-27 14:05:51 +08:00
zhujinyong e059381d7d * Supply multiple config files. 2021-09-27 02:52:35 +08:00
朱金勇 452d4d8605 Merge branch 'sprint/165_zenggang' into 'sprint/165' 
Sprint/165 zenggang

See merge request easycorp/zentaopms!27
 2021-09-26 09:47:55 +00:00
朱金勇 f76d206ee5 Merge branch '165_tianshujie42861' into 'sprint/165' 
* Finish task #42861.

See merge request easycorp/zentaopms!24
 2021-09-26 09:45:24 +00:00
朱金勇 98b74f4a94 Merge branch 'sprint/165_wangyidong' into 'sprint/165' 
* finish task #42832.

See merge request easycorp/zentaopms!22
 2021-09-26 09:08:04 +00:00
朱金勇 db1ec55d84 Merge branch 'spirnt/165_liyuchun_42860' into 'sprint/165' 
* Finish task #42860.

See merge request easycorp/zentaopms!26
 2021-09-26 08:57:41 +00:00
朱金勇 4058674e81 Merge branch 'master' into 'master' 
* Fix bug for getting all objects when one label is not exist.

See merge request easycorp/zentaopms!17
 2021-09-26 08:42:47 +00:00
朱金勇 beaae9f167 Merge branch 'sprint/165_dingna_task42850' into 'sprint/165' 
* Finish task #42850

See merge request easycorp/zentaopms!21
 2021-09-26 04:01:53 +00:00
zhujinyong eb04910243 * Send encrypted password when creating user by API. 2021-09-24 14:50:27 +08:00
朱金勇 1bf7d48cdb Merge branch '165_dingna' into 'sprint/165' 
* Finish task #42849.

See merge request easycorp/zentaopms!11
 2021-09-24 05:11:12 +00:00
朱金勇 1f9ab6c380 Merge branch 'sprint/165_dingna_task42826' into 'sprint/165' 
* Finish task #42826.

See merge request easycorp/zentaopms!19
 2021-09-24 05:07:05 +00:00
朱金勇 f0c48a05f7 Merge branch 'sprint/165_dingna_task42851' into 'sprint/165' 
* Finish task #42851.

See merge request easycorp/zentaopms!18
 2021-09-24 05:06:33 +00:00
朱金勇 78e743b18f Merge branch '165_zenggang' into 'master' 
* Finish task#42862

See merge request easycorp/zentaopms!15
 2021-09-24 00:46:01 +00:00
zhujinyong b866ebe1fd Merge branch 'sprint/165' of http://gitlab.zcorp.cc/easycorp/zentaopms into sprint/165 2021-09-24 08:44:24 +08:00
zhujinyong 9f702ff91a * Use rpe for testcase. 2021-09-24 08:43:03 +08:00
朱金勇 4d99f28b8c Merge branch '165_tianshujie' into 'sprint/165' 
* Finish task #42847.

See merge request easycorp/zentaopms!10
 2021-09-23 08:02:13 +00:00
zhujinyong 8484303a23 + Add count config for zendata. 2021-09-23 14:55:06 +08:00