Commit Graph
12186 Commits
Author SHA1 Message Date
滔哥 fc3bf027dc * Format code. 2018-05-25 17:29:54 +08:00
daitingting 1498e2441a Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-25 16:21:45 +08:00
daitingting 996c25cd4b * Load custom from db when upgradeVersion > 4.3.beta. 2018-05-25 16:20:33 +08:00
滔哥 3e31e43c04 * Finish task#4262. 2018-05-25 16:08:56 +08:00
wangyidong 7659a88f15 Merge branch 'master' of github.com:easysoft/zentaopms 2018-05-25 15:30:20 +08:00
wangyidong c748ede499 * fix for shortcut query. 2018-05-25 15:29:43 +08:00
滔哥 aea82f1c87 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-25 15:11:09 +08:00
滔哥 761c65bf72 * Finish task#4277. 2018-05-25 15:11:02 +08:00
daitingting d240986143 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-25 15:01:20 +08:00
daitingting 167b26c2d5 * Adjust style for promotion. 2018-05-25 15:00:12 +08:00
tengfei aa31d9637d * Test. 2018-05-25 14:55:44 +08:00
tengfei 613231b9f5 *changed story translation 2018-05-25 14:44:24 +08:00
wangyidong df69baf1b7 Merge branch 'master' of github.com:easysoft/zentaopms 2018-05-25 14:43:59 +08:00
Catouse 66560e81e3 * fix columns size of product block view. 2018-05-25 14:43:18 +08:00
Catouse ee3cb35d39 * fix fixed head table style. 2018-05-25 14:42:27 +08:00
wangyidong 23973cbdb6 * finish task #4164. 2018-05-25 14:40:49 +08:00
Catouse 9b0f31cccf Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-25 14:40:19 +08:00
Catouse dd20d480d3 * fix UI of testcase/showimport modal view. 2018-05-25 14:40:11 +08:00
滔哥 75a4a63a37 * Finish task#4278. 2018-05-25 14:31:23 +08:00
daitingting 50cef96291 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-25 14:24:15 +08:00
daitingting 61185f2467 * Give a tip when there is no product or project. 2018-05-25 14:23:34 +08:00
滔哥 fd75fbfe0d * Test task#4278 2018-05-25 14:11:52 +08:00
滔哥 857642662b Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-25 14:08:05 +08:00
滔哥 52bcaad547 * Test task#4278 2018-05-25 14:07:59 +08:00
daitingting 30e345a010 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-25 13:45:58 +08:00
daitingting 52b93dc694 * Adjust type for statistic block of project. 2018-05-25 13:45:37 +08:00
Catouse 69321876bc Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-25 13:13:46 +08:00
Catouse 41973195df * change buttons style in datatable/ajaxcustom modal view. 2018-05-25 13:13:38 +08:00
滔哥 e27dbca164 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-25 11:33:51 +08:00
滔哥 fdb74ef7ec * Finish task#4252 2018-05-25 11:33:46 +08:00
Catouse cd932cf4ff * change style of project/kanban views. 2018-05-25 11:23:05 +08:00
Catouse 5663a6baa0 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-25 11:09:20 +08:00
Catouse 8d78fa409a * change style of dynamic views. 2018-05-25 11:09:12 +08:00
daitingting e851690722 * Adjust space between btn. 2018-05-25 10:59:29 +08:00
daitingting fbdf2b54a9 * Adjust space between btn. 2018-05-25 10:31:09 +08:00
daitingting f5932df92c * Adjust space between btn. 2018-05-25 10:26:20 +08:00
daitingting 651a75ac71 * Adjust space between btn. 2018-05-25 10:18:13 +08:00
daitingting 7fbb8566cc Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-25 10:13:51 +08:00
daitingting f43b357836 * Adjust space between btn. 2018-05-25 10:13:33 +08:00
wangyidong 9065c7885b Merge branch 'master' of github.com:easysoft/zentaopms 2018-05-25 10:06:16 +08:00
wangyidong 37e5c9188a * code for task #4229. 2018-05-25 10:05:48 +08:00
daitingting c21a6689ac Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-25 10:04:14 +08:00
daitingting 3ece122648 * Adjust space between btn. 2018-05-25 10:03:58 +08:00
wangyidong 4205a87992 Merge branch 'master' of github.com:easysoft/zentaopms 2018-05-25 10:02:45 +08:00
wangyidong f8bd140942 * finish task #4155. 2018-05-25 10:02:12 +08:00
Catouse a101010468 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-25 09:54:37 +08:00
Catouse b727812b38 * improve UI of story/change form view. 2018-05-25 09:54:27 +08:00
daitingting 92e63812b1 * Adjust space between btn. 2018-05-25 09:52:56 +08:00
daitingting b102f46568 * Adjust space between btn. 2018-05-25 09:47:53 +08:00
daitingting 3a4aa88169 * Adjust space between btn. 2018-05-25 09:35:47 +08:00