Commit Graph
12211 Commits
Author SHA1 Message Date
Catouse 871dfa48e2 * change status label style of todo list view. 2018-05-28 10:12:50 +08:00
Catouse b1c2675439 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-28 10:06:39 +08:00
Catouse f60f188bbd * change style of timeline component. 2018-05-28 10:06:11 +08:00
Catouse 223e203aa5 * adjust style of story/create view. 2018-05-28 10:05:59 +08:00
daitingting b038d71873 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-28 10:02:21 +08:00
daitingting 77fe2659d7 * Adjust style when it is not onlybody. 2018-05-28 10:00:46 +08:00
Catouse 20953cf027 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-28 09:53:19 +08:00
Catouse a981ac8438 * fix contactlist control in form not work. 2018-05-28 09:53:12 +08:00
滔哥 fc39b0702f * Finish task#4250 2018-05-28 09:24:13 +08:00
滔哥 330d8d1e99 * Finish task#4254 2018-05-28 09:20:06 +08:00
滔哥 f782549409 * Finish task#4267 2018-05-28 09:07:21 +08:00
滔哥 32a07c2450 * Finish task#4271 2018-05-28 08:55:26 +08:00
滔哥 09e8081b26 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-28 08:41:53 +08:00
滔哥 18cf9473da * Finish task#4258 2018-05-28 08:41:45 +08:00
Catouse 6548de69b1 * add more labels styles. 2018-05-25 18:37:33 +08:00
Catouse 84ece31c0d Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-25 17:56:51 +08:00
Catouse 2f970e721a * change style of project/story view. 2018-05-25 17:56:43 +08:00
滔哥 474649aae8 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-25 17:30:01 +08:00
滔哥 fc3bf027dc * Format code. 2018-05-25 17:29:54 +08:00
Catouse 8f7d0ca970 * change style of project/linkstory view. 2018-05-25 17:24:33 +08:00
chenfeiCF 9dde09ad05 * Finish task #4306. 2018-05-25 17:23:20 +08:00
Catouse 394632d8fa Merge branch 'master' of https://github.com/easysoft/zentaopms
# Conflicts:
#	module/bug/js/browse.js
2018-05-25 17:07:18 +08:00
Catouse 6d460fac3c * remove last divider item in navbar. 2018-05-25 17:05:57 +08:00
Catouse 2b14bf65fe * refactor bug/browse view. 2018-05-25 17:05:40 +08:00
Catouse 5e787cddc6 * add timestramp to js css url to prevent browser cache for debug mode. 2018-05-25 17:05:11 +08:00
daitingting a220646406 * Adjust link for view story. 2018-05-25 16:47:48 +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