Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
26,321 Commits 2 Branches 292 Tags
46d47bdd67fee4e7321907d824133583f4a2e394
Commit Graph
1071 Commits
Author SHA1 Message Date
qiyu-xie dcb627fced * Fix issue#361. 2021-08-03 13:52:44 +08:00
wangyidong bbe793a8aa Merge branch '15.2' 2021-08-02 16:31:42 +08:00
Hao Sun 8de42e5bca * add space between icon and text. 2021-07-30 14:38:39 +08:00
zenggang cf9275cbae * Finisth task #40426 2021-07-22 13:27:43 +08:00
wangyidong 54ff43eb6f * add changelog and zh-tw lang. 2021-07-20 09:58:58 +08:00
qiyu-xie 34992b6a40 * Adjust code. 2021-07-16 14:00:27 +08:00
wangyidong 268c4e47b7 * finish task #40293. 2021-07-16 13:02:42 +08:00
zhujinyong 1677574443 * return before $this->send. 2021-07-16 09:40:41 +08:00
wangyidong 3034d24f2c * adjust for task #40020. 2021-07-12 10:09:39 +08:00
wangyidong 834d42610c * finish task #40020. 2021-07-08 13:11:27 +08:00
wangyidong fa4fa5941e Merge branch '15.0' 2021-07-06 19:28:30 +08:00
tianshujie98 51ff47c095 * Fix bug #13057. 2021-07-05 14:52:33 +08:00
wangyidong 6c250a97f9 * finish task #39794. 2021-07-02 14:08:08 +08:00
Yagami 18acf1cef6 * Fix progress block logic. 2021-06-29 16:24:26 +08:00
Yagami af3db56e35 * Adjust getRemind condition. 2021-06-21 10:03:51 +08:00
tianshujie98 c38c99e0a8 * Fix bug. 2021-06-18 16:17:04 +08:00
tianshujie98 00985acb35 * Fix bug 13246. 2021-06-18 13:36:50 +08:00
tianshujie98 be0f4320e6 * Fix bug #13248. 2021-06-18 11:25:28 +08:00
tianshujie98 abe711e334 * Finish task #39450. 2021-06-18 09:10:40 +08:00
tianshujie98 53cf8a8b2a * Finish task #39451. 2021-06-18 09:05:37 +08:00
Hao Sun 16adebed5e * fix remind in dashboard page not show after refresh. 2021-06-17 17:22:00 +08:00
tianshujie98 941525e672 * Adjust the jump app. 2021-06-16 13:31:34 +08:00
tianshujie98 5a6630e11e * Adjust code. 2021-06-15 17:12:40 +08:00
tianshujie98 c22b78a555 * Fix the problem of pending block. 2021-06-15 16:38:50 +08:00
tianshujie98 4de6fa1c01 * Ajust page. 2021-06-15 11:03:20 +08:00
tianshujie98 16b3845b2e * Add meeting to pending block. 2021-06-12 21:06:57 +08:00
wangyidong 769e6b433b * merge from 15.0.beta3. 2021-06-05 13:01:53 +08:00
leiyong 49cd722bd3 * Fix bug. 2021-05-31 12:27:16 +08:00
tianshujie98 6c47912596 * Fix bug #12755. 2021-05-24 08:56:11 +08:00
tianshujie98 12eeaa107a * Fix bug #12585. 2021-05-11 13:36:17 +08:00
hufangzhou 09e79ede45 * Fix bug #12486. 2021-05-06 14:30:44 +08:00
wangyidong 3785a39325 * adjust for zh-tw lang. 2021-04-30 14:14:43 +08:00
wangyidong 3d6e0158af * adjust for demo sql. 2021-04-29 17:16:39 +08:00
tianshujie98 b97ab834bf * Fix bug #12411. 2021-04-27 10:23:49 +08:00
holan20180123 2d921f8262 * Fix bug #12362. 2021-04-26 16:38:29 +08:00
hufangzhou 32e900f518 * Fix bug #12360. 2021-04-26 09:05:49 +08:00
tianshujie98 0c351122cd * Fix error. 2021-04-20 16:53:09 +08:00
tianshujie98 c844419a66 * Adjust style. 2021-04-20 15:00:33 +08:00
leiyong 01ea55e94a * Fix bug. 2021-04-16 08:12:50 +00:00
tianshujie98 de1f0c0798 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-16 15:12:33 +08:00
tianshujie98 3fc650e112 * Fix bug #12176. 2021-04-16 15:12:16 +08:00
qiyu-xie 251ec077b6 * Fix a bug. 2021-04-16 14:38:47 +08:00
tianshujie98 4aad17c101 * Finish task #37551. 2021-04-15 16:02:02 +08:00
holan20180123 a6e9f70abd * Finish task #37528. 2021-04-15 10:27:10 +08:00
tianshujie98 8c1de08633 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-15 08:21:32 +08:00
tianshujie98 985101a0f0 * Adjust the language items of the block module. 2021-04-15 08:20:46 +08:00
Yagami 38f23c454e * Adjust code. 2021-04-14 15:52:29 +08:00
Catouse d8185adb63 * fix table sorter not work in block with rows count larger than 10 after refresh block. 2021-04-12 16:27:21 +08:00
tianshujie98 3d57b26610 * Fix bug #11840. 2021-04-09 14:05:05 +08:00
wangyidong 44a6ed5a8c * fix for bug #11891. 2021-04-09 12:11:48 +08:00