 王怡栋
|
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 |
|
|
leiyong
|
ae55e2c31e
|
* Fix bug#23841.
|
2022-06-17 01:30:09 +00:00 |
|
|
wangyidong
|
048c5e362e
|
* adjust for project batchedit menu.
|
2022-06-16 15:51:06 +08:00 |
|
|
孙广明
|
7383076af1
|
Merge branch 'sgm_fixbug' into 'master'
* Finsih task #57157.
See merge request easycorp/zentaopms!3978
|
2022-06-16 06:56:04 +00:00 |
|
|
孙广明
|
4ea6925479
|
* Finsih task #57157.
|
2022-06-16 14:51:22 +08:00 |
|
|
tianshujie
|
604996bcae
|
* Changing variable names.
|
2022-06-16 11:38:32 +08:00 |
|
|
孙广明
|
1315cf7ea8
|
Merge branch 'sgm_details' into 'master'
Sgm details
See merge request easycorp/zentaopms!3963
|
2022-06-16 02:48:43 +00:00 |
|
|
孙广明
|
3ead38f9f2
|
* Fix traincourse bug.
|
2022-06-16 10:48:09 +08:00 |
|
|
王怡栋
|
504319fcef
|
Merge branch 'leiyong_fix_bug_23735' into 'master'
* Fix bug#23793.
See merge request easycorp/zentaopms!3953
|
2022-06-16 01:03:22 +00:00 |
|
|
leiyong
|
32642d45ae
|
* Fix bug#23793.
|
2022-06-15 10:00:58 +00:00 |
|
|
王怡栋
|
62d83018f0
|
Merge branch 'sprint/master_tanghucheng' into 'master'
* Fix bug #23775.
See merge request easycorp/zentaopms!3944
|
2022-06-15 09:23:55 +00:00 |
|
|
孙广明
|
1f13b14799
|
Merge branch 'master' into 'sprint/204_tianshujie_57095'
# Conflicts:
# module/execution/css/all.css
|
2022-06-15 09:03:47 +00:00 |
|
|
tanghucheng
|
7d8325f469
|
* Fix bug #23775.
|
2022-06-15 16:12:03 +08:00 |
|
|
tianshujie
|
2c176439d3
|
* Finish task #57095.
|
2022-06-15 15:09:34 +08:00 |
|
|
leiyong
|
b79aab5d93
|
* Adjust style.
|
2022-06-14 10:25:10 +00:00 |
|
|
leiyong
|
8054e4f631
|
* Finish task#56925.
|
2022-06-14 08:55:28 +00:00 |
|
|
xieqiyu
|
c03d486fab
|
* Finish task#56919.
|
2022-06-14 15:55:48 +08:00 |
|
|
朱金勇
|
6620381bc7
|
Merge branch 'sprint/scx_fixapibug' into 'master'
* Fix api bug.
See merge request easycorp/zentaopms!3871
|
2022-06-13 06:01:56 +00:00 |
|
|
宋辰轩
|
f798c853a7
|
* Fix api bug.
|
2022-06-10 16:22:46 +08:00 |
|
|
孙广明
|
448bec0032
|
Merge branch 'liyuchun_56556' into 'master'
Liyuchun 56556
See merge request easycorp/zentaopms!3826
|
2022-06-09 09:22:37 +00:00 |
|
|
liyuchun
|
f1c720c4a0
|
* Finish task #56556.
|
2022-06-09 06:36:52 +00:00 |
|
|
wangyidong
|
11e6edcd22
|
Merge branch 'zdoo18'
|
2022-06-08 17:06:07 +08:00 |
|
|
孙广明
|
b896377846
|
* Change zentao license.
|
2022-06-08 10:02:29 +08:00 |
|
|
孙广明
|
b528156589
|
* Change license.
|
2022-06-08 09:34:46 +08:00 |
|
|
宋辰轩
|
328aea3be5
|
* Modify supportLang to defaultLang.
|
2022-06-07 10:56:42 +08:00 |
|
|
宋辰轩
|
d50f757397
|
* SupportLang.
|
2022-06-07 09:52:57 +08:00 |
|
|
孙广明
|
f8d681efac
|
* Fix bugs.
|
2022-06-06 13:54:06 +08:00 |
|