 holan20180123
|
db8a1a3c58
|
* Adjust import stroy to lib.
|
2021-06-28 14:06:27 +08:00 |
|
|
tianshujie98
|
2f3033138f
|
* Adjust code.
|
2021-06-28 13:09:58 +08:00 |
|
|
tianshujie98
|
626f7346fa
|
* Adjust code.
|
2021-06-28 13:03:16 +08:00 |
|
|
Yagami
|
c36f697aef
|
* Fix bug.
|
2021-06-28 12:02:57 +08:00 |
|
|
holan20180123
|
a55ddb6bd7
|
Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms
|
2021-06-28 11:37:33 +08:00 |
|
|
qiyu-xie
|
082ced2d7d
|
* Modify import from lib action.
|
2021-06-28 11:34:32 +08:00 |
|
|
qiyu-xie
|
9c21bf6aa6
|
* Finish task#39576.
|
2021-06-28 11:03:28 +08:00 |
|
|
holan20180123
|
57dee3d6a4
|
* Add action link for asset lib.
|
2021-06-28 10:03:47 +08:00 |
|
|
holan20180123
|
cb12197a3b
|
Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms
|
2021-06-28 08:13:30 +08:00 |
|
|
guanxiying
|
afb01a3a95
|
* Adjust the code.
|
2021-06-25 16:41:05 +08:00 |
|
|
holan20180123
|
1d600ede32
|
* Adjust import to asset lib.
|
2021-06-25 16:29:59 +08:00 |
|
|
wangyidong
|
eba2dbfaab
|
* adjust for svn diff to repo.
|
2021-06-25 11:19:09 +08:00 |
|
|
wangyidong
|
18d9724e14
|
Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0
|
2021-06-25 09:37:41 +08:00 |
|
|
wangyidong
|
d8d49be51f
|
* adjust for check compile status.
|
2021-06-25 09:36:52 +08:00 |
|
|
holan20180123
|
c7e4084d78
|
* Batch import stories to lib.
|
2021-06-25 09:12:36 +08:00 |
|
|
holan20180123
|
0ee9f999ea
|
* Code for task #39518.
|
2021-06-24 16:31:12 +08:00 |
|
|
tianshujie98
|
e3087ad9fb
|
Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0
|
2021-06-24 15:03:50 +08:00 |
|
|
tianshujie98
|
e6b9ec682f
|
* Fix bug.
|
2021-06-24 15:03:35 +08:00 |
|
|
wangyidong
|
b77d480ce0
|
* fix bug.
|
2021-06-24 15:00:01 +08:00 |
|
|
wangyidong
|
aedf5935d1
|
+ add version and upgrade.
zentaopms_15.0.3_20210624
|
2021-06-24 13:17:04 +08:00 |
|
|
wangyidong
|
d5890caba7
|
* finish task #38738.
|
2021-06-24 11:39:43 +08:00 |
|
|
wangyidong
|
e22638852f
|
Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0
|
2021-06-24 11:24:48 +08:00 |
|
|
wangyidong
|
11b261b4ca
|
* adjust for upgrade.
|
2021-06-24 11:24:32 +08:00 |
|
|
wangyidong
|
7556d9cdb3
|
* adjust for merge xuanxuan.
|
2021-06-24 10:03:54 +08:00 |
|
|
wangyidong
|
0da52a84a5
|
* fix bug #13302.
|
2021-06-24 10:02:31 +08:00 |
|
|
tianshujie98
|
16b137a9a0
|
* Add method of caselib module.
|
2021-06-24 09:07:48 +08:00 |
|
|
Hao Sun
|
e41fc21ece
|
* add new icon: icon-assets and icon-diamond.
# Conflicts:
# www/theme/zui/fonts/ZentaoIcon.eot
# www/theme/zui/fonts/ZentaoIcon.ttf
# www/theme/zui/fonts/ZentaoIcon.woff
|
2021-06-23 15:41:56 +08:00 |
|
|
Hao Sun
|
7556df707c
|
* add new icon: icon-assets and icon-diamond.
|
2021-06-23 15:06:53 +08:00 |
|
|
Hao Sun
|
c898114c7c
|
* bug #13286, fix xxs bug.
|
2021-06-22 16:51:14 +08:00 |
|
|
wangyidong
|
53baebf38e
|
* finish task #38728.
|
2021-06-22 16:45:45 +08:00 |
|
|
wangyidong
|
cb31662f7f
|
Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0
|
2021-06-22 16:02:53 +08:00 |
|
|
wangyidong
|
353278f136
|
* adjust for dev module.
|
2021-06-22 16:01:24 +08:00 |
|
|
Yagami
|
0cb06aaa53
|
* Fix code error.
|
2021-06-22 16:00:57 +08:00 |
|
|
wangyidong
|
2ca2752120
|
Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0
|
2021-06-22 15:39:40 +08:00 |
|
|
wangyidong
|
4e65665a40
|
* code for task #38701.
|
2021-06-22 15:39:14 +08:00 |
|
|
Yagami
|
00e9c35cff
|
* Fix btn border.
|
2021-06-22 14:25:52 +08:00 |
|
|
wangyidong
|
4cc730a685
|
Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0
|
2021-06-22 11:36:46 +08:00 |
|
|
wangyidong
|
74f01e94bb
|
* finish task #38705.
|
2021-06-22 11:36:26 +08:00 |
|
|
wangyidong
|
d90c25c7f7
|
* finish task #38701.
|
2021-06-22 10:24:42 +08:00 |
|
|
tianshujie98
|
ff5efc984f
|
* Fix bug of doc module.
|
2021-06-22 09:22:12 +08:00 |
|
|
tianshujie98
|
166decfa53
|
* Fix bug of doc module.
|
2021-06-22 09:18:53 +08:00 |
|
|
Hao Sun
|
f8c9d4ff34
|
* skip to watch changes for search form.
|
2021-06-21 17:24:38 +08:00 |
|
|
wangyidong
|
1af22a4ae1
|
* finish task #38717.
|
2021-06-21 16:09:21 +08:00 |
|
|
wangyidong
|
b1b3b88759
|
* finish task #38722.
|
2021-06-21 15:58:57 +08:00 |
|
|
wangyidong
|
4c196fc621
|
Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0
|
2021-06-21 15:10:22 +08:00 |
|
|
wangyidong
|
205129859f
|
* finish task #38732.
|
2021-06-21 15:02:35 +08:00 |
|
|
Yagami
|
b6b31de401
|
* Finish task #38715.
|
2021-06-21 14:51:35 +08:00 |
|
|
tianshujie98
|
14b887c714
|
Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0
|
2021-06-21 14:49:32 +08:00 |
|
|
tianshujie98
|
1d6ffcd6b4
|
* Fix bug #13170.
|
2021-06-21 14:49:16 +08:00 |
|
|
Yagami
|
2e0f114c2f
|
* Remove unused field.
|
2021-06-21 14:40:35 +08:00 |
|