Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
30,859 Commits 2 Branches 292 Tags
65717f117c88e9a2c85a8a7d564be0fcb00cdda0
Commit Graph
30859 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
孙广明 65717f117c Merge branch 'sprint/master_zhouxin_45801' into 'kanban' 
Finish task #45801.

See merge request easycorp/zentaopms!825
 2021-12-09 00:38:26 +00:00
孙广明 a1f72bb932 Merge branch 'sprint/master_zhouxin_45807' into 'kanban' 
Finish task #45807.

See merge request easycorp/zentaopms!806
 2021-12-09 00:38:05 +00:00
zhouxin f12bfb7d0f Add nl2br. 2021-12-08 09:03:53 +00:00
zhouxin 728cb5a63e change get... to include... . 2021-12-08 08:52:25 +00:00
孙广明 97ceb1461a Merge branch 'sprint/master_tanghucheng_45805' into 'kanban' 
* Finish task #45805.

See merge request easycorp/zentaopms!805
 2021-12-08 07:22:22 +00:00
tanghucheng 1168d32103 * Finish task #45805. 2021-12-08 15:21:21 +08:00
孙广明 52fffca101 Merge branch 'sprint/master_zhouxin_45793' into 'kanban' 
Finish task #45793.

See merge request easycorp/zentaopms!809
 2021-12-08 07:09:45 +00:00
孙广明 d34a614d1d Merge branch 'sprint/177_liumengyi_sql' into 'kanban' 
Sprint/177 liumengyi sql

See merge request easycorp/zentaopms!826
 2021-12-08 05:59:46 +00:00
liumengyi e40fd13bbb * Add key for 'zt_kanbangroup' data table. 2021-12-08 13:56:35 +08:00
liumengyi 98a8af5d4f * Modify lane group data tables. 2021-12-08 13:38:26 +08:00
liumengyi d1baae050d * Remove unwanted commas. 2021-12-08 13:17:12 +08:00
liumengyi 78b9ba3726 * Modify install and upgrade sql files. 2021-12-08 11:26:31 +08:00
zhouxin 6d4ed2f256 Finish task #45801. 2021-12-08 03:09:43 +00:00
liumengyi 426522047c * Add kanban install and upgrade sql files. 2021-12-08 09:19:57 +08:00
liumengyi 83c19e91d0 * Add kanban install and upgrade sql. 2021-12-08 09:09:38 +08:00
zhouxin 46ba2e5a0e Finish task #45793. 2021-12-07 08:52:17 +00:00
zhouxin df8859a3b0 Finish task #45807. 2021-12-07 08:44:22 +00:00
孙广明 0e1679c791 Merge branch 'sprint/177_tianshujie_45815' into 'kanban' 
* Add Kanban first level navigation.

See merge request easycorp/zentaopms!801
 2021-12-07 08:13:25 +00:00
tianshujie 7176ef2b55 * Remove useless code. 2021-12-07 16:12:45 +08:00
tianshujie 9f2364c021 * Modify zone to space. 2021-12-07 16:07:50 +08:00
tianshujie b69d36f0d1 * Add Kanban first level navigation. 2021-12-07 14:59:30 +08:00
tanghucheng 92014ce0ce * Finish task #45805. 2021-12-07 13:54:00 +08:00
zhujinyong e5873a07e0 + Add demo lib for api. 2021-12-07 11:06:56 +08:00
王怡栋 8cca6a3e33 Merge branch 'sprint/174_hufangzhou_package' into 'master' 
* Add the traditional Chinese language item.

See merge request easycorp/zentaopms!796
 2021-12-07 01:25:08 +00:00
hufangzhou d876550d96 * Add the traditional Chinese language item. 2021-12-07 09:22:58 +08:00
李玉春 192cbfd23a Merge branch 'sprint/175_sgm_fixbug' into 'master' 
* Fix project name check unique logic.

