Commit Graph

9008 Commits

Author SHA1 Message Date
chenfeiCF
22b9aeae2b * code for task #2808. 2016-12-21 09:03:55 +08:00
chenfeiCF
e0b2e258d5 * finish task #2809. 2016-12-20 19:40:08 +08:00
chenfeiCF
399ad7fcac * fix colspan for product browse method. 2016-12-20 19:27:48 +08:00
Catouse
e4dcd54151 * change style of crumbs menu. 2016-12-20 17:33:49 +08:00
Catouse
58a2e40b60 Merge branch 'master' of https://github.com/easysoft/zentaopms 2016-12-20 16:33:59 +08:00
Catouse
f349fc98ea * change style of crumbs menu. 2016-12-20 16:33:50 +08:00
chenfeiCF
3ef4ce2a11 * finish task #2812. 2016-12-20 16:17:14 +08:00
tengfei
36cbc6b076 Merge branch 'master' of github.com:easysoft/zentaopms 2016-12-20 15:35:12 +08:00
tengfei
41de567793 * adjust for report 2016-12-20 15:34:33 +08:00
Catouse
a87d63949a * replace QR code image source with a empty image, see http://www.zentao.net/thread/86777.html. 2016-12-20 09:27:55 +08:00
chenfeiCF
33408e3b65 Merge branch 'master' of github.com:easysoft/zentaopms 2016-12-20 09:01:45 +08:00
chenfeiCF
507d9a2d8e * merge mails when async send mails. 2016-12-20 08:58:36 +08:00
wangyidong
22eb0f10cd * adjust for sendcloud. 2016-12-19 16:34:33 +08:00
wangyidong
9447a00b75 * fix bug. 2016-12-19 16:34:08 +08:00
wangyidong
9579586ccf Merge branch 'master' of github.com:easysoft/zentaopms 2016-12-19 09:33:14 +08:00
wangyidong
eead64da2f * adjust for index.php. 2016-12-19 09:32:33 +08:00
wangyidong
86b0a414f5 * change for bind sendcloud. 2016-12-19 09:32:08 +08:00
tengfei
cc522b2a03 *Adjust user 2016-12-16 13:18:33 +08:00
tengfei
ef292e44bf *Adjust subdivide 2016-12-15 14:56:28 +08:00
tengfei
87cc92998a *Adjust for screenshot 2016-12-15 14:48:38 +08:00
tengfei
934efeaa00 *ADJUST LINK->RELATE 2016-12-15 11:32:01 +08:00
wangyidong
865184fc04 * fix bug for error table. 2016-12-15 08:26:28 +08:00
wangyidong
01e94f8261 * fix bug for custom longlife. 2016-12-15 08:25:36 +08:00
tengfei
ee7d815579 *Adjust report bugs 2016-12-14 15:16:02 +08:00
tengfei
298a68d805 *Adjust minor change 2016-12-14 15:08:35 +08:00
tengfei
d8ea232ee7 *Adjust for screenshot 2016-12-14 11:32:57 +08:00
tengfei
18e631d928 * adjust for screenshot 2016-12-13 14:28:36 +08:00
tengfei
dd40d6ec7d *adjust admin 2016-12-13 11:34:58 +08:00
tengfei
25251417d5 *Adjust r&d->Dev 2016-12-13 11:22:58 +08:00
tengfei
c7d4e506de *adjust gender 2016-12-13 10:54:32 +08:00
wangyidong
d47bed5fdc * fix bug for parse csv. 2016-12-12 16:46:13 +08:00
wangyidong
4f5debd7cc * fix bug for group task. 2016-12-12 13:41:41 +08:00
wangyidong
4c153973fb * change for upgrade. zentaopms_8.4.1_20161212 2016-12-12 10:08:23 +08:00
wangyidong
d134a89f02 * fix bug for get default project. 2016-12-12 08:15:45 +08:00
Catouse
f6491e73b8 Merge branch 'master' of https://github.com/easysoft/zentaopms 2016-12-09 12:08:02 +08:00
Catouse
1d9943c3f6 * improve table UI on scrolling. 2016-12-09 12:07:53 +08:00
wangyidong
dd71a7dc12 Merge branch 'master' of github.com:easysoft/zentaopms 2016-12-09 11:54:53 +08:00
wangyidong
4b929ab7ae * adjust for convert encoding. 2016-12-09 11:54:16 +08:00
Catouse
e5f8b6321c * change default doughnut size of mini pie chart. 2016-12-09 11:11:07 +08:00
tengfei
4bbdd23f4d *chunge error 2016-12-09 10:43:02 +08:00
wangyidong
6150ee7b76 * adjust for pinyin. 2016-12-09 09:38:13 +08:00
wangyidong
0fe35cb5d2 * fix bug for kindeditor placeholder. 2016-12-09 09:01:46 +08:00
wangyidong
b8be575cb2 Merge branch 'master' of github.com:easysoft/zentaopms 2016-12-08 14:11:56 +08:00
wyd621
6471624de8 Delete my.min.js 2016-12-08 14:10:51 +08:00
wangyidong
a2db678341 - delete my.min.js. 2016-12-08 14:00:06 +08:00
wangyidong
fbce8df948 * adjust page. 2016-12-08 13:27:37 +08:00
wangyidong
2f71effc52 * adjust for upgrade. 2016-12-08 13:27:15 +08:00
tengfei
f7d35cef9e *planning->plan 2016-12-08 13:24:17 +08:00
wangyidong
18280dc2e9 Merge branch 'master' of github.com:easysoft/zentaopms 2016-12-07 17:24:53 +08:00
wangyidong
41341bb9f5 * adjust for safe. 2016-12-07 17:22:28 +08:00