Commit Graph
11389 Commits
Author SHA1 Message Date
wangyidong ec493368ee Merge branch 'master' of git://github.com/easysoft/zentaopms 2018-05-07 16:50:15 +08:00
wangyidong 56489075b0 Merge branch 'zentaopms_9.8' 2018-05-07 16:48:59 +08:00
liugang 414282d005 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-07 11:55:18 +08:00
liugang 70dcc23aca * Refact testtask page of project. 2018-05-07 11:54:54 +08:00
chenfeiCF 5bf160432b Merge branch 'master' of github.com:easysoft/zentaopms 2018-05-07 09:24:34 +08:00
chenfeiCF 433b28e7c1 * Adjust user todo and story view file. 2018-05-07 09:23:42 +08:00
daitingting b38b38365a * Update zui. 2018-05-07 09:23:36 +08:00
wangyidong 83a6c78c3b Merge branch 'master' of github.com:easysoft/zentaopms 2018-05-04 15:14:03 +08:00
wangyidong 55c68b611d * finish task #3936. 2018-05-04 15:13:22 +08:00
daitingting 52adf369e9 * Finish search function. 2018-05-04 09:15:25 +08:00
daitingting 706b0ea0e1 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-03 17:01:35 +08:00
daitingting 1e7406d4a3 * Rewrite edit page of doc. 2018-05-03 17:01:14 +08:00
chenfeiCF 5506bcee01 * Finish task #3879, #3880. 2018-05-03 16:50:18 +08:00
daitingting 89b4ed727c Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-03 16:45:11 +08:00
daitingting 8d5ef6e722 * Rewrite create page for doc. 2018-05-03 16:44:50 +08:00
wangyidong 86b84dd5a2 Merge branch 'master' of github.com:easysoft/zentaopms 2018-05-03 16:12:07 +08:00
wangyidong e6bef8b542 * adjust for task #3947. 2018-05-03 16:05:44 +08:00
daitingting 5c7406e5c0 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-03 16:00:14 +08:00
daitingting a06796c25b * Replace effort block to burn block.
* Check priviledge.
2018-05-03 15:59:30 +08:00
wangyidong 660e499d74 Merge branch 'master' of github.com:easysoft/zentaopms 2018-05-03 15:17:11 +08:00
wangyidong 4a297ee140 * finish task #3953. 2018-05-03 15:16:27 +08:00
daitingting fdfa1bbd22 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-03 14:58:34 +08:00
daitingting 46e8569973 * Rewrite view page of project. 2018-05-03 14:58:03 +08:00
dajiao007 9271d69db6 modify translation of flowchart 2018-05-03 14:28:06 +08:00
chenfeiCF 66443f3eeb * Finish task #3872, #3909. 2018-05-03 14:25:17 +08:00
chenfeiCF d950e73715 * Modified update9.8.1.sql and zentao.sql file. 2018-05-03 14:24:07 +08:00
wangyidong c375ed05d0 Merge branch 'master' of github.com:easysoft/zentaopms 2018-05-03 09:54:01 +08:00
wangyidong 539c1986f9 * adjust for other module page. 2018-05-03 09:53:30 +08:00
liugang 7b5698f911 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-02 18:06:31 +08:00
liugang 43f290fac4 * Refact batch create page of testcase. 2018-05-02 18:06:14 +08:00
daitingting 02b8cf01db Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-02 16:51:03 +08:00
daitingting 9748528da5 * Rewrite pageNav and pageActions of doc. 2018-05-02 16:50:17 +08:00
wangyidong 76c31e952b Merge branch 'master' of github.com:easysoft/zentaopms 2018-05-02 16:00:22 +08:00
wangyidong e6c4e06d2f * adjust for group module. 2018-05-02 15:59:55 +08:00
daitingting 7f0f102c5d Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-02 15:16:13 +08:00
daitingting 20bd8575ac * Add visitedDate and collector fields. 2018-05-02 15:15:16 +08:00
wangyidong d67fd9d165 * remove custom-ajaxsethomepage page. 2018-05-02 13:05:54 +08:00
wangyidong deb70ee4e0 * adjust for api-debug page. 2018-05-02 10:39:31 +08:00
wangyidong 078cfbf4af Merge branch 'master' of github.com:easysoft/zentaopms 2018-05-02 10:13:44 +08:00
wangyidong c5fd3d0af7 * adjust for back button in view page. 2018-05-02 10:13:20 +08:00
liugang 14a2b001ab * Fix bug. 2018-04-28 18:03:35 +08:00
liugang 7579436d86 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-04-28 17:57:17 +08:00
liugang 1b645f9055 * Refact batch create task page. 2018-04-28 17:56:36 +08:00
wangyidong e36f46ca0a * adjust for task edit page. 2018-04-28 17:53:20 +08:00
wangyidong 7327a197ab Merge branch 'master' of github.com:easysoft/zentaopms 2018-04-28 16:49:36 +08:00
wangyidong c8c5db1bfe * adjust for task module page. 2018-04-28 16:49:13 +08:00
daitingting dd1d9b67ac * Adjust codes. 2018-04-28 16:44:35 +08:00
daitingting 00f74c851a * Adjust codes. 2018-04-28 16:40:23 +08:00
daitingting 7cd8dbe347 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-04-28 16:37:36 +08:00
daitingting 091bbea7aa * Rewrite index page of doc. 2018-04-28 16:36:56 +08:00