Commit Graph
6755 Commits
Author SHA1 Message Date
wangyidong 78ce4d3aeb * code for task #2616. 2016-06-07 13:59:03 +08:00
wangyidong b986c959e2 * finish task #2616. 2016-06-07 13:47:04 +08:00
wangyidong be4f6cedda * finish task #2593. 2016-06-07 13:21:17 +08:00
wangyidong a0a9c3864f * finish task #2613. 2016-06-07 11:45:12 +08:00
wangyidong 569d83480b * finish task 2611. 2016-06-06 16:50:16 +08:00
wangyidong 5f59630f58 Merge branch 'master' of github.com:easysoft/zentaopms 2016-06-06 16:12:42 +08:00
wangyidong fd8c64e97f * code for task #2607. 2016-06-06 16:12:20 +08:00
chenfeiCF 1a91a58cf4 Merge branch 'master' of github.com:easysoft/zentaopms 2016-06-06 16:05:26 +08:00
chenfeiCF 1b5e924bb0 * merge source and source note into one line. 2016-06-06 16:04:00 +08:00
wangyidong e5170b2a87 * finish task #2620. 2016-06-06 16:03:42 +08:00
wangyidong 6dc2e626b7 * finish task #2621. 2016-06-06 15:55:29 +08:00
wangyidong 2ca5b2b3a9 Merge branch 'master' of github.com:easysoft/zentaopms 2016-06-06 14:25:25 +08:00
wangyidong 978257a418 * finish task #2617. 2016-06-06 14:24:57 +08:00
wangyidong b8c90ca68a * finish task #2598. 2016-06-06 14:05:48 +08:00
wangyidong 94b013cdb2 * finish task #2594. 2016-06-06 14:05:06 +08:00
wangyidong 8602a05846 * finish task #2595. 2016-06-06 14:04:01 +08:00
chenfeiCF eed834ee3c * add source note when create a story. 2016-06-06 11:40:47 +08:00
wangyidong f1bd329aa8 * adjust for add task estimate when start task. 2016-06-06 09:32:09 +08:00
wangyidong 52882750dc * fix and adjust code. 2016-06-03 16:43:42 +08:00
wangyidong 1a68eb4249 * fix bug for merge rights. 2016-06-01 16:12:07 +08:00
wangyidong d0aa1b5157 * adjust for link story. 2016-05-31 14:26:51 +08:00
wangyidong 697ed27e66 Merge branch 'master' of github.com:easysoft/zentaopms 2016-05-31 14:09:55 +08:00
wangyidong 7552ca07e3 * adjust for show onMenuBar checkbox when search save query. 2016-05-31 14:09:06 +08:00
wangyidong cbda3adaee * adjust for process search sql. 2016-05-31 13:52:44 +08:00
wangyidong 05b5a5fba1 * fix for custom menu. 2016-05-31 13:51:18 +08:00
wangyidong 197a4eb62f * set session for dashboard. 2016-05-31 13:50:28 +08:00
chenfeiCF 05b9b0b9b4 * update select chosen when batch creating users. 2016-05-27 09:38:45 +08:00
chenfeiCF 267e8f3105 * update select chosen for group when creating a user. 2016-05-26 15:21:39 +08:00
chenfeiCF 4fecea04ce * fix bug #838. 2016-05-26 08:55:09 +08:00
wangyidong 760743962d * revert for login. 2016-05-25 08:28:47 +08:00
wangyidong ce5106ae5a * change for upgrade. 2016-05-24 15:07:28 +08:00
chenfeiCF 74f4d67357 Merge branch 'master' of github.com:easysoft/zentaopms 2016-05-24 14:58:26 +08:00
chenfeiCF bc3c227626 * finish task #2591. 2016-05-24 14:57:51 +08:00
wangyidong af847155bd Merge branch 'master' of github.com:easysoft/zentaopms
Conflicts:
	module/block/view/projectblock.html.php
2016-05-24 14:24:10 +08:00
wangyidong 30903e10a7 * adjust for dao when tutorialMode. 2016-05-24 14:13:42 +08:00
wangyidong 2082aee081 * adjust for the width of project progess. 2016-05-24 13:47:55 +08:00
Catouse 626fc549a2 * remove unneed code. 2016-05-24 13:19:22 +08:00
Catouse de490bb1c7 * ajust progress bar style in project block. 2016-05-24 13:18:55 +08:00
wangyidong a3a8209488 Merge branch 'master' of github.com:easysoft/zentaopms 2016-05-24 11:57:51 +08:00
wangyidong 69acd19391 * fix bug for border when no data. 2016-05-24 11:56:34 +08:00
daitingting 2a6ec86f01 * Check key when integrate with ranzhi. 2016-05-24 10:21:01 +08:00
wangyidong 3b829cbc2e * finish task #2584. 2016-05-24 09:55:06 +08:00
wangyidong 40d63415eb * finish task #2585. 2016-05-24 09:30:05 +08:00
wangyidong 02794d696c * adjust for dashboard when guest. 2016-05-23 16:39:54 +08:00
wangyidong 30ba80d0e0 * adjust for all product or project when by search. 2016-05-23 16:35:32 +08:00
wangyidong 926e6b7a32 * set homepage for guest. 2016-05-23 16:34:40 +08:00
wangyidong b472790d2b * fix bug for create cron. 2016-05-23 16:33:53 +08:00
wangyidong dde75c9a0e Merge branch 'master' of github.com:easysoft/zentaopms 2016-05-23 16:31:21 +08:00
wangyidong 97c2c1b7db * adjust for manage branch. 2016-05-23 16:27:50 +08:00
chenfeiCF c4a8809761 * adjust code format for testcase view. 2016-05-23 16:07:01 +08:00