Commit Graph
29296 Commits
Author SHA1 Message Date
Hao Sun 88e67add78 * refactor usage of kanban. 2021-11-30 14:21:24 +08:00
Hao Sun 0b199d7d0e * updata kanban lib. 2021-11-30 14:21:24 +08:00
Hao Sun 39a2d7296b * refactor pages with kanban lib. 2021-11-30 14:21:24 +08:00
Hao Sun 152b3e03bc * update kanban lib. 2021-11-30 14:21:14 +08:00
孙广明 801c9ce3d0 Merge branch 'sprint/169' into sprint/168 2021-11-30 13:47:05 +08:00
李玉春 392463cace Merge branch 'sprint/168_sgm_45161' into 'sprint/168'
Sprint/168 sgm 45161

See merge request easycorp/zentaopms!641
2021-11-30 05:16:08 +00:00
李玉春 2d1e0bb3dc Merge branch 'sprint/168_sgm_45160' into 'sprint/168'
* Finish task #45160.

See merge request easycorp/zentaopms!664
2021-11-30 05:15:34 +00:00
孙广明 e5a9358acd Merge branch 'sprint/29_zhouxin_45106' into 'sprint/168'
Finish task #45106.

See merge request easycorp/zentaopms!649
2021-11-30 05:11:52 +00:00
孙广明 9e9c024982 * Adjust lang. 2021-11-30 13:10:51 +08:00
孙广明 d58fb3c8e7 * Add lang and comment. 2021-11-30 13:08:17 +08:00
zhouxin 2fa0124ed8 Finish task #45106. 2021-11-30 04:27:11 +00:00
孙广明 e752382609 * Remove unused code. 2021-11-30 11:30:50 +08:00
李玉春 86927c21ad Merge branch 'sprint/175_liumengyi_16924' into 'sprint/168'
* Fix bug #16924.

See merge request easycorp/zentaopms!666
2021-11-30 03:16:42 +00:00
孙广明 4fef5fc188 Merge branch 'sprint/168_zhengrunyu_45148' into sprint/168 2021-11-30 11:13:44 +08:00
孙广明 f89071b9e7 Merge branch 'sprint/168' into 'sprint/168_zhengrunyu_45148'
# Conflicts:
#   module/execution/view/view.html.php
2021-11-30 03:13:21 +00:00
liumengyi 7dc88ef740 * Fix bug #16924. 2021-11-30 11:11:54 +08:00
孙广明 38619abdd8 * Finish task #45160. 2021-11-30 11:08:33 +08:00
李玉春 c3ea85771d Merge branch 'sprint/175_liumengyi_45156' into 'sprint/168'
* Finish task #45156.

See merge request easycorp/zentaopms!639
2021-11-30 03:05:07 +00:00
zhengrunyu 46a9f157b1 *Finish task #45148. 2021-11-30 10:56:09 +08:00
liumengyi bd6a007e6a * Add comment. 2021-11-30 10:55:51 +08:00
李玉春 d37bced9ee Merge branch 'sprint/175_liumengyi_16907' into 'sprint/168'
* Fix bug 16807,16892.

See merge request easycorp/zentaopms!658
2021-11-30 02:47:03 +00:00
liumengyi 4b9ee832e1 * Add comment. 2021-11-30 10:20:50 +08:00
liumengyi b264aa3199 * Fix bug 16807,16892. 2021-11-30 09:46:30 +08:00
孙广明 9e14a2ac9f Merge branch 'sprint/175_liyuchun_45154' into 'sprint/168'
Sprint/175 liyuchun 45154

See merge request easycorp/zentaopms!640
2021-11-30 01:45:57 +00:00
liumengyi aa86de638c * Fix bug #16907. 2021-11-30 09:43:20 +08:00
李玉春 2f4e67eda8 Merge branch 'sprint/175_tengfei_lang' into 'sprint/168'
* Edit lang file.

See merge request easycorp/zentaopms!651
2021-11-30 01:37:31 +00:00
孙广明 361f840ce8 Merge branch 'sprint/29_zhouxin_45100' into 'sprint/168'
Finish task 45100.

See merge request easycorp/zentaopms!647
2021-11-30 01:32:21 +00:00
liumengyi 3e346ef8d9 * Modify refactor. 2021-11-30 09:31:08 +08:00
zhengrunyu e78c876216 *Finish task #45148. 2021-11-30 09:22:04 +08:00
liumengyi 62907853b4 * Finish task #45156. 2021-11-30 09:10:42 +08:00
reneeteng bd2b8ab2a6 * Edit lang file. 2021-11-29 16:31:18 +08:00
zhouxin d46892bb32 Finish task #45106. 2021-11-29 08:05:40 +00:00
liumengyi f164f0cdd0 * Fix bug #16892. 2021-11-29 15:19:19 +08:00
liumengyi a3f5e8ab43 * Fix bug #16892. 2021-11-29 15:18:12 +08:00
zhouxin 4cec6b697d Finish task 45100. 2021-11-29 07:00:16 +00:00
liumengyi e9ead71632 * Finish task #45156. 2021-11-29 14:37:21 +08:00
liumengyi 7368ed108b * Finish task #45156. 2021-11-29 14:33:44 +08:00
liumengyi aa840c5b9b * Finish task #45156. 2021-11-29 14:33:12 +08:00
liumengyi 43c1b047b8 * Modify Date always in reverse order. 2021-11-29 13:43:04 +08:00
liumengyi ea4ee494de * Modify Date always in reverse order. 2021-11-29 13:37:27 +08:00
liumengyi adee5873ec * Modify Date always in reverse order. 2021-11-29 13:22:05 +08:00
孙广明 eb6bd79963 * Remove unused file. 2021-11-29 13:09:43 +08:00
liyuchun 578d53f5ae * Finish task #45152. 2021-11-29 13:08:18 +08:00
liumengyi c854d353c6 * Modify Date always in reverse order. 2021-11-29 11:30:30 +08:00
liyuchun dbf176316b * Finish task #45154. 2021-11-29 11:29:46 +08:00
孙广明 4ca2f22704 Merge branch 'sprint/29_zhouxin_45107' into 'sprint/168'
Finish task 45107.

See merge request easycorp/zentaopms!638
2021-11-29 03:25:28 +00:00
zhouxin bbcdd1a8a1 Change planProject to project. 2021-11-29 03:17:59 +00:00
孙广明 b9a508facd Merge branch 'sprint/29_zhouxin_45102' into 'sprint/168'
Finish task 45102.

See merge request easycorp/zentaopms!622
2021-11-29 03:10:47 +00:00
李玉春 5eaeb090d3 Merge branch 'sprint/175_liumengyi_45157' into 'sprint/168'
* Finish task #45157.

See merge request easycorp/zentaopms!621
2021-11-29 02:55:48 +00:00
liumengyi 3e1fc7ad5a * minor refactor. 2021-11-29 10:52:29 +08:00