 孙广明
|
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 |
|
|
李玉春
|
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 |
|
|
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 |
|
|
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 |
|
|
liumengyi
|
cd62501f36
|
* minor refactor.
|
2021-11-29 10:49:56 +08:00 |
|
|
李玉春
|
a5991c4f6a
|
Merge branch 'sprint/175_liumengyi_16869' into 'sprint/168'
* Fix bug #16869.
See merge request easycorp/zentaopms!637
|
2021-11-29 02:44:46 +00:00 |
|
|
liumengyi
|
235d7bbc0a
|
* Finish task #45157.
|
2021-11-29 10:43:05 +08:00 |
|
|
liumengyi
|
41d073f19d
|
* Finish task #45157.
|
2021-11-29 10:37:56 +08:00 |
|
|
liumengyi
|
5dbd0ad4b9
|
* Fix bug #16869.
|
2021-11-29 10:28:52 +08:00 |
|
|
李玉春
|
803a3524b9
|
Merge branch 'sprint/175_liumengyi_45156' into 'sprint/168'
* Finish task #45156.
See merge request easycorp/zentaopms!634
|
2021-11-29 02:10:47 +00:00 |
|
|
liumengyi
|
b6acb88c21
|
* Fix bug #16869.
|
2021-11-29 09:55:00 +08:00 |
|
|
liumengyi
|
2cfb89f727
|
* Finish task #45157.
|
2021-11-29 09:47:04 +08:00 |
|
|
zhouxin
|
456b7d06a1
|
Finish task 45107.
|
2021-11-29 01:35:28 +00:00 |
|
|
zhengrunyu
|
b3c8ee7ccb
|
*Finish task #45148.
|
2021-11-29 09:29:44 +08:00 |
|
|
孙广明
|
d33ab012e1
|
Merge branch 'sprint/175_liyuchun_45152' into 'sprint/168'
* Finish task #45152.
See merge request easycorp/zentaopms!627
|
2021-11-29 00:58:04 +00:00 |
|
|
liumengyi
|
0dcdc497a2
|
* Finish task #45156.
|
2021-11-29 08:37:47 +08:00 |
|
|
李玉春
|
5afe0b12b5
|
Merge branch 'sprint/175_liumengyi_45158' into 'sprint/168'
* Finish task #45158.
See merge request easycorp/zentaopms!624
|
2021-11-29 00:34:53 +00:00 |
|
|
liumengyi
|
143dff6f0b
|
* Finish task#45156.
|
2021-11-29 08:24:04 +08:00 |
|
|
liumengyi
|
f77c484548
|
* Finish task #45157.
|
2021-11-29 08:21:29 +08:00 |
|
|
朱金勇
|
8c1b5a2a5b
|
Merge branch 'sprint/168_sunhao/task44627' into 'sprint/168'
* task #44627, add web client entry button to bottom navbar in index page.
See merge request easycorp/zentaopms!632
|
2021-11-26 07:43:15 +00:00 |
|
|
孙浩
|
8ff597ece9
|
Merge branch 'sprint/168_qixinzhi_44858' into 'sprint/168'
* product plan card for xuanxuan extension
See merge request easycorp/zentaopms!628
|
2021-11-26 07:38:59 +00:00 |
|
|
Hao Sun
|
ba19230925
|
* improve UI for embed web client.
|
2021-11-26 15:38:06 +08:00 |
|