 zhouxudong
|
1e1ce39096
|
* Fix bug #24736 #24738 #24745 #24748 #24844 #24849.
|
2022-07-06 06:18:09 +00:00 |
|
|
tianshujie
|
8c173c0770
|
* Fix bug #24686.
|
2022-07-04 15:01:46 +08:00 |
|
|
tianshujie
|
31dda1ebb8
|
* Fix bug #24686.
|
2022-07-04 08:16:34 +08:00 |
|
|
zenggang
|
3b87d63a4b
|
* Fix bug #24663
|
2022-07-01 02:59:20 +00:00 |
|
|
tianshujie
|
c971b72c48
|
* Fix bug #24579.
|
2022-06-30 14:19:48 +08:00 |
|
|
tianshujie
|
a9f92875b4
|
* Fix the expiration message displayed on the login page of the new installation environment.
|
2022-06-30 08:55:20 +08:00 |
|
|
王怡栋
|
e05ac602cc
|
Merge branch 'master_xieqiyu_58567' into 'master'
Master xieqiyu 58567
See merge request easycorp/zentaopms!4197
|
2022-06-28 09:31:57 +00:00 |
|
|
xieqiyu
|
a757ea76c1
|
* Code for task#58567.
|
2022-06-28 17:23:20 +08:00 |
|
|
xieqiyu
|
3d7fd651db
|
* Code for task#58567.
|
2022-06-28 16:11:40 +08:00 |
|
|
wangyidong
|
4f5b6a6597
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-06-28 15:29:41 +08:00 |
|
|
wangyidong
|
549bd70626
|
* code for bug #24381.
|
2022-06-28 15:29:11 +08:00 |
|
|
xieqiyu
|
320c88d44d
|
* Finish task#58584.
|
2022-06-28 13:30:51 +08:00 |
|
|
朱金勇
|
88e2ca8a01
|
Merge branch 'sprint/scx_tokenlogin' into 'master'
* Login action are recorded by default.
See merge request easycorp/zentaopms!4130
|
2022-06-24 07:42:01 +00:00 |
|
|
hufangzhou
|
eebcfaad58
|
* Adjust the spacing of dynamic block and dynamic page.
|
2022-06-24 13:33:11 +08:00 |
|
|
宋辰轩
|
1bcbbdaa68
|
* Login action are recorded by default.
|
2022-06-24 10:29:04 +08:00 |
|
|
王怡栋
|
176239c74d
|
Merge branch 'master_xieqiyu_57850' into 'master'
* Code for task#57850.
See merge request easycorp/zentaopms!4122
|
2022-06-23 09:27:32 +00:00 |
|
|
xieqiyu
|
d4ac1b4a5f
|
* Code for task#57850.
|
2022-06-23 17:20:19 +08:00 |
|
|
zenggang
|
f1c802d979
|
* Fix bug#24184
|
2022-06-23 07:28:21 +00:00 |
|
|
孙广明
|
6d88c0c22b
|
* Code for code error.
|
2022-06-23 14:16:01 +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 |
|
|
王怡栋
|
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 |
|