 王怡栋
|
db007fe5eb
|
Merge branch 'sprint/211_tianshujie_59472' into 'master'
Sprint/211 tianshujie 59472
See merge request easycorp/zentaopms!4327
|
2022-07-05 01:54:17 +00:00 |
|
|
tianshujie
|
87160bf3a5
|
* Fix bug #24718.
|
2022-07-05 09:53:43 +08:00 |
|
|
tianshujie
|
63834e128c
|
* Fix bug #24718.
|
2022-07-05 09:52:13 +08:00 |
|
|
tianshujie
|
de4ae73289
|
* Fix bug #24718.
|
2022-07-05 08:46:11 +08:00 |
|
|
孙广明
|
ceb40be97a
|
Merge branch 'liyuchun_59437' into 'master'
* Finish task #59437,59438.
See merge request easycorp/zentaopms!4320
|
2022-07-04 09:23:50 +00:00 |
|
|
tianshujie
|
3028701a06
|
* Finish task #59472.
|
2022-07-04 17:18:20 +08:00 |
|
|
liyuchun
|
dd893ce8e1
|
* Finish task #59437,59438.
|
2022-07-04 07:36:29 +00:00 |
|
|
王怡栋
|
04b2a5994f
|
Merge branch 'sprint/208_tianshujie_58554' into 'master'
Sprint/208 tianshujie 58554
See merge request easycorp/zentaopms!4317
|
2022-07-04 06:59:21 +00:00 |
|
|
tianshujie
|
14037d612b
|
* Finish task #58554.
|
2022-07-04 14:58:56 +08:00 |
|
|
tianshujie
|
49ecf0795c
|
* Finish task #58554.
|
2022-07-04 14:57:07 +08:00 |
|
|
tianshujie
|
6fc6d25a48
|
* Finish task #58554.
|
2022-07-04 14:48:24 +08:00 |
|
|
wangyidong
|
c88aa6b8f1
|
Merge branch 'zentaomax35'
|
2022-07-04 14:16:06 +08:00 |
|
|
tianshujie
|
fedefaf02b
|
* Finish task #58554.
|
2022-07-04 13:20:33 +08:00 |
|
|
caoyanyi
|
30850025f5
|
* Modify tab menu.
|
2022-07-04 10:44:06 +08:00 |
|
|
孙广明
|
c4d5027b86
|
Merge branch 'fixbug_lang' into 'master'
Fixbug lang
See merge request easycorp/zentaopms!4271
|
2022-06-30 07:10:37 +00: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 |
|
|
王怡栋
|
90544b50e7
|
Merge branch 'sprint/208_liumengyi_fixbug' into 'master'
* Fix bug #23914, #23999, #24599.
See merge request easycorp/zentaopms!4264
|
2022-06-30 06:08:11 +00:00 |
|
|
liumengyi
|
61a1405ff2
|
* Fix bug #23914, #23999.
|
2022-06-30 14:03:24 +08:00 |
|
|
wangyidong
|
18a15b1d9d
|
* fix bug #23590.
|
2022-06-30 14:02:48 +08:00 |
|
|
liumengyi
|
076a744a0a
|
* Fix bug #23914, #23999.
|
2022-06-30 13:58:18 +08:00 |
|
|
tianshujie
|
98b100b6d1
|
* Add comments.
|
2022-06-30 13:40:43 +08:00 |
|
|
tianshujie
|
5a7778acbe
|
* Fixed TAB return error.
|
2022-06-30 13:37:34 +08:00 |
|
|
sunjun
|
db7d9edd07
|
fixbug_lang
|
2022-06-30 01:41:25 +00:00 |
|
|
xieqiyu
|
3dff44e506
|
* Fix bug#24370.
|
2022-06-30 08:24:25 +08:00 |
|
|
xieqiyu
|
7b579cfa1f
|
* Fix bug#24395.
|
2022-06-29 15:37:04 +08:00 |
|
|
王怡栋
|
d642a4238b
|
Merge branch 'sprint/208_tianshujie_58552' into 'master'
Sprint/208 tianshujie 58552
See merge request easycorp/zentaopms!4187
|
2022-06-28 06:30:45 +00:00 |
|
|
tianshujie
|
f994051ea8
|
* Finish task #58552.
|
2022-06-28 12:16:11 +08:00 |
|
|
tanghucheng
|
a8834418f1
|
* Fix bug #24340.
|
2022-06-27 16:50:39 +08:00 |
|
|
王怡栋
|
8ad9dea460
|
Merge branch 'sprint/xuan_106' into 'master'
Sprint/xuan 106
See merge request easycorp/zentaopms!4126
|
2022-06-24 01:35:58 +00:00 |
|
|
dingyongliang
|
7963845b6b
|
* mv style to x.style.css.
|
2022-06-24 01:32:03 +00:00 |
|
|
tanghucheng
|
25d4830892
|
* Fix code format.
|
2022-06-24 08:30:07 +08:00 |
|
|
tianshujie
|
9edd795598
|
* Fix bug #23398.
|
2022-06-23 15:40:52 +08:00 |
|
|
王怡栋
|
f23d4b8abd
|
Merge branch 'sprint/206_tianshujie_58288' into 'master'
Sprint/206 tianshujie 58288
See merge request easycorp/zentaopms!4109
|
2022-06-23 07:08:36 +00:00 |
|
|
tianshujie
|
bf7f947f72
|
* Finish task #58288.
|
2022-06-23 15:05:22 +08:00 |
|
|
tianshujie
|
6643dd1254
|
* Resolve issue #681.
|
2022-06-23 15:04:52 +08:00 |
|
|
王怡栋
|
748f1ffedf
|
Merge branch 'master' into 'sgm_prjadmin'
# Conflicts:
# db/update17.1.sql
|
2022-06-23 05:00:48 +00:00 |
|
|
孙广明
|
458688e636
|
* Code for project admin.
|
2022-06-23 09:46:34 +08:00 |
|
|
孙广明
|
a67ba3e0aa
|
* Code for project admin.
|
2022-06-22 23:07:27 +08:00 |
|
|
王怡栋
|
03c76b1565
|
Merge branch 'master' into 'sprint/206'
# Conflicts:
# db/update17.1.sql
|
2022-06-22 07:26:11 +00:00 |
|
|
李玉春
|
497b32f627
|
Merge branch 'zenops_36' into 'master'
Zenops 36
See merge request easycorp/zentaopms!4066
|
2022-06-22 07:18:41 +00:00 |
|
|
wangyidong
|
1e7ec30f10
|
* fix bug for build url in PATH_INFO.
|
2022-06-22 11:45:26 +08:00 |
|
|
tianshujie
|
3c428752cc
|
* Finish task #57893.
|
2022-06-22 09:45:54 +08:00 |
|
|
tianshujie
|
7372f7f936
|
* Finish story #32623.
|
2022-06-22 08:51:05 +08:00 |
|
|
caoyanyi
|
dfbf69a211
|
* Finish task #57664.
|
2022-06-21 10:33:12 +08:00 |
|
|
tanghucheng
|
bd259de8ca
|
* Fix bug .
|
2022-06-20 16:54:25 +08:00 |
|
|
宋辰轩
|
9460102a29
|
* Format.
|
2022-06-20 15:11:29 +08:00 |
|
|
宋辰轩
|
0b83f28fe9
|
* CommonLang.
|
2022-06-20 15:09:59 +08:00 |
|
|
dingyongliang
|
0774bce6ef
|
* electron/zentao: merge navigation bar and control bar.
|
2022-06-17 09:18:07 +00:00 |
|
|
zhouxin
|
a6c7038d6c
|
* Code for review.
|
2022-06-17 03:19:45 +00:00 |
|