 wangyidong
|
967d24dd06
|
Merge branch 'sprint/189_package'
|
2022-05-24 10:32:09 +08:00 |
|
|
王怡栋
|
276d1b2197
|
Merge branch 'sprint/189_package_lanzongjun' into 'sprint/189_package'
* fix bug #22570
See merge request easycorp/zentaopms!3477
|
2022-05-18 05:35:22 +00:00 |
|
|
lanzongjun
|
867152e2bc
|
* fix bug #22570
|
2022-05-18 13:33:54 +08:00 |
|
|
lanzongjun
|
ece8976470
|
* fix bug #22570
|
2022-05-18 13:20:43 +08:00 |
|
|
wangyidong
|
cceff98fd5
|
* Add id for post data.
|
2022-05-18 10:47:23 +08:00 |
|
|
王怡栋
|
44d98b2cc3
|
Merge branch 'sprint/daitingting_flow_addID' into 'master'
* Add id for post data.
See merge request easycorp/zentaopms!3463
|
2022-05-18 02:44:59 +00:00 |
|
|
wangyidong
|
d6cf08b9d7
|
Merge branch 'tid'
|
2022-05-18 10:20:48 +08:00 |
|
|
daitingting
|
d9ee3c8fdc
|
* Add id for post data.
|
2022-05-18 01:07:33 +00:00 |
|
|
lanzongjun
|
10eebbd136
|
* fix bug #22570
|
2022-05-17 17:13:17 +08:00 |
|
|
tanghucheng
|
d3dc4ebe43
|
* Fix bug.
|
2022-05-17 06:00:26 +00:00 |
|
|
mayue
|
96b422d247
|
* Fix bug #22411.
|
2022-05-12 08:41:39 +00:00 |
|
|
wangyuting2
|
3380222afc
|
* Fix build action menu bug.
|
2022-05-11 16:11:34 +08:00 |
|
|
王怡栋
|
d9d331c38e
|
Merge branch 'master' into 'sprint/wangyuting_workflow'
# Conflicts:
# framework/control.class.php
|
2022-05-10 08:46:32 +00:00 |
|
|
wangyuting2
|
fe3c882c5e
|
* Adjust buildin workflow menu.
|
2022-05-10 16:32:04 +08:00 |
|
|
daitingting
|
d577d57a33
|
* Add id for checking unique field.
|
2022-05-09 17:02:23 +08:00 |
|
|
daitingting
|
e30acad1f2
|
* Add id for checking unique field.
|
2022-05-09 07:56:17 +00:00 |
|
|
daitingting
|
96e460c47d
|
* Finish task #53549.
|
2022-05-09 06:41:35 +00:00 |
|
|
liumengyi
|
78bd314db5
|
* Fix bug #13255.
|
2022-04-24 15:50:21 +08:00 |
|
|
mayue
|
181d0d67de
|
* Fix bug #21948.
|
2022-04-24 09:58:10 +08:00 |
|
|
mayue
|
2ed8646488
|
* Fix bug #21948.
|
2022-04-24 09:31:14 +08:00 |
|
|
hufangzhou
|
2dc575a760
|
* Fix bug #11074.
|
2022-04-21 14:53:38 +08:00 |
|
|
王怡栋
|
a8983445c8
|
Merge branch 'master' into 'sprint/master_zhouxudong_17994'
# Conflicts:
# module/bug/model.php
# module/task/model.php
|
2022-04-13 07:52:03 +00:00 |
|
|
周旭东
|
4e7fcd1ad1
|
Update model.php
|
2022-04-13 03:08:48 +00:00 |
|
|
zhouxudong
|
37337bdb68
|
* Fix bug #17994.
|
2022-04-13 10:59:25 +08:00 |
|
|
zhouxudong
|
19f499e121
|
* Fix bug #17994.
|
2022-04-13 10:36:39 +08:00 |
|
|
zhouxudong
|
1dd4af6ff3
|
* Fix bug #17994.
|
2022-04-13 09:26:20 +08:00 |
|
|
zhouxudong
|
233a035b12
|
* Fix bug #17994.
|
2022-04-12 17:23:24 +08:00 |
|
|
zhouxudong
|
8baef621d2
|
* Fix bug #17994.
|
2022-04-12 16:50:56 +08:00 |
|
|
tianshujie
|
a8b051c12b
|
* Fix bug #16527.
|
2022-04-12 12:58:56 +08:00 |
|
|
孙广明
|
c7dc63ff11
|
Merge branch 'master_xieqiyu_18072' into 'master'
* Fix bug#18072.
See merge request easycorp/zentaopms!2852
|
2022-04-11 09:21:34 +00:00 |
|
|
王怡栋
|
68085fc030
|
Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug
See merge request easycorp/zentaopms!2862
|
2022-04-11 08:00:17 +00:00 |
|
|
tianshujie
|
f1c24db544
|
* Fix bug #16350.
|
2022-04-11 14:16:45 +08:00 |
|
|
孙广明
|
a8674ddc91
|
* Add testtask test.
|
2022-04-11 13:52:02 +08:00 |
|
|
xieqiyu
|
4ff65cf031
|
* Fix bug#18072.
|
2022-04-11 13:18:41 +08:00 |
|
|
孙广明
|
9d8df16da8
|
* Add testtask.
|
2022-04-09 15:58:16 +08:00 |
|
|
zhouxudong
|
d60ce0159c
|
* Fix bug #17994.
|
2022-04-08 11:15:16 +08:00 |
|
|
xieqiyu
|
d8ef00183b
|
* Fix bug#17296.
|
2022-04-06 13:47:49 +08:00 |
|
|
孙华伟
|
05a4805660
|
*Fix bug#20272.
|
2022-04-01 11:27:47 +08:00 |
|
|
李玉春
|
2549143e76
|
Merge branch 'sunhuawei_fixbug_15288' into 'master'
Sunhuawei fixbug 15288
See merge request easycorp/zentaopms!2675
|
2022-03-31 09:23:25 +00:00 |
|
|
孙华伟
|
0ed070fd28
|
Optimize the code.
|
2022-03-31 15:52:15 +08:00 |
|
|
孙华伟
|
5c9862a129
|
*Fix bug#15288.
|
2022-03-31 15:48:53 +08:00 |
|
|
tianshujie
|
16df973236
|
* Fix bug #16636.
|
2022-03-31 09:28:28 +08:00 |
|
|
tianshujie
|
7d4897aa8f
|
* Fix bug #16633.
|
2022-03-30 16:34:58 +08:00 |
|
|
孙华伟
|
b01120b6a3
|
*Fix bug#21183.
|
2022-03-30 14:42:47 +08:00 |
|
|
tianshujie
|
906a4b7f04
|
* Fix bug #16607.
|
2022-03-29 15:46:08 +08:00 |
|
|
tianshujie
|
aa1c6959dd
|
* Fix bug #16607.
|
2022-03-29 15:39:18 +08:00 |
|
|
tianshujie
|
84aaab5508
|
* Fix bug #16607.
|
2022-03-29 15:00:12 +08:00 |
|
|
孙华伟
|
cf0ba445e9
|
*Fix bug#13935
|
2022-03-24 14:30:05 +08:00 |
|
|
孙华伟
|
a6fa85f9dd
|
*Fix bug#13935
|
2022-03-24 14:06:15 +08:00 |
|
|
朱金勇
|
678e438a27
|
Merge branch 'sprint/pailei2_zhouxudong_20112' into 'pailei2'
* Fix bug #20112.
See merge request easycorp/zentaopms!2368
|
2022-03-18 05:38:29 +00:00 |
|