 zhouxudong
|
bf002dcd83
|
* Finish task #49289.
|
2022-02-23 14:11:38 +08:00 |
|
|
liyuchun
|
2610958bf1
|
Merge branch 'sprint/185_zxd_49693' into sprint/185
|
2022-02-23 13:09:53 +08:00 |
|
|
李玉春
|
e637d830ee
|
Merge branch 'sprint/185' into 'sprint/185_zxd_49693'
# Conflicts:
# module/execution/js/kanban.js
# module/execution/view/kanban.html.php
|
2022-02-23 05:08:23 +00:00 |
|
|
周旭东
|
b8d6136e67
|
Update control.php
|
2022-02-23 05:01:37 +00:00 |
|
|
王怡栋
|
4fe35caf8e
|
Merge branch 'sprint/185_fixbug_lanzongjun_49335' into 'sprint/185'
* Fix bug #49335
See merge request easycorp/zentaopms!1910
|
2022-02-23 04:58:52 +00:00 |
|
|
Zongjun Lan
|
245a062277
|
modify code format
|
2022-02-23 11:34:17 +08:00 |
|
|
Zongjun Lan
|
91f09fe484
|
modify code format
|
2022-02-23 11:27:10 +08:00 |
|
|
王怡栋
|
f385246fb0
|
Merge branch 'sprint/185_tanghucheng_49697' into 'sprint/185'
* Code for task #49697.
See merge request easycorp/zentaopms!1906
|
2022-02-23 03:15:41 +00:00 |
|
|
孙广明
|
79824c2fbf
|
Merge branch 'sprint/185_zhangzilong_49284' into 'sprint/185'
* Code for bug #19780.
See merge request easycorp/zentaopms!1911
|
2022-02-23 03:15:27 +00:00 |
|
|
tanghucheng
|
b3a798f9a4
|
* code for task #49697.
|
2022-02-23 11:14:11 +08:00 |
|
|
Zongjun Lan
|
f6b9ade20a
|
* Fix bug #49335
|
2022-02-23 11:07:27 +08:00 |
|
|
zhangzilong
|
43227e2ba5
|
* Code for bug #19780.
|
2022-02-23 11:00:11 +08:00 |
|
|
tanghucheng
|
09450e0023
|
Merge branch 'sprint/185' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/185_tanghucheng_49697
|
2022-02-23 10:59:35 +08:00 |
|
|
王怡栋
|
a301feed87
|
Merge branch 'sgm_upgrade' into 'sprint/185'
* Code for upgrade.
See merge request easycorp/zentaopms!1907
|
2022-02-23 02:53:13 +00:00 |
|
|
孙广明
|
2276e1430f
|
* Code for upgrade.
|
2022-02-23 10:49:29 +08:00 |
|
|
李玉春
|
1cecf322af
|
Merge branch 'sprint/185_zhengrunyu_Fixbug' into 'sprint/185'
* Fix bug 19890 19891.
See merge request easycorp/zentaopms!1905
|
2022-02-23 02:41:09 +00:00 |
|
|
tanghucheng
|
adb6f14e59
|
* Code for task #49697.
|
2022-02-23 10:39:51 +08:00 |
|
|
zhengrunyu
|
269ac9742e
|
* Fix bug 19890 19891.
|
2022-02-23 10:37:23 +08:00 |
|
|
周旭东
|
560d2a5413
|
Update control.php
|
2022-02-23 02:31:01 +00:00 |
|
|
周旭东
|
163be2e819
|
Update control.php
|
2022-02-23 02:29:55 +00:00 |
|
|
zhouxudong
|
72e07aa44f
|
* Finish task #49693.
|
2022-02-23 10:28:13 +08:00 |
|
|
王怡栋
|
f70f6c9f6b
|
Merge branch 'sgm_upgrade' into 'sprint/185'
* Code for upgrade.
See merge request easycorp/zentaopms!1899
|
2022-02-23 02:18:07 +00:00 |
|
|
孙广明
|
3782342638
|
* Fix bug.
|
2022-02-23 10:17:38 +08:00 |
|
|
孙广明
|
2d2270b477
|
* Code for upgrade.
|
2022-02-23 10:13:14 +08:00 |
|
|
zhouxudong
|
eb3894a900
|
* Finish task #49693.
|
2022-02-23 09:58:03 +08:00 |
|
|
王怡栋
|
92bc66a943
|
Merge branch 'sprint/185_lwr_removeExtensionErrorFromSidebar_bug19033' into 'sprint/185'
* remove get extension error from sidebar, bug #19033.
See merge request easycorp/zentaopms!1901
|
2022-02-23 01:57:29 +00:00 |
|
|
孙广明
|
a0e6aed9e9
|
Merge branch 'sprint/185_fixbug_wangyidong' into sprint/185
|
2022-02-23 09:57:21 +08:00 |
|
|
孙广明
|
a71557ce9f
|
Merge branch 'sprint/185' into 'sprint/185_fixbug_wangyidong'
# Conflicts:
# extension/lite/action/ext/lang/zh-cn/lite.php
|
2022-02-23 01:56:56 +00:00 |
|
|
孙广明
|
64c8871c63
|
* Merge code.
|
2022-02-23 09:56:12 +08:00 |
|
|
王怡栋
|
545ba95f90
|
* code for task #49372.
|
2022-02-23 09:55:38 +08:00 |
|
|
王怡栋
|
e84d124450
|
Merge branch 'sprint/185_lwr_moduleToVolume_bug19489' into 'sprint/185'
* change wording for modules in lite vision, bug #19489.
See merge request easycorp/zentaopms!1896
|
2022-02-23 01:55:34 +00:00 |
|
|
王怡栋
|
3dab723ab4
|
Merge branch 'sprint/185_lwr_fixTodoNameBoxLabel_bug19011' into 'sprint/185'
* use actual idvalue name for todo create/edit, bug #19011.
See merge request easycorp/zentaopms!1892
|
2022-02-23 01:54:53 +00:00 |
|
|
孙广明
|
e4552821b0
|
Merge branch 'sprint/185' into 'sprint/185_fixbug_wangyidong'
# Conflicts:
# extension/lite/action/ext/lang/zh-cn/lite.php
|
2022-02-23 01:54:46 +00:00 |
|
|
Wenrui LI
|
6c7156fa86
|
* remove get extension error from sidebar, bug #19033.
|
2022-02-23 09:39:38 +08:00 |
|
|
李玉春
|
747e4a3a8d
|
Merge branch 'sprint/185_zhengrunyu_Fixbug' into 'sprint/185'
*Delete null.
See merge request easycorp/zentaopms!1900
|
2022-02-23 01:39:24 +00:00 |
|
|
zhengrunyu
|
c9f2aa8d5c
|
*Delete null.
|
2022-02-23 09:36:51 +08:00 |
|
|
liyuchun
|
2a359ed8d2
|
Merge branch 'sprint/185_zhengrunyu_49283' into sprint/185
|
2022-02-23 09:34:00 +08:00 |
|
|
李玉春
|
9405f7bf71
|
Merge branch 'sprint/185' into 'sprint/185_zhengrunyu_49283'
# Conflicts:
# db/update16.4.sql
# module/user/view/story.html.php
|
2022-02-23 01:33:37 +00:00 |
|
|
孙广明
|
88dd4ea767
|
* Code for upgrade.
|
2022-02-23 09:30:05 +08:00 |
|
|
孙广明
|
6ce7926bd8
|
Merge branch 'sprint/185_zhouxin_49692' into 'sprint/185'
Finish task #49692.
See merge request easycorp/zentaopms!1891
|
2022-02-23 01:25:22 +00:00 |
|
|
zhouxin
|
d8085ec0cd
|
Adjust code.
|
2022-02-23 01:23:43 +00:00 |
|
|
孙广明
|
054dd42a65
|
Merge branch 'sprint/185_zhangzilong_49284' into 'sprint/185'
*Fix bug 19780.
See merge request easycorp/zentaopms!1895
|
2022-02-23 01:21:39 +00:00 |
|
|
zhangzilong
|
0687aaba57
|
* Fix bug #19780.
|
2022-02-23 09:20:18 +08:00 |
|
|
zhangzilong
|
516c7b0133
|
* Fix bug #19780.
|
2022-02-23 09:18:47 +08:00 |
|
|
李玉春
|
d7a0925a22
|
Merge branch 'sprint/185_zhengrunyu_49306' into 'sprint/185'
Sprint/185 zhengrunyu 49306
See merge request easycorp/zentaopms!1897
|
2022-02-23 01:06:25 +00:00 |
|
|
zhengrunyu
|
51db3536d7
|
*Code bug.
|
2022-02-23 09:04:01 +08:00 |
|
|
zhengrunyu
|
d04ff0a6d9
|
* Finish task 49306.
|
2022-02-23 09:00:37 +08:00 |
|
|
Wenrui LI
|
d38fc515bc
|
* change wording for modules in lite vision, bug #19489.
|
2022-02-23 08:59:52 +08:00 |
|
|
zhangzilong
|
8d9439d0e6
|
* Fix bug #19780.
|
2022-02-23 08:57:32 +08:00 |
|
|
王怡栋
|
5f13e1e4ab
|
* code for task #49359.
|
2022-02-23 08:48:58 +08:00 |
|