 wangyidong
|
c88aa6b8f1
|
Merge branch 'zentaomax35'
|
2022-07-04 14:16:06 +08: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 |
|
|
wangyidong
|
18a15b1d9d
|
* fix bug #23590.
|
2022-06-30 14:02:48 +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 |
|
|
xieqiyu
|
7b579cfa1f
|
* Fix bug#24395.
|
2022-06-29 15:37:04 +08:00 |
|
|
tianshujie
|
f994051ea8
|
* Finish task #58552.
|
2022-06-28 12:16:11 +08:00 |
|
|
tanghucheng
|
25d4830892
|
* Fix code format.
|
2022-06-24 08:30:07 +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 |
|
|
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 |
|
|
tanghucheng
|
bd259de8ca
|
* Fix bug .
|
2022-06-20 16:54:25 +08:00 |
|
|
zhouxin
|
a6c7038d6c
|
* Code for review.
|
2022-06-17 03:19:45 +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 |
|
|
孙广明
|
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 |
|
|
tanghucheng
|
7d8325f469
|
* Fix bug #23775.
|
2022-06-15 16:12:03 +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 |
|
|
孙广明
|
f8d681efac
|
* Fix bugs.
|
2022-06-06 13:54:06 +08:00 |
|
|
孙广明
|
61ad544156
|
Merge branch 'zentaopms_198'
|
2022-06-02 15:04:56 +08:00 |
|
|
zenggang
|
c95c50021d
|
* Adjust code
|
2022-06-02 05:33:38 +00:00 |
|
|
zenggang
|
982d1c72aa
|
* Adjust code
|
2022-06-02 05:32:33 +00:00 |
|
|
zenggang
|
fe5ec04749
|
* Code for task#55851
|
2022-06-02 05:22:12 +00:00 |
|
|
wangyidong
|
58e50c287c
|
* code for task #55554.
|
2022-06-01 17:16:45 +08:00 |
|
|
liumengyi
|
873df65437
|
* Fix bug #50321.
|
2022-06-01 16:23:25 +08:00 |
|
|
hufangzhou
|
48b0d60744
|
* Fix bug #23058.
|
2022-05-30 10:26:37 +08:00 |
|
|
李玉春
|
2ae9a39642
|
Merge branch 'sprint/194_liumengyi_fixbug' into 'master'
* Fix bug #22920.
See merge request easycorp/zentaopms!3598
|
2022-05-25 08:38:33 +00:00 |
|
|
liumengyi
|
5fad83c332
|
* Fix bug #22920.
|
2022-05-25 16:32:31 +08:00 |
|
|
孙广明
|
45398e9ac0
|
Merge branch 'sprint/192_leiyong_issue_647' into 'master'
* Issue 657 resolved.
See merge request easycorp/zentaopms!3587
|
2022-05-25 05:50:18 +00:00 |
|
|
liumengyi
|
39a163e0a8
|
* Fix bug for task #55254.
|
2022-05-24 16:04:10 +08:00 |
|
|
liumengyi
|
816999dbeb
|
* Finish task #55254.
|
2022-05-24 14:41:42 +08:00 |
|
|
wangyidong
|
967d24dd06
|
Merge branch 'sprint/189_package'
|
2022-05-24 10:32:09 +08:00 |
|
|
leiyong
|
20aa8a673e
|
* Issue 657 resolved.
|
2022-05-20 10:12:44 +00:00 |
|
|
wangyidong
|
2051f9a371
|
* code for bug #22577.
|
2022-05-20 10:56:23 +08:00 |
|
|
leiyong
|
b209e48e67
|
* Finish task#54489.
|
2022-05-20 01:43:32 +00:00 |
|
|
zhouxudong
|
86cb028806
|
* Finish task #54471.
|
2022-05-19 09:14:25 +00:00 |
|
|
zhouxudong
|
7ef420688e
|
* Finish task #54471.
|
2022-05-19 07:53:07 +00:00 |
|
|
孙广明
|
46e4eae295
|
* Finish task #54205.
|
2022-05-17 11:15:33 +08:00 |
|