Commit Graph
12891 Commits
Author SHA1 Message Date
daitingting 5c294a5d0b Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-10 10:08:08 +08:00
daitingting 231e3ab334 * Hidden project when flow is onlyTest. 2018-07-10 10:07:37 +08:00
chenfeiCF b01dc1aa72 * Finish task #4640. 2018-07-10 09:07:58 +08:00
Catouse ba130809f1 * finish task #4510 and fix bug #1971. 2018-07-09 18:53:05 +08:00
Catouse 34827d3921 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-09 18:42:01 +08:00
Catouse 2ea0c5002f * fix chosen usage. 2018-07-09 18:41:53 +08:00
liugang 59149a9f35 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-09 17:39:52 +08:00
daitingting 9a3ce4325f Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-09 17:32:28 +08:00
daitingting de5866a8cd * Adjust codes. 2018-07-09 17:32:15 +08:00
Catouse 4598117de4 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-09 17:30:10 +08:00
Catouse eddd9caf61 * finish task #4501 and fix bug #1980. 2018-07-09 17:30:02 +08:00
chenfeiCF f3bebb9b84 Merge branch 'master' of github.com:easysoft/zentaopms 2018-07-09 17:17:14 +08:00
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
daitingting 45b449e475 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-09 16:54:43 +08:00
Catouse 03f4199ba9 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-09 16:52:29 +08:00
Catouse b340c649b7 * fix div close tag. 2018-07-09 16:52:23 +08:00
Catouse fd01e9076e * remove extra divider in mainActions toolbar. 2018-07-09 16:51:51 +08:00
daitingting bb0fada456 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-09 16:51:20 +08:00
daitingting c40bfab493 * If the member is not the last, can not finish task, fix bug #1939. 2018-07-09 16:48:29 +08:00
liugang 3292637fc9 * Finish task #4562 2018-07-09 16:31:59 +08:00
wangyidong 2356ccc125 Merge branch 'master' of github.com:easysoft/zentaopms 2018-07-09 16:22:48 +08:00
wangyidong abc7375b2e * finish task #4596. 2018-07-09 16:22:09 +08:00
daitingting 5df4cbd69f Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-09 16:02:40 +08:00
daitingting a03c5b953e * Finish task #4621. 2018-07-09 16:01:07 +08:00
Catouse 33c8755535 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-09 15:36:10 +08:00
Catouse 0385ee441d * update zui js file. 2018-07-09 15:36:03 +08:00
Catouse 07dcbac2fe * add title attributes. 2018-07-09 15:35:56 +08:00
dajiao007 0b0146cfb5 Merge branch 'master' of http://github.com/easysoft/zentaopms 2018-07-09 15:01:16 +08:00
daitingting 765942f3c4 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-09 14:57:15 +08:00
daitingting e9edde159c * Fix bug for finish multiple task, fix bug #1872. 2018-07-09 14:56:28 +08:00
dajiao007 efa539736c * modify column width of English version 2018-07-09 14:48:38 +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