See merge request easycorp/zentaopms!793
zentaopms_16.0.beta1_20211207 		2021-12-07 00:56:27 +00:00
tanghucheng 1ee592147a * Fix programplan lang. 2021-12-07 08:41:51 +08:00
孙广明 dfc9fd84db Merge branch 'sprint/master_tanghucheng_project' 2021-12-07 08:39:25 +08:00
孙广明 379baac86d Merge branch 'master' into 'sprint/master_tanghucheng_project' 
# Conflicts:
#   module/programplan/lang/en.php
 2021-12-07 00:38:58 +00:00
孙广明 5c84ad89b7 Merge branch 'sprint/174_hufangzhou_package' into 'master' 
* Fallback version of the xuanxuan folder.

See merge request easycorp/zentaopms!795
 2021-12-07 00:33:48 +00:00
孙广明 dea01a13cf Merge branch 'sprint/174_sunhao/improve_kanban' into 'master' 
* Update kanban lib and compatible with duplicate columns definition.

See merge request easycorp/zentaopms!794
 2021-12-07 00:33:27 +00:00
hufangzhou 88eac3a1da * Fallback version of the xuanxuan folder. 2021-12-06 20:09:06 +08:00
Hao Sun ccff5c2366 * Update kanban lib and compatible with duplicate columns definition. 2021-12-06 17:19:29 +08:00
tanghucheng ac12590b03 * Fix bug #17130,17129,17128. 2021-12-06 15:28:53 +08:00
孙广明 0f72dcc6ea * Fix project name check unique logic. 2021-12-06 15:22:57 +08:00
李玉春 3d1d34e383 Merge branch 'sprint/174_tianshujie_17115' into 'master' 
* Fix bug #17115.

See merge request easycorp/zentaopms!785
 2021-12-06 07:18:57 +00:00
李玉春 9db701d207 Merge branch 'sptint/174_xieqiyu_17079' into 'master' 
* Fix bug#17113.

See merge request easycorp/zentaopms!788
 2021-12-06 07:18:39 +00:00
李玉春 fd5cca16b3 Merge branch 'sgm_fixbug' into 'master' 
* Fix code error.

See merge request easycorp/zentaopms!790
 2021-12-06 07:15:25 +00:00
王怡栋 7091037194 Merge branch 'sprint/175_sgm_upgrade' into 'master' 
Sprint/175 sgm upgrade

See merge request easycorp/zentaopms!786
 2021-12-06 07:14:51 +00:00
李玉春 a339b6e024 Merge branch 'sprint/175_sgm_fixbug' into 'master' 
* Fix bug.

See merge request easycorp/zentaopms!792
 2021-12-06 07:14:23 +00:00
tanghucheng fb84d28b4a * Fix bug #17128. 2021-12-06 15:04:49 +08:00
孙广明 bd28d11c75 * Fix bug. 2021-12-06 15:04:33 +08:00
tanghucheng cb23e8ff2b * adjust for date format for programplan. 2021-12-06 14:49:53 +08:00
tanghucheng f2a989e851 * adjust for date format for programplan. 2021-12-06 14:21:23 +08:00
孙广明 22ac002432 * Fix code error. 2021-12-06 13:59:36 +08:00
孙广明 f3bd7149f9 Merge branch 'sprint/174_sunhao/improve_kanban' into 'master' 
* Improve kanban UI, bug #17063.

See merge request easycorp/zentaopms!787
 2021-12-06 05:11:11 +00:00
孙广明 e24ded1429 Merge branch 'sprint/174_hufangzhou_17116' into 'master' 
* Fix bug #17116, bug #17117.

See merge request easycorp/zentaopms!789
 2021-12-06 05:07:38 +00:00
hufangzhou 05d9182e31 * Fix bug #17116, bug #17117. 2021-12-06 12:09:15 +08:00
王怡栋 2dc3e19e7d Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-12-06 11:56:16 +08:00
王怡栋 641929d5fc * adjust for status name for api. 2021-12-06 11:55:50 +08:00