Commit Graph
12861 Commits
Author SHA1 Message Date
chenfeiCF 4ee9e455ea * Code for task 4640. 2018-07-09 17:16:51 +08:00
chenfeiCF 67cc92c812 * Finish task #4544. 2018-07-09 17:16:24 +08:00
chenfeiCF ffd355d0a3 * Finish task #4502. 2018-07-09 14:42:04 +08:00
dajiao007 a9d3db45b0 Merge branch 'master' of http://github.com/easysoft/zentaopms 2018-07-09 14:37:37 +08:00
dajiao007 ca36d3f5ec * modift English 2018-07-09 14:37:25 +08:00
Catouse 1b48715818 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-09 14:33:31 +08:00
Catouse 890dff6dff * update zui files. 2018-07-09 14:33:24 +08:00
wangyidong 8e33b05bb5 Merge branch 'master' of github.com:easysoft/zentaopms 2018-07-09 14:26:02 +08:00
wangyidong a53031cfdc * adjust for cleanINT. 2018-07-09 14:25:10 +08:00
Catouse 7cacff34b0 * add new line to the end of file. 2018-07-09 14:11:14 +08:00
Catouse b430451d0b Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-09 14:09:06 +08:00
Catouse 5fb638f886 * remove responsive wrapper element from todo/batchedit and todo/batchcreate view. 2018-07-09 14:08:58 +08:00
Catouse 7d7bb1939d * update zui js file. 2018-07-09 14:08:28 +08:00
Catouse 15ed6c64eb * fix size of table columns in todo/batchcreate and todo/batchedit view. 2018-07-09 14:08:20 +08:00
chenfeiCF cd12e90d46 * Adjust bug and case module for task #4638. 2018-07-09 14:04:42 +08:00
wangyidong b6ea3b5c53 Merge branch 'master' of github.com:easysoft/zentaopms 2018-07-09 13:55:51 +08:00
wangyidong 4bd218b9a4 * finish task #4589. 2018-07-09 13:55:11 +08:00
Catouse 22e7e790c4 * change language text format. 2018-07-09 13:53:19 +08:00
Catouse 599cfd7183 * refactor code. modalTrigger usage @see http://zui.sexy/#javascript/modaltrigger. 2018-07-09 13:46:44 +08:00
Catouse dccf32171b * fix $versionName not defined error. 2018-07-09 13:33:25 +08:00
Catouse 978549884d Merge branches 'master' and 'master' of https://github.com/easysoft/zentaopms 2018-07-09 13:28:51 +08:00
Catouse 97d0357070 * finish task #4556. 2018-07-09 13:28:44 +08:00
Catouse 7cb180b540 * make table in group/view sortalbe. 2018-07-09 13:28:29 +08:00
liugang 8b018e63f6 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-09 11:15:35 +08:00
liugang 2ec456f319 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-09 11:15:11 +08:00
liugang c0e5909247 * Fix bug. 2018-07-09 11:15:03 +08:00
Catouse 9aa26a2573 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-09 11:14:11 +08:00
Catouse 9255162665 * fix table width in story/linkstory view. 2018-07-09 11:14:05 +08:00
Catouse e41051e78f * update zui files. 2018-07-09 11:13:41 +08:00
Catouse 15335941e7 * update themes. 2018-07-09 11:13:28 +08:00
chenfeiCF f6c5cf3689 * Finish task #4638. 2018-07-09 10:44:00 +08:00
chenfeiCF c8ce5e64c9 Merge branch 'master' of github.com:easysoft/zentaopms 2018-07-09 10:43:19 +08:00
Catouse abc1c41928 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-09 10:23:03 +08:00
liugang 9552cc6fd3 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-09 10:08:15 +08:00
liugang 370cdfad9d * Finish task #4634 2018-07-09 10:07:52 +08:00
daitingting f0e022127d Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-09 09:56:55 +08:00
daitingting 6d2d35bff0 * Adjust status when the old status is done. 2018-07-09 09:56:07 +08:00
Catouse 3190c876d0 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-09 09:54:54 +08:00
Catouse 2d2df9c013 * improve UI of block views for placement in small column. 2018-07-09 09:54:46 +08:00
Catouse 1cbbb130d8 * update zui. 2018-07-09 09:54:18 +08:00
dajiao007 159597411c Merge branch 'master' of http://github.com/easysoft/zentaopms 2018-07-09 09:49:30 +08:00
wangyidong 83d7855fb9 Merge branch 'master' of github.com:easysoft/zentaopms 2018-07-09 09:49:10 +08:00
wangyidong 8da87c9dcf * finish task #4641. 2018-07-09 09:48:35 +08:00
dajiao007 45df604068 * modify english labels 2018-07-09 09:45:33 +08:00
dajiao007 cb13c64e9c * modify english labels 2018-07-09 09:39:49 +08:00
Catouse 9ed3cdd5f8 * improve UI of dashboard. 2018-07-09 09:24:34 +08:00
chenfeiCF 01e06b7a89 Merge branch 'master' of github.com:easysoft/zentaopms 2018-07-09 08:53:39 +08:00
daitingting 29371f8b70 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-05 17:55:49 +08:00
daitingting 0817ec73cc * Optimize text. 2018-07-05 17:55:30 +08:00
wangyidong 5eb55fe399 Merge branch 'master' of github.com:easysoft/zentaopms 2018-07-05 17:06:48 +08:00