 王怡栋
|
a69b141a84
|
Merge branch 'sprint/zentaobiz12_ticket' into 'master'
ticket
See merge request easycorp/zentaopms!5772
|
2022-10-18 01:48:02 +00:00 |
|
|
lanzongjun
|
3d2667f818
|
remove line
|
2022-10-18 09:32:16 +08:00 |
|
|
lanzongjun
|
aa6546a2ee
|
resolve conflict
|
2022-10-18 09:26:14 +08:00 |
|
|
周鑫
|
544b1418fe
|
Merge branch 'zentaobiz_ticket_zhouxin' into 'sprint/zentaobiz12_ticket'
* Fix bugs.
See merge request easycorp/zentaopms!5771
|
2022-10-17 15:06:13 +00:00 |
|
|
zhouxin
|
9593f24d92
|
* Fix bugs.
|
2022-10-17 23:05:00 +08:00 |
|
|
李玉春
|
bb90adf795
|
Merge branch 'sprint/247_tianshujie_fixbug' into 'master'
Sprint/247 tianshujie fixbug
See merge request easycorp/zentaopms!5759
|
2022-10-17 09:24:39 +00:00 |
|
|
李玉春
|
90b695432b
|
Merge branch 'sprint/247_tianshujie_72323' into 'master'
* Finish task #72323.
See merge request easycorp/zentaopms!5767
|
2022-10-17 09:23:58 +00:00 |
|
|
李玉春
|
8e2a48e581
|
Merge branch 'sprint/247_tianshujie_tableorder' into 'master'
Sprint/247 tianshujie tableorder
See merge request easycorp/zentaopms!5769
|
2022-10-17 09:23:47 +00:00 |
|
|
tianshujie
|
bc72a89801
|
* Finish task #72374.
|
2022-10-17 16:59:43 +08:00 |
|
|
tianshujie
|
e05f1e7f89
|
* Finish task #72374.
|
2022-10-17 16:58:30 +08:00 |
|
|
tianshujie
|
016125ea7c
|
* Finish task #72324.
|
2022-10-17 16:55:39 +08:00 |
|
|
lanzongjun
|
c87b56d6f5
|
task #71834
|
2022-10-17 16:31:50 +08:00 |
|
|
tianshujie
|
4245745bec
|
* Finish task #72351.
|
2022-10-17 16:31:40 +08:00 |
|
|
tianshujie
|
f4fdd2c320
|
* Finish task #72323.
|
2022-10-17 16:19:42 +08:00 |
|
|
tianshujie
|
f9b2fd0aff
|
* Fix bug #28531.
|
2022-10-17 15:46:56 +08:00 |
|
|
lanzongjun
|
ccae5bfa00
|
Merge branch 'sprint/zentaobiz12_ticket' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/zentaobiz12_ticket
|
2022-10-17 15:43:09 +08:00 |
|
|
lanzongjun
|
b3a7a4406f
|
task #71834
|
2022-10-17 15:43:01 +08:00 |
|
|
王怡栋
|
79b98536c1
|
Merge branch 'bug_28542' into 'master'
* Fix bug#28542
See merge request easycorp/zentaopms!5758
|
2022-10-17 06:52:40 +00:00 |
|
|
周鑫
|
407b784710
|
Merge branch 'zentaobiz_ticket_zhouxin' into 'sprint/zentaobiz12_ticket'
* Fix some bugs of ticket.
See merge request easycorp/zentaopms!5760
|
2022-10-17 06:02:49 +00:00 |
|
|
zhouxin
|
4bab4bc356
|
* Fix some bugs of ticket.
|
2022-10-17 14:01:04 +08:00 |
|
|
tianshujie
|
bafc9a6020
|
* Fix bug #28528.
|
2022-10-17 13:54:11 +08:00 |
|
|
zenggang
|
3237e4e752
|
* Fix bug#28542
|
2022-10-17 05:22:40 +00:00 |
|
|
王怡栋
|
4a3c7b3587
|
Merge branch 'sprint/rce' into 'master'
* fix function can rce
See merge request easycorp/zentaopms!5756
|
2022-10-17 05:21:49 +00:00 |
|
|
柴德庆
|
ea7eea68d8
|
* refactor
|
2022-10-17 05:20:01 +00:00 |
|
|
王怡栋
|
384e836f7e
|
Merge branch 'master_28532' into 'master'
*Fix bug #28532.
See merge request easycorp/zentaopms!5754
|
2022-10-17 05:17:46 +00:00 |
|
|
王怡栋
|
83f79a4874
|
Merge branch 'sprint/cdq_refactor' into 'master'
* refactor ->loadModel('bug')->lang to ->app->loadLang('bug')
See merge request easycorp/zentaopms!5751
|
2022-10-17 05:17:05 +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 |
|
|
tianshujie
|
80b66aea5c
|
* Fix bug #28490.
|
2022-10-17 11:12:48 +08:00 |
|
|
tianshujie
|
a16db808d2
|
* Fix bug #28488.
|
2022-10-17 10:56:26 +08:00 |
|
|
chaideqing
|
f01a04b242
|
* fix function can rce
|
2022-10-17 10:28:26 +08:00 |
|
|
周鑫
|
ab0a32f90a
|
Merge branch 'zentaobiz_ticket_zhouxin' into 'sprint/zentaobiz12_ticket'
* Add search form for my ticket.
See merge request easycorp/zentaopms!5755
|
2022-10-17 01:16:19 +00:00 |
|
|
liuhong
|
0e77b9f5e9
|
*Fix bug #28532.
|
2022-10-17 01:10:49 +00:00 |
|
|
zhouxin
|
da5d515b45
|
* Add search form for my ticket.
|
2022-10-17 09:09:09 +08:00 |
|
|
mayue
|
97aaafbbc3
|
* Remove ticket from bug.
|
2022-10-17 09:01:15 +08:00 |
|
|
李玉春
|
ce56365e07
|
Merge branch 'sprint/wangzemei/fix28395' into 'master'
* Fix the problem that the button is not shown
See merge request easycorp/zentaopms!5753
|
2022-10-16 23:56:27 +00:00 |
|
|
李玉春
|
61e06ef72d
|
Merge branch 'cyy_optimize' into 'master'
* Modify dividing line style.
See merge request easycorp/zentaopms!5750
|
2022-10-16 23:56:11 +00:00 |
|
|
wangzemei
|
478bbcc87c
|
* Fix bug #28447
|
2022-10-14 17:21:37 +08:00 |
|
|
mayue
|
3206407fb5
|
* Remove ticket from story.
|
2022-10-14 17:11:12 +08:00 |
|
|
wangzemei
|
6aad1dacac
|
* Fix the problem that the button is not shown
|
2022-10-14 14:57:17 +08:00 |
|
|
mayue
|
c683d09a3f
|
* Add importticket.html.
|
2022-10-14 14:46:01 +08:00 |
|
|
mayue
|
811285c53f
|
Merge branch 'biz13_mayue_task#71837' into sprint/zentaobiz12_ticket
|
2022-10-14 14:45:17 +08:00 |
|
|
mayue
|
fec463deff
|
* Add action lang.
|
2022-10-14 14:38:23 +08:00 |
|
|
mayue
|
2ff57dabd6
|
* Add other lang.
|
2022-10-14 14:35:19 +08:00 |
|
|
mayue
|
6b517a3b8e
|
* Finish task #71837.
|
2022-10-14 14:27:57 +08:00 |
|
|
曹延义
|
1e6ad814be
|
Merge branch 'master' into cyy_optimize
|
2022-10-14 13:25:38 +08:00 |
|
|
王怡栋
|
22a5c56590
|
Merge branch 'bug_28514' into 'master'
* Fix bug#28514
See merge request easycorp/zentaopms!5748
|
2022-10-14 04:18:07 +00:00 |
|
|
王怡栋
|
af516229bb
|
Merge branch 'bug_28518' into 'master'
* Fix bug#28518
See merge request easycorp/zentaopms!5749
|
2022-10-14 04:17:35 +00:00 |
|
|
曹延义
|
1929b943c2
|
* Code for story #38730.
|
2022-10-14 09:58:09 +08:00 |
|
|
chaideqing
|
361040cc94
|
* refactor ->loadModel('bug')->lang to ->app->loadLang('bug')
|
2022-10-14 09:19:28 +08:00 |
|
|
曹延义
|
8f99d8e1b3
|
* Modify dividing line style.
|
2022-10-14 08:44:14 +08:00 |
|