孙广明
|
8d9fb81d9d
|
Merge branch 'master' into 'sprint/174_hufangzhou_45085'
# Conflicts:
# module/story/model.php
|
2021-11-29 07:26:45 +00:00 |
|
hufangzhou
|
0965e74d0e
|
* Finish task #45085. Fix bug #16792.
|
2021-11-29 13:19:55 +08:00 |
|
zhujinyong
|
be26a7c731
|
* Fix errors of api.
|
2021-11-29 13:09:05 +08:00 |
|
zhujinyong
|
4b57e8627b
|
* Fix api of program.
|
2021-11-28 22:17:33 +08:00 |
|
王怡栋
|
9a80f35962
|
Merge branch 'sprint/app10'
|
2021-11-25 10:25:05 +08:00 |
|
王怡栋
|
11e5d04bf7
|
* fix bug #16439.
|
2021-11-23 13:47:12 +08:00 |
|
王怡栋
|
fde5cb61da
|
Merge branch 'sprint/app10' into sprint/170
|
2021-11-19 08:41:00 +08:00 |
|
zhouxin
|
b7e3fe9003
|
Finis task #44486,44487,44488.
|
2021-11-17 15:49:24 +08:00 |
|
王怡栋
|
7cc9e9f875
|
* code for task #44308.
|
2021-11-17 09:59:39 +08:00 |
|
zhouxin
|
e57d1d1cc7
|
Finish task #43916.
|
2021-11-12 14:06:44 +08:00 |
|
李玉春
|
d75156dd74
|
Merge branch 'sprint/170_songchenxuan_43918' into 'sprint/170'
* Finish task #43918.
See merge request easycorp/zentaopms!361
|
2021-11-09 06:00:23 +00:00 |
|
root
|
397fb3e152
|
Finish task #43918.
|
2021-11-09 13:58:39 +08:00 |
|
root
|
782d1114bf
|
Finish task #43918.
|
2021-11-09 13:47:30 +08:00 |
|
root
|
44c44f11d1
|
Finish task #43918.
|
2021-11-09 13:25:52 +08:00 |
|
root
|
f23ff798b9
|
Finish task #43918.
|
2021-11-09 13:23:37 +08:00 |
|
root
|
627ba8e493
|
Finish task #43918.
|
2021-11-09 13:18:44 +08:00 |
|
root
|
fdc54380ee
|
* Finish task #43918.
|
2021-11-09 13:08:58 +08:00 |
|
root
|
ab5ee93bc3
|
* Finish task #43918.
|
2021-11-09 11:26:25 +08:00 |
|
root
|
33539633d7
|
* Finish task #43918.
|
2021-11-09 10:35:17 +08:00 |
|
root
|
b9dc220fd9
|
* Finish task #43918
|
2021-11-09 08:35:27 +08:00 |
|
zhouxin
|
92fb767ff9
|
Finish task #43916.
|
2021-11-08 14:34:44 +08:00 |
|
mayue
|
c916df0117
|
* Fix bug #15780.
|
2021-11-03 15:05:44 +08:00 |
|
mayue
|
be67b785b3
|
* Fix bug #15780.
|
2021-11-03 14:50:48 +08:00 |
|
王怡栋
|
3cdf3b3395
|
Merge branch 'sprint/167_wangyidong_api' into sprint/app10
|
2021-11-01 15:35:49 +08:00 |
|
mayue
|
ef9821f709
|
*Fix a bug #15793.
|
2021-10-28 10:10:04 +08:00 |
|
mayue
|
60afff4fcd
|
*Fix a bug #15793.
|
2021-10-28 10:04:55 +08:00 |
|
mayue
|
a2a8552221
|
*Fix a bug #15793.
|
2021-10-28 09:52:35 +08:00 |
|
王怡栋
|
076f328914
|
* add lang for zentaoapp and adjust api.
|
2021-10-27 19:58:50 +08:00 |
|
王怡栋
|
001ca0ef8f
|
* code for task #43347.
|
2021-10-26 15:39:46 +08:00 |
|
hufangzhou
|
c576e60197
|
* Compatible with pro version in mobile.
|
2021-10-19 17:36:13 +08:00 |
|
xieqiyu
|
e9b614a72b
|
* Fix bug#15561.
|
2021-10-18 16:37:36 +08:00 |
|
王怡栋
|
351b07352b
|
Merge branch '15.6' into sprint/167
|
2021-10-18 08:53:13 +08:00 |
|
Hao Sun
|
1fbf34f9bc
|
* Task #43181, bug #15371, fix nest toggle in program table not work when close program dialog first time.
|
2021-10-15 15:31:30 +08:00 |
|
xieqiyu
|
5697ba482a
|
* Fix bug#15543.
|
2021-10-15 14:13:41 +08:00 |
|
王怡栋
|
8ee2811723
|
Merge branch '15.6' into sprint/167
|
2021-10-15 13:11:52 +08:00 |
|
xieqiyu
|
8e38b12360
|
* Code for bug#14879.
|
2021-10-15 08:06:44 +08:00 |
|
王怡栋
|
a44472fb45
|
Merge branch '15.6' into sprint/167
|
2021-10-14 15:48:14 +08:00 |
|
tianshujie
|
f5e1ceb880
|
* Finish task #43169.
|
2021-10-14 09:24:16 +08:00 |
|
hufangzhou
|
bf78fe9be4
|
* Add the 15.6 version and upgrade.
|
2021-10-12 09:35:39 +08:00 |
|
王怡栋
|
96a8ef6b04
|
Merge branch '15.5' into 165
|
2021-10-09 10:06:05 +08:00 |
|
孙广明
|
eada128988
|
* Fix bug #15335.
|
2021-09-27 14:32:33 +08:00 |
|
朱金勇
|
beaae9f167
|
Merge branch 'sprint/165_dingna_task42850' into 'sprint/165'
* Finish task #42850
See merge request easycorp/zentaopms!21
|
2021-09-26 04:01:53 +00:00 |
|
dingna
|
b416d20512
|
* Finish task #42850 Cost:0.5h
|
2021-09-26 09:51:02 +08:00 |
|
dingna
|
27670f7b3a
|
* Finish task #42851.
|
2021-09-24 09:31:23 +08:00 |
|
zenggang
|
1a0effc1e6
|
* Fix bug15211,14525
|
2021-09-17 09:51:23 +08:00 |
|
zenggang
|
ee07a042a4
|
* Fix bug#15211,14525
|
2021-09-16 17:31:40 +08:00 |
|
tianshujie
|
441cda176d
|
* Modify the global creation return link.
|
2021-09-15 15:56:19 +08:00 |
|
王怡栋
|
7757da97f5
|
* adjust for get wait project in program kanban.
|
2021-09-15 10:28:46 +08:00 |
|
xieqiyu
|
1085bc1288
|
* Fix bug#15020.
|
2021-09-14 17:27:56 +08:00 |
|
dingna
|
11729b9730
|
* Fix bug #15020.
|
2021-09-14 17:24:29 +08:00 |
|