 王怡栋
|
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 |
|
|
王怡栋
|
c69384617a
|
Merge branch 'master_xieqiyu_57850' into 'master'
* Code for task#57850.
See merge request easycorp/zentaopms!4083
|
2022-06-23 00:39:25 +00:00 |
|
|
孙广明
|
a67ba3e0aa
|
* Code for project admin.
|
2022-06-22 23:07:27 +08:00 |
|
|
孙广明
|
a58607bbaa
|
* Code for task #58217.
|
2022-06-22 18:25:02 +08:00 |
|
|
hufangzhou
|
48fb1a45f0
|
* Fix bug #24151.
|
2022-06-22 16:50:42 +08:00 |
|
|
tianshujie
|
e2669481c7
|
* Added German and French.
|
2022-06-22 15:28:45 +08:00 |
|
|
王怡栋
|
03c76b1565
|
Merge branch 'master' into 'sprint/206'
# Conflicts:
# db/update17.1.sql
|
2022-06-22 07:26:11 +00:00 |
|
|
xieqiyu
|
21b0217aa8
|
* Code for task#57850.
|
2022-06-22 13:15:44 +08:00 |
|
|
tianshujie
|
7372f7f936
|
* Finish story #32623.
|
2022-06-22 08:51:05 +08:00 |
|
|
tianshujie
|
226a7fc69b
|
* Finish task #57893.
|
2022-06-21 16:37:35 +08:00 |
|
|
tianshujie
|
f6f4bc5f7c
|
* Finish task #57894.
|
2022-06-21 15:13:21 +08:00 |
|
|
tianshujie
|
a6db8b4999
|
* Fix bug #24005.
|
2022-06-21 14:54:17 +08:00 |
|
|
tianshujie
|
42aa5a0f28
|
* Finish task #57894.
|
2022-06-21 14:05:36 +08:00 |
|
|
tianshujie
|
aab46a8414
|
* Finish task #57894.
|
2022-06-21 13:55:06 +08:00 |
|
|
tianshujie
|
367f96a886
|
* Finish task #57894.
|
2022-06-21 13:47:08 +08:00 |
|
|
tianshujie
|
b812104494
|
* Finish task #57894.
|
2022-06-21 13:14:06 +08:00 |
|
|
tianshujie
|
9585c4f031
|
* Finish task #57894.
|
2022-06-21 11:26:07 +08:00 |
|
|
tianshujie
|
30bff5f852
|
* Finish task #57894.
|
2022-06-21 11:15:16 +08:00 |
|
|
tianshujie
|
503f0feaa1
|
* Delete useless code.
|
2022-06-20 14:41:23 +08:00 |
|
|
tianshujie
|
837849a41a
|
* Finish task #57895.
|
2022-06-20 14:38:48 +08:00 |
|
|
zhouxudong
|
b7764e1518
|
* Fix bug #23787.
|
2022-06-16 05:55:43 +00:00 |
|
|
zhouxudong
|
1e7d999598
|
* Fix bug #23787.
|
2022-06-16 00:55:34 +00:00 |
|
|
leiyong
|
32b846cdf5
|
* Finish task#56926.
|
2022-06-15 07:57:50 +00:00 |
|
|
王怡栋
|
6325ce1ccc
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* recover user
See merge request easycorp/zentaopms!3872
|
2022-06-13 02:09:30 +00:00 |
|
|
lanzongjun
|
7c6b288878
|
* recover user
|
2022-06-10 17:26:57 +08:00 |
|
|
zenggang
|
8c5c2f2149
|
* Finish task#56549,56552
|
2022-06-10 00:51:11 +00:00 |
|
|
王怡栋
|
fd0cb543ba
|
Merge branch 'master' into 'sprint_200'
# Conflicts:
# module/execution/lang/en.php
# module/execution/lang/zh-cn.php
# module/execution/view/kanban.html.php
# module/kanban/css/space.css
|
2022-06-09 03:16:20 +00:00 |
|
|
wangyidong
|
11e6edcd22
|
Merge branch 'zdoo18'
|
2022-06-08 17:06:07 +08:00 |
|
|
leiyong
|
513b62abb0
|
* Adjust code.
|
2022-06-08 08:50:09 +00:00 |
|
|
lanzongjun
|
b31b45c11f
|
* finish task #56023
|
2022-06-08 15:44:50 +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 |
|
|
leiyong
|
bb31bbdca2
|
* Finish task#56360.
|
2022-06-07 07:55:58 +00:00 |
|
|
孙广明
|
61ad544156
|
Merge branch 'zentaopms_198'
|
2022-06-02 15:04:56 +08:00 |
|
|
孙广明
|
cf5dbf0f23
|
* Remove unused code.
|
2022-06-02 14:53:51 +08:00 |
|
|
孙广明
|
23d19bd6b3
|
* Code for export users.
|
2022-06-02 14:52:16 +08:00 |
|
|
leiyong
|
71a4c1099d
|
* Adjust the prompt text for plugin expiration.
|
2022-05-26 10:39:16 +00:00 |
|
|
leiyong
|
4744448fc5
|
* Adjust method name.
|
2022-05-26 07:43:52 +00:00 |
|
|
leiyong
|
ea4eb1d2de
|
* Finish task#54979.
|
2022-05-26 07:28:03 +00:00 |
|
|
李玉春
|
6b667195b1
|
Merge branch 'sprint/191_tianshujie_54329' into 'master'
Sprint/191 tianshujie 54329
See merge request easycorp/zentaopms!3496
|
2022-05-19 02:22:36 +00:00 |
|
|
tianshujie
|
db940f77fd
|
* Finish task #54329.
|
2022-05-19 09:43:34 +08:00 |
|
|
tianshujie
|
f0a7f24db9
|
* Finish task #54329.
|
2022-05-18 17:12:29 +08:00 |
|
|
tianshujie
|
f1f4c511b5
|
* Finish task #54329.
|
2022-05-18 16:08:09 +08:00 |
|
|
wangyidong
|
d6cf08b9d7
|
Merge branch 'tid'
|
2022-05-18 10:20:48 +08:00 |
|
|
zhouxudong
|
925aa3f8d8
|
* Finish task #54480.
|
2022-05-17 08:12:27 +00:00 |
|
|
zhouxudong
|
c097334f3b
|
* Finish task #54480.
|
2022-05-17 07:58:26 +00:00 |
|
|
zhouxudong
|
cca3f56437
|
* Finish task #54480.
|
2022-05-17 07:38:22 +00:00 |
|
|
孙广明
|
c4e649ef25
|
* Finish task #54186.
|
2022-05-17 09:35:32 +08:00 |
|
|
hufangzhou
|
401ea2f810
|
* Fix bug #22407.
|
2022-05-13 08:47:46 +08:00 |
|