Commit Graph
223 Commits
Author SHA1 Message Date
Yagami d587642cb1 * Merge code. 2020-11-27 16:49:32 +08:00
Yagami 90446d239a * Merge code and finish task #8475. 2020-11-25 10:36:44 +08:00
qiyu-xie 31032dfb66 * Fix bug. 2020-11-20 08:27:36 +08:00
holan20180123 f9995e4362 Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x 2020-11-18 11:44:15 +08:00
holan20180123 d1bb42ad3a * Finish task #8376. 2020-11-18 11:34:41 +08:00
tianshujie98 48e4e31a30 * Finish task #8397. 2020-11-18 10:33:34 +08:00
tianshujie98 f1423214eb * Finish task #8402. 2020-11-17 15:12:09 +08:00
tianshujie98 bddac7fe2d * Finish task #8404. 2020-11-17 14:59:09 +08:00
holan20180123 23362073ba * Finish task #8378. 2020-11-17 14:15:32 +08:00
holan20180123 97770dd00f * Finish task #8379. 2020-11-17 13:17:15 +08:00
holan20180123 fd6502b596 * Alignment format. 2020-11-16 11:31:29 +08:00
tianshujie98 c0e6591afe * Adjust code style. 2020-11-16 10:56:02 +08:00
holan20180123 cef356a33b Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x 2020-11-15 22:39:48 +08:00
holan20180123 95c2adcdb0 *Finish task #8194. 2020-11-15 22:39:26 +08:00
tianshujie98 7d18efad03 * Adjust code style. 2020-11-13 13:11:39 +08:00
tianshujie98 f08eaf98a1 * Finish task #8203. 2020-11-12 16:50:03 +08:00
holan20180123 a7533f722d * Finish task #8194. 2020-11-12 10:09:16 +08:00
holan20180123 2d0ffc2b4a * Finish task #8194. 2020-11-11 15:40:26 +08:00
holan20180123 8b1e4808c2 * Finish task #8194. 2020-11-10 08:49:00 +08:00
holan20180123 09d6f83f85 * Finish task #8194. 2020-11-06 14:01:01 +08:00
qiyu-xie bd93c680fa * Change lowercase to uppercase. 2020-09-22 08:52:24 +08:00
z a9df6f3b9c * merge after 12.4.1 changes. 2020-08-31 15:31:55 +08:00
holan20180123 802d64a3cf * Fix bug #3206. 2020-07-09 11:10:46 +08:00
wangyidong 350d92dd36 * finish task #7167. 2020-05-11 14:48:22 +08:00
wangyidong 3ba2f42aef * show child label. 2020-03-13 11:22:54 +08:00
wangyidong 3dabfc1b45 * adjust code. 2020-01-02 10:00:17 +08:00
wangyidong a1f9c6b4bd * fix bug for search. 2019-12-25 16:56:06 +08:00
wangyidong 28a7743f61 * finish task #6675. 2019-12-18 10:16:41 +08:00
Catouse a5a8751b8d * finish task #6695, fix bug #2337. 2019-12-13 14:11:47 +08:00
wangyidong e8e1357b90 * finish task #6601. 2019-11-28 09:45:28 +08:00
wangyidong 41c510df8d * code for task #6584. 2019-11-26 14:06:19 +08:00
wangyidong 82b0d31096 * fix bug #2775. 2019-09-20 15:27:03 +08:00
wangyidong 53e6970362 * adjust for bybranch in project-story page. 2019-09-05 16:50:16 +08:00
wangyidong 92487e13d1 * finish task #6284. 2019-08-30 09:30:45 +08:00
jinianlan 6cbd736ddc * finish task #6204. 2019-08-06 17:33:46 +08:00
liugang 9c53dd8e6b * Use the function zget to get users. 2019-07-30 17:33:59 +08:00
liugang 729961d205 * Use function processStatus to get status of a record. 2019-07-30 13:05:53 +08:00
Yagami ab6d63e87c * Finish task #5715. 2019-07-29 16:04:44 +08:00
wyd621 9143f4e38f Merge branch 'master' into 11.5 2019-07-12 15:55:04 +08:00
wangyidong 3a2c9e1e1b * finish task #5710. 2019-07-11 16:43:59 +08:00
Yagami adbd46fce6 * finish task 5810. 2019-06-19 13:50:20 +08:00
wangyidong dcac58b007 * revert dynamicAction lang. 2019-06-13 14:11:56 +08:00
wangyidong f937f4cb65 * adjust for page style. 2019-06-12 13:14:38 +08:00
Yagami 608cf1bab8 * Finish task #5715. 2019-06-03 09:50:31 +08:00
Yagami 74c85776b9 * Finish task #5520. 2019-05-29 15:50:43 +08:00
Yagami a9f4c51ca7 * Finish task #5095. 2018-11-09 15:41:54 +08:00
Yagami 394df4295f * Finish task #5092. 2018-11-09 15:05:24 +08:00
wangyidong d7e0222b1b * adjust for show queryBox by search. 2018-10-25 10:08:19 +08:00
wangyidong 458d56c283 * fix bug #2243. 2018-10-22 09:02:37 +08:00
Catouse 6a83bdc4be * finish task #4984 and fix bug #2212. 2018-10-12 16:26:26 +08:00