 wangyidong
|
790dcefa53
|
* remove ztCloud.
|
2021-07-02 16:16:22 +08:00 |
|
|
wangyidong
|
f3681dc1f6
|
* adjust for gitlab.
|
2021-07-02 15:00:07 +08:00 |
|
|
wangyidong
|
6c250a97f9
|
* finish task #39794.
|
2021-07-02 14:08:08 +08:00 |
|
|
wangyidong
|
5016d4751d
|
* finish task #39796.
|
2021-07-02 11:26:13 +08:00 |
|
|
wangyidong
|
04faa67fc7
|
Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0
|
2021-07-02 10:54:43 +08:00 |
|
|
wangyidong
|
6f4b4588ab
|
* fix for gitlab.
|
2021-07-02 10:54:24 +08:00 |
|
|
wangyidong
|
c287a0cb49
|
* adjust code.
|
2021-07-01 16:56:59 +08:00 |
|
|
wangyidong
|
f98d12dee8
|
Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0
|
2021-07-01 08:20:21 +08:00 |
|
|
wangyidong
|
f407f70700
|
* adjust for book.
|
2021-07-01 08:19:49 +08:00 |
|
|
wangyidong
|
69e62a08da
|
* adjust for style.
|
2021-06-29 16:01:06 +08:00 |
|
|
wangyidong
|
cefd614900
|
* fix bug and adjust for createLink params.
|
2021-06-29 14:31:58 +08:00 |
|
|
wangyidong
|
bfb6b438dc
|
* adjust for gitlab.
|
2021-06-29 13:07:56 +08:00 |
|
|
wangyidong
|
9aec0e4450
|
Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0
|
2021-06-29 09:11:11 +08:00 |
|
|
wangyidong
|
5fb6d97efd
|
* adjust error.
|
2021-06-29 09:10:57 +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 |
|
|
wangyidong
|
b77d480ce0
|
* fix bug.
|
2021-06-24 15:00:01 +08:00 |
|
|
wangyidong
|
aedf5935d1
|
+ add version and upgrade.
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
wangyidong
|
b20038e6c2
|
* finish task #38734.
|
2021-06-21 13:14:13 +08:00 |
|
|
wangyidong
|
ad99443429
|
Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0
|
2021-06-21 10:56:17 +08:00 |
|
|
wangyidong
|
d30e533e92
|
* finish task #38761.
|
2021-06-21 10:56:04 +08:00 |
|
|
wangyidong
|
d45bb9c4f2
|
* finish task #38726.
|
2021-06-17 14:57:30 +08:00 |
|
|
wangyidong
|
ae771f7405
|
* finish task #39379.
|
2021-06-17 14:53:29 +08:00 |
|
|
wangyidong
|
683e3b40e4
|
* adjust for api send error.
|
2021-06-17 14:52:18 +08:00 |
|
|
wangyidong
|
0f9f9ae9f5
|
* fix bug.
|
2021-06-17 14:48:58 +08:00 |
|
|
wangyidong
|
6a0674c3db
|
* fix for api.
|
2021-06-17 14:48:24 +08:00 |
|
|
wangyidong
|
82c3c82d23
|
* adjust for convert to pinyin for picker.
|
2021-06-17 14:46:54 +08:00 |
|
|
wangyidong
|
aaf5288a6d
|
Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0
|
2021-06-17 14:30:48 +08:00 |
|
|
wangyidong
|
6441e05b1d
|
* finish task #38735.
|
2021-06-17 14:30:30 +08:00 |
|
|
wangyidong
|
3e626efb0b
|
Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0
|
2021-06-15 17:28:32 +08:00 |
|
|
wangyidong
|
17578d3a8c
|
* fix bug.
|
2021-06-15 17:28:14 +08:00 |
|
|
wangyidong
|
5e371ace2d
|
* add new version and upgrade.
|
2021-06-12 15:46:12 +08:00 |
|
|
wangyidong
|
d13ef4c690
|
Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0
|
2021-06-11 16:51:40 +08:00 |
|
|
wangyidong
|
4d5bacb823
|
* adjust for web page.
|
2021-06-11 16:51:28 +08:00 |
|
|
wangyidong
|
3f7fdecfc4
|
Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0
|
2021-06-08 13:33:47 +08:00 |
|
|
wangyidong
|
3893084999
|
* adjust for mhtml.
|
2021-06-08 13:33:34 +08:00 |
|
|
wangyidong
|
608b41e153
|
Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0
|
2021-06-07 14:37:47 +08:00 |
|
|
wangyidong
|
dd9214da2f
|
* adjust for upgrade.
|
2021-06-07 14:37:32 +08:00 |
|
|
wangyidong
|
aacf8c1e1b
|
Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0
|
2021-06-07 14:13:17 +08:00 |
|
|
wangyidong
|
08de61a26c
|
* fix bug and merge from master.
|
2021-06-07 14:13:01 +08:00 |
|
|
wangyidong
|
8d75769726
|
Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0
|
2021-06-07 11:31:32 +08:00 |
|
|
wangyidong
|
773356c97c
|
* fix bug for xuanxuan get dept.
|
2021-06-07 11:30:10 +08:00 |
|
|
wangyidong
|
9a0512f334
|
* add zh-tw lang.
|
2021-06-06 09:46:11 +08:00 |
|
|
wangyidong
|
b6676572f0
|
* merge from 15.0.beta3.
|
2021-06-06 09:05:34 +08:00 |
|
|
wangyidong
|
968c88329a
|
* fix bug.
|
2021-06-05 15:40:09 +08:00 |
|
|
wangyidong
|
a07123b8cb
|
* adjust for upgrade.
|
2021-06-05 15:22:26 +08:00 |
|
|
wangyidong
|
769e6b433b
|
* merge from 15.0.beta3.
|
2021-06-05 13:01:53 +08:00 |
|
|
wangyidong
|
b712c10fbd
|
Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3
|
2021-05-10 16:04:14 +08:00 |
|
|
wangyidong
|
cb2fb0ccdc
|
* set default value for systemMode.
|
2021-05-10 16:03:50 +08:00 |
|
|
wangyidong
|
bfe532113f
|
Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3
|
2021-05-10 14:38:21 +08:00 |
|
|
wangyidong
|
3ed2493a59
|
* adjust for php5.3
|
2021-05-10 14:38:01 +08:00 |
|
|
wangyidong
|
1f24c935c2
|
Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3
|
2021-05-10 11:15:51 +08:00 |
|
|
wangyidong
|
8e003ff449
|
* fix error.
|
2021-05-10 11:15:31 +08:00 |
|
|
wangyidong
|
910521d3d0
|
Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3
|
2021-05-07 09:20:19 +08:00 |
|
|
wangyidong
|
56cb93207b
|
* adjust for demo sql.
|
2021-05-07 09:19:34 +08:00 |
|
|
wangyidong
|
5384ba4acf
|
Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3
|
2021-05-06 15:35:47 +08:00 |
|
|
wangyidong
|
e9fe38f8d4
|
* fix error.
|
2021-05-06 15:35:32 +08:00 |
|
|
wangyidong
|
d95cbe7dcb
|
* adjust for upgrade.
|
2021-05-06 13:02:01 +08:00 |
|
|
wangyidong
|
5119c6ea28
|
Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3
|
2021-05-06 11:35:05 +08:00 |
|
|
wangyidong
|
19a098481e
|
* adjust demo sql and fix ls gitlib.
|
2021-05-06 11:34:33 +08:00 |
|
|
wangyidong
|
5f8cecdfa9
|
* fix bug.
|
2021-04-30 16:01:28 +08:00 |
|
|
wangyidong
|
3785a39325
|
* adjust for zh-tw lang.
|
2021-04-30 14:14:43 +08:00 |
|
|
wangyidong
|
c5fe348490
|
* adjust for upgrade.
|
2021-04-30 13:55:45 +08:00 |
|
|
wangyidong
|
3f75e066e3
|
* fix bug.
|
2021-04-30 13:17:43 +08:00 |
|
|
wangyidong
|
5b0230c7ce
|
* adjust for demo sql.
|
2021-04-30 11:44:26 +08:00 |
|
|
wangyidong
|
970e666d4c
|
Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3
|
2021-04-30 11:23:58 +08:00 |
|
|
wangyidong
|
8fbb5c1c89
|
* adjust for upgrade.
|
2021-04-30 11:23:46 +08:00 |
|
|
wangyidong
|
fd2cea594a
|
* adjust for create doc.
|
2021-04-30 09:26:50 +08:00 |
|
|
wangyidong
|
107dd03c42
|
* adjust for xuanxuan.
|
2021-04-30 08:50:22 +08:00 |
|
|
wangyidong
|
3d6e0158af
|
* adjust for demo sql.
|
2021-04-29 17:16:39 +08:00 |
|
|
wangyidong
|
c4184ed4bc
|
Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3
|
2021-04-29 16:10:14 +08:00 |
|
|
wangyidong
|
bc64f29551
|
* fix for xuanxuan.
|
2021-04-29 16:09:51 +08:00 |
|
|
wangyidong
|
b8d1cc17d8
|
* adjust for demo.
|
2021-04-29 14:18:58 +08:00 |
|
|
wangyidong
|
d80bc64add
|
* adjust for upgrade.
|
2021-04-29 13:33:27 +08:00 |
|
|
wangyidong
|
f8f39f8f95
|
* change for upgrade.
|
2021-04-29 13:05:34 +08:00 |
|
|
wangyidong
|
76c1de90af
|
Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3
|
2021-04-29 12:11:05 +08:00 |
|
|
wangyidong
|
57e1291823
|
* fix bug #12452.
|
2021-04-29 12:10:34 +08:00 |
|
|
wangyidong
|
180405a9d1
|
Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3
|
2021-04-29 11:31:28 +08:00 |
|
|
wangyidong
|
fb21c70896
|
* adjust for xuanxuan upgrade.
|
2021-04-29 11:31:12 +08:00 |
|
|
wangyidong
|
64501298c8
|
Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3
|
2021-04-29 10:56:13 +08:00 |
|
|
wangyidong
|
4bb52f334f
|
* code for xuanxuan.
|
2021-04-29 10:55:42 +08:00 |
|
|
wangyidong
|
2f0c62524c
|
Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3
|
2021-04-28 16:28:28 +08:00 |
|
|
wangyidong
|
faf4c2b4dd
|
* fix bug and xuanxuan.
|
2021-04-28 16:27:34 +08:00 |
|