 王怡栋
|
38bd35f650
|
Merge branch 'sprint/212_hufangzhou_59538' into 'master'
* Finish task #59538.
See merge request easycorp/zentaopms!4330
|
2022-07-05 02:10:23 +00:00 |
|
|
hufangzhou
|
52bbc84bb4
|
* Finish task #59538.
|
2022-07-05 10:06:06 +08:00 |
|
|
tanghucheng
|
e0964ba777
|
* Fix bug #24708.
|
2022-07-04 16:56:09 +08:00 |
|
|
wangyidong
|
236243284a
|
* unlink files.
|
2022-07-04 14:16:52 +08:00 |
|
|
wangyidong
|
c88aa6b8f1
|
Merge branch 'zentaomax35'
|
2022-07-04 14:16:06 +08:00 |
|
|
王怡栋
|
2df50ce39f
|
Merge branch 'fixbug' into 'master'
* Fix bug for workflow.
See merge request easycorp/zentaopms!4305
|
2022-07-01 05:01:51 +00:00 |
|
|
tanghucheng
|
dbfc1e6dac
|
* Fix bug for workflow.
|
2022-07-01 12:24:52 +08:00 |
|
|
lanzongjun
|
dd30f6354b
|
* fix bug #24071
|
2022-07-01 11:28:58 +08:00 |
|
|
lanzongjun
|
8bc8979c20
|
* fix bug #24071
|
2022-07-01 10:59:06 +08:00 |
|
|
zhouxudong
|
130e376976
|
* Fix bug.
|
2022-07-01 02:41:58 +00:00 |
|
|
王怡栋
|
e8f578dfce
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'sprint/zentaomax35'
* fix bug #23996
See merge request easycorp/zentaopms!4278
|
2022-06-30 08:34:44 +00:00 |
|
|
lanzongjun
|
7caab2be4d
|
* fix bug #23996
|
2022-06-30 16:11:31 +08:00 |
|
|
王怡栋
|
04ca0ff10c
|
Merge branch '35_fixbug' into 'sprint/zentaomax35'
* Fix bug #23353.
See merge request easycorp/zentaopms!4275
|
2022-06-30 07:43:22 +00:00 |
|
|
tanghucheng
|
69539dbac4
|
* Fix bug #23353.
|
2022-06-30 15:40:48 +08:00 |
|
|
王怡栋
|
d8094cba31
|
Merge branch 'sprint/workflow' into 'master'
* Add openedApproval config.
See merge request easycorp/zentaopms!4268
|
2022-06-30 07:06:32 +00:00 |
|
|
wangyuting2
|
20ef9ee98e
|
* Add openedApproval config.
|
2022-06-30 14:38:45 +08:00 |
|
|
王怡栋
|
92ff918d26
|
Merge branch 'sprint/master_fixbug_202207' into 'master'
* fix bug #23954
See merge request easycorp/zentaopms!4254
|
2022-06-30 04:04:17 +00:00 |
|
|
lanzongjun
|
b953f00253
|
* fix bug #23954
|
2022-06-30 11:28:00 +08:00 |
|
|
lanzongjun
|
a8358b6ba5
|
* fix bug #23954
|
2022-06-30 11:27:04 +08:00 |
|
|
王怡栋
|
33502862c2
|
Merge branch 'fixbug' into 'master'
* Code for lite html hook.
See merge request easycorp/zentaopms!4250
|
2022-06-30 03:24:16 +00:00 |
|
|
王怡栋
|
a0175bb7b6
|
Merge branch 'sprint/workflow' into 'master'
* Hide open approval for lite workflow.
See merge request easycorp/zentaopms!4252
|
2022-06-30 03:23:28 +00:00 |
|
|
tanghucheng
|
c896e5ac6f
|
* Code for lite html hook.
|
2022-06-30 11:22:53 +08:00 |
|
|
wangyuting2
|
8d43bd7bdc
|
* Hide open approval for lite workflow.
|
2022-06-30 11:08:16 +08:00 |
|
|
tanghucheng
|
384cd2d15a
|
* Fix bug #24542.
|
2022-06-30 10:12:56 +08:00 |
|
|
tanghucheng
|
4074e9fbae
|
* Fix bug #24570.
|
2022-06-30 09:37:25 +08:00 |
|
|
liumengyi
|
727211ff46
|
* Fix lang file.
|
2022-06-29 15:49:05 +08:00 |
|
|
wangyidong
|
303b3fb1dd
|
* fix bug #24076.
|
2022-06-29 15:43:41 +08:00 |
|
|
tanghucheng
|
5fa46a77fe
|
* Fix bug #24132.
|
2022-06-29 15:32:19 +08:00 |
|
|
tanghucheng
|
9f25fc251b
|
* Fix bug #24090.
|
2022-06-29 14:39:19 +08:00 |
|
|
wangyidong
|
8ee7afc941
|
* fix bug #24104.
|
2022-06-29 13:26:58 +08:00 |
|
|
tanghucheng
|
e656139643
|
* Fix bug .
|
2022-06-29 08:48:23 +08:00 |
|
|
tanghucheng
|
ba0b9139b5
|
* Fix bug #24114.
|
2022-06-28 20:47:56 +08:00 |
|
|
xieqiyu
|
f617a45203
|
* Finish task#58603.
|
2022-06-28 11:25:15 +08:00 |
|
|
孙广明
|
58f7fb77dd
|
Merge branch 'sprint/209_hufangzhou_24385' into 'master'
* Fix bug #24385.
See merge request easycorp/zentaopms!4156
|
2022-06-28 01:24:08 +00:00 |
|
|
tanghucheng
|
6c923d96cb
|
* Fix bug for lite.
|
2022-06-28 08:30:45 +08:00 |
|
|
hufangzhou
|
a1825d59d8
|
* Fix bug #24385.
|
2022-06-27 17:09:48 +08:00 |
|
|
zhouxudong
|
74808b486e
|
* Fix bug.
|
2022-06-23 01:33:32 +00:00 |
|
|
王怡栋
|
9ffdc942c2
|
Merge branch 'master' into 'sprint/205'
# Conflicts:
# module/execution/lang/en.php
# module/execution/lang/zh-cn.php
|
2022-06-22 09:21:12 +00:00 |
|
|
tanghucheng
|
1968070dd4
|
* Fix bug #24078.
|
2022-06-22 15:44:26 +08:00 |
|
|
tianshujie
|
7372f7f936
|
* Finish story #32623.
|
2022-06-22 08:51:05 +08:00 |
|
|
王怡栋
|
dba55ec299
|
Merge branch 'sprint/205_zhouxudong_57872' into 'sprint/205'
Sprint/205 zhouxudong 57872
See merge request easycorp/zentaopms!4040
|
2022-06-21 06:04:16 +00:00 |
|
|
zhouxudong
|
4dd1445e8b
|
* Finish task #57872.
|
2022-06-21 05:48:57 +00:00 |
|
|
zhouxudong
|
e3ae6ed6a0
|
* Finish task #57871.
|
2022-06-21 01:31:23 +00:00 |
|
|
王怡栋
|
4739911510
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #23766
See merge request easycorp/zentaopms!4022
|
2022-06-20 07:49:59 +00:00 |
|
|
lanzongjun
|
d5afe20770
|
* fix bug #23766
|
2022-06-20 15:46:10 +08:00 |
|
|
王怡栋
|
946d5cb782
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #23766
See merge request easycorp/zentaopms!4015
|
2022-06-20 03:18:59 +00:00 |
|
|
lanzongjun
|
6786b4d08c
|
* fix bug #23932
|
2022-06-20 11:17:34 +08:00 |
|
|
tanghucheng
|
09268cfe23
|
* Fix bug .
|
2022-06-20 10:50:54 +08:00 |
|
|
lanzongjun
|
2c49643589
|
* fix bug #23766
|
2022-06-20 09:40:46 +08:00 |
|
|
liumengyi
|
4961913efe
|
* Optimize code.
|
2022-06-17 14:15:33 +08:00 |
|