Commit Graph
16690 Commits
Author SHA1 Message Date
wangyidong a5ef283e58 * adjust for xuanxuan. 2019-11-29 10:19:51 +08:00
wangyidong 67b96b8cb3 * add btn-wide class for btn on install and upgrade page. 2019-11-29 10:06:55 +08:00
wangyidong d14ee18ef4 * adjust for xuanxuan. 2019-11-29 09:43:31 +08:00
wangyidong 2033a0c0e9 * upgrade for xuanxuan. 2019-11-29 09:23:22 +08:00
wangyidong 6e825184be * fix bug for xuanxuan. 2019-11-29 09:08:55 +08:00
wangyidong f27516a1a5 * adjust for newest xuanxuan. 2019-11-29 08:27:10 +08:00
wangyidong f03a0975c2 Merge branch 'master' of github.com:easysoft/zentaopms 2019-11-28 17:33:27 +08:00
wangyidong 44f35afafe * Compatible xuanxuan newest version. 2019-11-28 17:30:57 +08:00
Yagami 8408648db5 * Fix client create bug view style. 2019-11-28 10:52:35 +08:00
wangyidong e8e1357b90 * finish task #6601. 2019-11-28 09:45:28 +08:00
wangyidong 6040e21109 Merge branch 'master' of github.com:easysoft/zentaopms 2019-11-28 09:36:52 +08:00
wangyidong 15014e63b4 * add standard sql. 2019-11-28 09:35:58 +08:00
wangyidong ecbf8220da * add new version and upgrade. 2019-11-28 09:29:36 +08:00
Yagami 3dd1428078 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-11-27 17:14:21 +08:00
Yagami 97bae2e030 * Fix code logic. 2019-11-27 17:14:09 +08:00
guanxiying 208852492f * Fix 。in en lang file. 2019-11-27 15:14:30 +08:00
guanxiying c31564f857 * Strtoupper sp. 2019-11-27 15:12:17 +08:00
wangyidong 4c11de7833 * fix bug for update child task. 2019-11-27 14:23:01 +08:00
wangyidong 2604b595ba * finish task #6589. 2019-11-27 13:48:01 +08:00
wangyidong 21483f1be5 Merge branch 'master' of github.com:easysoft/zentaopms 2019-11-27 11:25:47 +08:00
wangyidong 6764ead7a6 * adjust for export with work flow. 2019-11-27 11:25:19 +08:00
Yagami 4e4281927a Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-11-27 10:35:55 +08:00
Yagami d9531f33e7 * Add key 0 to module pairs. 2019-11-27 10:35:29 +08:00
wangyidong f8f4db9098 Merge branch 'master' of github.com:easysoft/zentaopms 2019-11-27 10:24:49 +08:00
wangyidong 2452e992de * code for task #6566. 2019-11-27 10:24:17 +08:00
Yagami c961d47610 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-11-27 10:05:46 +08:00
Yagami 383a2e236b * Finish task #6579. 2019-11-27 10:05:25 +08:00
wangyidong 2caa233687 * finish task #6596. 2019-11-27 09:32:49 +08:00
wangyidong e00aa6c9fd Merge branch 'master' of github.com:easysoft/zentaopms 2019-11-27 09:27:47 +08:00
wangyidong 47955f9ec4 * finish task #6597. 2019-11-27 09:27:25 +08:00
guanxiying f1949ae5de * Go to my index page when concept inited. 2019-11-26 17:38:52 +08:00
guanxiying e7df75ce8a * Set httponly false to projectMode cookie. 2019-11-26 17:29:46 +08:00
guanxiying 1f897b5309 * Fix missing ; . 2019-11-26 17:17:00 +08:00
guanxiying 8af89d8026 * set httponly false for cookie written by js. 2019-11-26 16:58:14 +08:00
guanxiying d246b363d6 * Set httpOnly false for downloading and selfClose cookie. 2019-11-26 16:34:38 +08:00
Yagami 0e87a83f83 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-11-26 15:50:16 +08:00
Yagami 5290e81623 * Finish task #6575. 2019-11-26 15:49:37 +08:00
wangyidong f698d89d1c Merge branch 'master' of github.com:easysoft/zentaopms 2019-11-26 15:46:46 +08:00
wangyidong 87218f6f02 * finish task #6580. 2019-11-26 15:43:58 +08:00
guanxiying 7460f2f8fd * Fix save story common bug. 2019-11-26 15:40:49 +08:00
Yagami f2ed384e7a Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-11-26 15:37:40 +08:00
guanxiying fc7e7dc697 * Remove unused code. 2019-11-26 15:25:59 +08:00
guanxiying 0c2dd8d390 * Add flow.js. 2019-11-26 15:18:55 +08:00
Yagami 549a677a87 * Finish task #6588. 2019-11-26 15:05:41 +08:00
Yagami ef5afcf3b4 * Finish task #6585. 2019-11-26 14:34:12 +08:00
Yagami 0509d13b96 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-11-26 14:31:37 +08:00
Yagami 9358057416 * Finish task #6492. 2019-11-26 14:31:22 +08:00
guanxiying fd51e64f48 Merge branch 'master' of github.com:easysoft/zentaopms 2019-11-26 14:14:44 +08:00
guanxiying dfed1526d6 * Finish task 6569. 2019-11-26 14:14:18 +08:00
guanxiying 9a74ca9c40 * Finish task 6569. 2019-11-26 14:13:45 +08:00