 孙广明
|
d235b8e924
|
Merge branch 'feature/38477' into 'master'
* Finish task #87013, #87014, and fix bug #32881.
See merge request easycorp/zentaopms!7184
|
2023-03-14 09:15:08 +00:00 |
|
|
liumengyi
|
637b0912a7
|
* Finish task #87013.
|
2023-03-13 07:07:13 +00:00 |
|
|
tianshujie
|
80bea78979
|
* Add skip stash pager and method.
|
2023-03-13 14:39:37 +08:00 |
|
|
caoyanyi
|
234347cede
|
* Update project common language.
|
2023-03-07 15:58:38 +08:00 |
|
|
王怡栋
|
3438722a8c
|
Merge branch 'master' into 'zentaopms_289'
# Conflicts:
# db/update18.2.sql
|
2023-03-06 03:26:34 +00:00 |
|
|
Yagami
|
f95691948a
|
Merge branch 'zentaopms_294'
|
2023-03-06 08:37:11 +08:00 |
|
|
wangyidong
|
01bb8130dd
|
Merge branch 'zentaopms_289' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289
|
2023-03-01 08:50:31 +08:00 |
|
|
wangyidong
|
1a352410a6
|
* code for task #85503.
|
2023-03-01 08:49:44 +08:00 |
|
|
tianshujie
|
c82f1a02a7
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_ui
|
2023-02-28 13:13:13 +08:00 |
|
|
tianshujie
|
8898dd6f9c
|
* Code for fix bug #32447.
|
2023-02-27 16:38:18 +08:00 |
|
|
wangyidong
|
11507ffff2
|
* fix bug #32277.
|
2023-02-27 16:16:04 +08:00 |
|
|
liumengyi
|
4912b2004e
|
* Finish task #85630.
|
2023-02-27 06:54:39 +00:00 |
|
|
liugang
|
c9115f7a21
|
* Revert menus, privileges and pages of report.
|
2023-02-27 06:39:37 +00:00 |
|
|
liumengyi
|
bcae665178
|
* Fix bug #32337.
|
2023-02-22 08:56:31 +00:00 |
|
|
孔令茂
|
3e7b0daf91
|
* Resove feedback f2188, change privilege by modulue error.
|
2023-02-22 10:08:22 +08:00 |
|
|
孙广明
|
6c1ed365ab
|
Merge branch 'sprint/292_liumengyi_85038' into 'master'
* Finish task #85038, #85039, #85040.
See merge request easycorp/zentaopms!7010
|
2023-02-21 05:50:04 +00:00 |
|
|
liumengyi
|
95e3978fb0
|
* Finish task #85038, #85039.
|
2023-02-21 01:05:24 +00:00 |
|
|
tianshujie
|
d6266bc607
|
* Code for finish task #85047.
|
2023-02-20 14:47:10 +08:00 |
|
|
hufangzhou
|
75b5b2562c
|
* Finish task #84583.
|
2023-02-18 16:04:53 +00:00 |
|
|
tianshujie
|
13be8ec1a7
|
* Modify the language entry of the execution permission.
|
2023-02-17 14:04:54 +08:00 |
|
|
tianshujie
|
e6fa9625d5
|
* Fix bug #32224.
|
2023-02-16 15:59:03 +08:00 |
|
|
tianshujie
|
2a388d06a7
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285
|
2023-02-16 09:00:16 +08:00 |
|
|
hufangzhou
|
f3cd2e7d4d
|
* Change the Easy Soft to ZenTao Software.
|
2023-02-15 17:01:22 +08:00 |
|
|
tianshujie
|
bd95b1eb84
|
* Code for finish task #83733.
|
2023-02-09 11:54:01 +08:00 |
|
|
caoyanyi
|
03ed75a2d3
|
* Code for task #83742.
|
2023-02-08 12:44:50 +08:00 |
|
|
tianshujie
|
c29df55df8
|
* Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285
|
2023-02-08 10:39:45 +08:00 |
|
|
tianshujie
|
52568a67be
|
* Code for finish task #83722.
|
2023-02-07 16:29:02 +08:00 |
|
|
zhaoke
|
a31485ec89
|
Merge branch 'master' into zenops_61
|
2023-02-07 02:04:56 +00:00 |
|
|
tianshujie
|
1a1f8d3a07
|
* Put holiday permissions in the open source edition.
|
2023-02-06 17:05:37 +08:00 |
|
|
tianshujie
|
5b6978ed8b
|
* Finish task #83744.
|
2023-02-06 12:02:31 +08:00 |
|
|
tianshujie
|
a1aa671bb2
|
* Finish task #83745.
|
2023-02-06 10:35:12 +08:00 |
|
|
zenggang
|
97fcb6263e
|
* Delete snapshot
|
2023-02-03 05:19:53 +00:00 |
|
|
zenggang
|
597b77af82
|
* Edit snapshot
|
2023-02-02 08:31:06 +00:00 |
|
|
songpeiyan
|
bdd962fe94
|
* Fix bug #30856
|
2023-02-02 08:43:27 +08:00 |
|
|
songpeiyan
|
b1927d4cd2
|
*Fix bug #30856
|
2023-02-01 16:46:42 +08:00 |
|
|
tanghucheng
|
0d4ae4ba95
|
* Fix language.
|
2023-01-03 13:42:04 +08:00 |
|
|
tanghucheng
|
d837ce9ac4
|
* Fix code style.
|
2022-12-30 14:09:00 +08:00 |
|
|
tanghucheng
|
720365e1e2
|
Merge branch 'zenops_46' of https://gitlab.zcorp.cc/easycorp/zentaopms into zenops_46
|
2022-12-30 14:03:21 +08:00 |
|
|
zhaoke
|
e095b605f5
|
* Fix bug.
|
2022-12-30 05:54:20 +00:00 |
|
|
tanghucheng
|
62c1ed7f9c
|
Merge branch 'master' into zenops_46
|
2022-12-30 09:40:04 +08:00 |
|
|
tanghucheng
|
e1162e3582
|
* Fix bug .
|
2022-12-29 15:37:36 +08:00 |
|
|
田淑杰
|
866b4086e8
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/272
|
2022-12-29 15:22:13 +08:00 |
|
|
tanghucheng
|
fa37b1a503
|
* Add start and close pri.
|
2022-12-29 13:59:02 +08:00 |
|
|
田淑杰
|
f18c9b655e
|
* Fix bug #29041.
|
2022-12-26 10:27:25 +08:00 |
|
|
liugang
|
8100689bb2
|
Merge branch 'sprint/biz17'
|
2022-12-26 08:50:31 +08:00 |
|
|
liugang
|
0257517d94
|
* Add privilege control of screen.
|
2022-12-23 14:53:28 +08:00 |
|
|
tanghucheng
|
85ffa23da8
|
Merge branch 'master' into zenops_46_tanghucheng
|
2022-12-15 15:27:59 +08:00 |
|
|
tanghucheng
|
a454682370
|
* Finish task #78643.
|
2022-12-14 14:16:49 +08:00 |
|
|
孙广明
|
81d54c790e
|
* Finish task #79664.
|
2022-12-13 13:43:24 +08:00 |
|
|
tanghucheng
|
e11ec7993c
|
Merge branch 'zenops_46' into sprint/220
|
2022-12-09 13:49:30 +08:00 |
|