Commit Graph
10729 Commits
Author SHA1 Message Date
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
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
wangyidong d0f3160fd3 * finish task #6826. 2018-07-18 15:16:40 +08:00
liugang afe2fedeb7 * The calendar page can only export all records. 2018-07-17 15:28:36 +08:00
wangyidong 96355c532d * adjust code for subMenu. 2018-07-16 17:14:10 +08:00
wangyidong c273b55996 * adjust changelog and zh-tw lang. 2018-07-16 13:26:40 +08:00
dajiao007 df18627679 * modify English Version 2018-07-14 15:20:53 +08:00
dajiao007 b6f022fecc Merge branch 'master' of http://github.com/easysoft/zentaopms 2018-07-14 10:41:48 +08:00
dajiao007 722e82ebee * modify English Version of Doc 2018-07-14 10:39:37 +08:00
wangyidong 2414a31290 Merge branch 'master' of github.com:easysoft/zentaopms 2018-07-13 18:21:09 +08:00
wangyidong 0a456353e1 * fix bug #4243. 2018-07-13 18:20:02 +08:00
estellbright cc334e3d8c Fix bug #2048. 2018-07-13 15:40:56 +08:00
estellbright 2b0f70a646 *Fix bug #2044. 2018-07-13 15:38:44 +08:00
estellbright cd50d535de *Fix bug # 2009. 2018-07-13 15:35:54 +08:00
daitingting 3caa486af2 * Add required mark when module is setted required. 2018-07-13 15:05:05 +08:00
liugang 990182a37c * Submit form by ajax. 2018-07-13 14:34:34 +08:00
liugang c5b4a54b09 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-13 14:29:37 +08:00
liugang e8643f6fc6 * Submit form by ajax. 2018-07-13 14:29:22 +08:00
daitingting 0b35405187 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-13 14:06:26 +08:00