Commit Graph
13200 Commits
Author SHA1 Message Date
Catouse c18b40d9fd * finish task #4817 and fix bug #2149. 2018-09-06 16:11:58 +08:00
Catouse 3df464a583 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-09-06 13:51:57 +08:00
Catouse 8128f97863 * finish task #4826 and fix bug #2129. 2018-09-06 11:38:45 +08:00
wangyidong 3b4c510290 Merge branch 'master' of github.com:easysoft/zentaopms 2018-09-06 11:36:46 +08:00
wangyidong f2ef810386 * finish task #4809. 2018-09-06 11:36:26 +08:00
Catouse bf7db07f4e * finish task #4825 and fix bug #2126. 2018-09-06 11:33:20 +08:00
Catouse 51a7178fa0 * finish task #4833 and fix bug #2090. 2018-09-06 11:03:13 +08:00
Catouse f4bcaa6258 * fix noticeBox style. 2018-09-06 10:44:17 +08:00
wangyidong f588b7fc27 Merge branch 'master' of github.com:easysoft/zentaopms 2018-09-06 08:52:03 +08:00
wangyidong 7a49b3b6c7 * finish task #4834. 2018-09-06 08:51:26 +08:00
Yagami 37230abc6d * Finish task #4770. 2018-09-05 16:37:13 +08:00
Yagami 7fce5f23df Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-09-05 15:39:09 +08:00
Yagami 7af638e14c * Fix task #4783. 2018-09-05 15:38:34 +08:00
wangyidong 7e70c106eb * change for kanban height. 2018-09-05 15:35:51 +08:00
wangyidong 30f8957593 Merge branch 'master' of github.com:easysoft/zentaopms 2018-09-05 14:41:41 +08:00
wangyidong 5d4675c428 * finish task #4840. 2018-09-05 14:41:21 +08:00
Catouse a32c1e6433 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-09-05 13:54:13 +08:00
Catouse acd78f289e * change arrow image in flowchart block. 2018-09-05 13:53:59 +08:00
Yagami 985fbf9bd9 * Finish task #4779. 2018-09-05 13:31:15 +08:00
wangyidong 4a49230495 * finish task #4807. 2018-09-05 12:08:52 +08:00
wangyidong 2f5e741284 * finish task #4807. 2018-09-05 11:27:08 +08:00
wangyidong 64984eb2ff Merge branch 'master' of github.com:easysoft/zentaopms 2018-09-05 11:23:49 +08:00
wangyidong f3d9444cfb * finish task #4810. 2018-09-05 11:23:10 +08:00
Yagami c36b588174 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-09-05 11:11:05 +08:00
Yagami 1168249a05 * Finish task #4783. 2018-09-05 11:10:43 +08:00
wangyidong 10e4df924d Merge branch 'master' of github.com:easysoft/zentaopms 2018-09-05 10:40:58 +08:00
wangyidong 92b7e10787 * finish task #4812. 2018-09-05 10:40:31 +08:00
Yagami 20e698b93d * Finish task #4784. 2018-09-05 10:31:38 +08:00
Yagami 6299694b54 * Finish task #4830. 2018-09-05 09:53:35 +08:00
Yagami 9fe756cf2b * Finish task #4837. 2018-09-05 09:05:13 +08:00
wangyidong 0dba6a0985 Merge branch 'master' of github.com:easysoft/zentaopms 2018-09-04 17:11:08 +08:00
wangyidong a34d3d9fcc * finish task #4816. 2018-09-04 17:10:38 +08:00
Yagami cf1db510cc Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-09-04 17:09:39 +08:00
Yagami a29f81bd2d * Finish task #4798,#4797. 2018-09-04 17:09:02 +08:00
wangyidong 726b9ae75a * finish task #4818. 2018-09-04 16:29:05 +08:00
wangyidong 24c982f0a7 * finish task #4821. 2018-09-04 16:27:19 +08:00
wangyidong c1ed944fd1 * finish task #4822. 2018-09-04 16:17:04 +08:00
wangyidong c221d3cd75 Merge branch 'master' of github.com:easysoft/zentaopms 2018-09-04 16:00:25 +08:00
wangyidong e69e353e99 * finish task #4823. 2018-09-04 16:00:04 +08:00
Yagami 82b45ba8f2 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-09-04 15:39:19 +08:00
Yagami 1871ebfeed * Finish task #4813. 2018-09-04 15:39:00 +08:00
wangyidong f6beb1d0d1 Merge branch 'master' of github.com:easysoft/zentaopms 2018-09-04 14:24:47 +08:00
wangyidong 934465c5da * finish task #4825. 2018-09-04 14:24:25 +08:00
Yagami 7c2485a110 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-09-04 14:06:04 +08:00
Yagami 7e93504ad0 * Finish task #4820. 2018-09-04 14:05:47 +08:00
wangyidong 3fdefc81e9 Merge branch 'master' of github.com:easysoft/zentaopms 2018-09-04 13:23:33 +08:00
wangyidong adaed46a79 * finish task #4827. 2018-09-04 13:21:17 +08:00
Yagami 2154470cd1 * Finish task #4836. 2018-09-04 13:15:41 +08:00
Yagami e6ff80e7b5 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-09-04 13:13:39 +08:00
Yagami 7f33483c4c * Finish task #4838. 2018-09-04 13:13:08 +08:00