Commit Graph
10746 Commits
Author SHA1 Message Date
liugang df0f7d3c00 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-30 10:42:34 +08:00
liugang dcd0f98a73 * Set buttons in view page as same as in browse page. 2018-07-30 10:41:47 +08:00
estellbright e295fd0203 Fix Team Bug. 2018-07-26 09:56:10 +08:00
liugang 8b7a79a6e1 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-26 09:42:10 +08:00
liugang e39a5f0014 * Fix bug #2019 2018-07-26 09:40:27 +08:00
estellbright 375850e6b1 Fix Bug. 2018-07-26 09:38:03 +08:00
reneteng 5238216a30 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-25 17:26:11 +08:00
reneteng 5c63c7f6fd *stage to phase 2018-07-25 17:25:15 +08:00
estellbright 5ceae019fe *Finish Task #6833. 2018-07-25 17:17:49 +08:00
wangyidong 2a85d52eeb * fix bug #1433 2018-07-25 13:14:36 +08:00
wangyidong 7891bf8591 * fix bug #1440. 2018-07-25 11:05:36 +08:00
wangyidong b74da6e419 Merge branch 'master' of github.com:easysoft/zentaopms 2018-07-25 10:39:31 +08:00
wangyidong fab688d16f * fix bug #1436. 2018-07-25 10:38:57 +08:00
daitingting c4a752478c * Use ajaxFrom submit it. 2018-07-24 15:39:37 +08:00
daitingting afd1728913 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-24 15:34:43 +08:00
reneteng b7817b432c Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-24 15:01:24 +08:00
reneteng 26450f693f *minor change 2018-07-24 15:00:04 +08:00
daitingting 362c20a22f Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-24 14:49:28 +08:00
daitingting 6840ad7613 * Adjust codes. 2018-07-24 14:48:39 +08:00
wangyidong 6ab7d1b28c Merge branch 'master' of github.com:easysoft/zentaopms 2018-07-24 13:47:54 +08:00
wangyidong 80c9bfab2a * finish task #6894. 2018-07-24 13:46:43 +08:00
Catouse 3e935d0e4d Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-24 11:36:36 +08:00
liugang 6d9bf4a0bc * Fix bug #2030 2018-07-24 10:47:55 +08:00
Catouse 3ac21017f5 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-24 10:18:09 +08:00
Catouse 0305c59f31 * fix datatable not work in hot reload table mode. 2018-07-24 10:17:51 +08:00
Yagami e4a9852f0b *Finish task #6850. 2018-07-24 10:00:39 +08:00
Catouse 9a3fddd00e * finish task #6798. 2018-07-24 09:25:26 +08:00
Catouse f33002c021 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-23 17:31:49 +08:00
Catouse 3155cb8838 * change import view. 2018-07-23 17:31:18 +08:00
wangyidong 9af39d9e0a * fix error. 2018-07-23 17:29:51 +08:00
wangyidong 9e2df3dde2 * change for safe. 2018-07-23 17:27:54 +08:00
wangyidong 897ad0fdae Merge branch 'master' of github.com:easysoft/zentaopms 2018-07-23 15:07:46 +08:00
wangyidong 38b3d7e6fd * fix bug #2068,2065,2064,2053. 2018-07-23 15:06:49 +08:00
liugang ec2b70a222 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-23 14:15:22 +08:00
liugang a2baa7ad5a * Display chart datas of testtask. 2018-07-23 14:15:04 +08:00
滔哥 1eaaf24db6 * Change for Xuanxuan entry sso. 2018-07-23 13:30:15 +08:00
reneteng 087cb53536 * change funcion to feature 2018-07-23 13:20:47 +08:00
reneteng 9727194d11 Merge branch 'master' of https://github.com/easysoft/zentaopms
* remove support in common en
2018-07-23 11:26:30 +08:00
reneteng 1a0046c7a5 * remove support 2018-07-23 11:25:53 +08:00
Yagami 6ac385f583 * Finish task #6865. 2018-07-23 11:25:24 +08:00
liugang 44a8a98c34 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-19 15:35:45 +08:00
liugang d6291e05e3 * Set project name as header if export stories of a project. 2018-07-19 15:34:49 +08:00
daitingting a56ab4ec35 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-19 15:30:28 +08:00
daitingting 323e4f80ad * Add space. 2018-07-19 15:29:34 +08:00
liugang 43a295b008 * Fix style. 2018-07-19 14:11:46 +08:00
liugang 38da31c18a Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-19 13:57:39 +08:00
liugang 21480a368a * Display empty tips if no data. 2018-07-19 13:57:04 +08:00
daitingting 95cfa5c880 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-18 17:13:59 +08:00
daitingting db8632234f * Use html for link in mail, fix bug #1235. 2018-07-18 17:12:43 +08:00
wangyidong b8afb7ca57 Merge branch 'master' of github.com:easysoft/zentaopms 2018-07-18 15:17:09 +08:00