Commit Graph
12758 Commits
Author SHA1 Message Date
wangyidong 95149dcda1 * delete useless table. 2018-07-05 10:17:24 +08:00
wangyidong 646d9d60ec * finish task #4636. 2018-07-05 10:02:47 +08:00
liugang a1607501bc Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-05 09:33:41 +08:00
liugang d0cb047b58 * Finish task #4617 2018-07-05 09:20:34 +08:00
Yagami 698e51134b * finish task #4631. 2018-07-05 08:54:35 +08:00
Catouse fff69a3471 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-04 20:33:21 +08:00
liugang 33895b89e4 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-04 18:07:52 +08:00
daitingting a886e98b26 * Set word wrap. 2018-07-04 17:23:19 +08:00
daitingting 5a79ac1a3d * Get group pairs order by id. 2018-07-04 17:15:27 +08:00
liugang b3aaab4f0c * Finish task #4598 2018-07-04 17:05:53 +08:00
Catouse aac2a7eb46 * fix sortable not work. 2018-07-04 16:46:06 +08:00
liugang 9510ebf17b Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-04 16:18:51 +08:00
liugang 327aeba49d * Finish task #4591 2018-07-04 15:50:28 +08:00
liugang d32830d49e * Finish task #4560 2018-07-04 15:39:16 +08:00
daitingting 4a85831bea Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-04 15:21:08 +08:00
daitingting ddea3afd97 * Set build field word-wrap. 2018-07-04 15:20:06 +08:00
Yagami 19fdb9358c * finish task #4588. 2018-07-04 14:34:47 +08:00
reneteng 08ce7bb83a Merge branch 'master' of https://github.com/easysoft/zentaopms
* change group, company translation
2018-07-04 14:28:27 +08:00
reneteng b62a8e7193 * change trans 2018-07-04 14:27:30 +08:00
liugang c4f054234f * Finish task #4554 2018-07-04 14:26:40 +08:00
Your Name de8382dfcf Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-04 14:14:39 +08:00
Your Name babcaa6d7f * finish task #4516. 2018-07-04 14:13:14 +08:00
liugang be092decc5 * Finish task #4553. 2018-07-04 14:08:51 +08:00
liugang b308e39f61 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-04 14:07:12 +08:00
liugang f7bd51a861 * Finish task #4549, 4550 2018-07-04 14:05:59 +08:00
Your Name b3ff1c09de Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-04 13:59:50 +08:00
Your Name 58bf0c3e56 * fix bug. 2018-07-04 13:58:43 +08:00
wangyidong d7a6f61ada Merge branch 'master' of github.com:easysoft/zentaopms 2018-07-04 13:28:56 +08:00
wangyidong a703d045e0 * finish task #4587. 2018-07-04 13:28:23 +08:00
daitingting ce9cf8a0c7 * Add 10.0 upgrade sql. 2018-07-04 13:28:04 +08:00
daitingting 9889775cc7 * Set assignedTo as closed when close todo. 2018-07-04 13:24:09 +08:00
daitingting a596142ec5 * Remove useless file. 2018-07-04 11:08:11 +08:00
daitingting 8a63d0de58 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-04 11:05:33 +08:00
daitingting 31a7f1f9a2 * Adjust size for ranzhi logo. 2018-07-04 11:05:01 +08:00
wangyidong e842c24e65 * finish task #4581. 2018-07-04 11:01:22 +08:00
wangyidong a6e0fce73e * finish task #4523. 2018-07-04 10:38:12 +08:00
wangyidong 19bcb993de Merge branch 'master' of github.com:easysoft/zentaopms 2018-07-04 10:09:13 +08:00
wangyidong e0529846e3 * finish task #4585. 2018-07-04 10:08:49 +08:00
chenfeiCF fbbc51db48 * Finish task #4543. 2018-07-04 09:59:54 +08:00
wangyidong ffc34067f8 Merge branch 'master' of github.com:easysoft/zentaopms 2018-07-04 09:48:56 +08:00
wangyidong f055eed1ef * finish task #4590. 2018-07-04 09:48:19 +08:00
daitingting cb65bcbc12 * Set nowrap for modal header. 2018-07-04 09:22:34 +08:00
wangyidong ee930fb1fc Merge branch 'master' of github.com:easysoft/zentaopms 2018-07-04 09:09:10 +08:00
wangyidong bbae037e9f * finish task #4529. 2018-07-04 09:08:20 +08:00
Catouse c63664ecaa Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-03 17:38:20 +08:00
Catouse d6eb5bedc6 * update zui. 2018-07-03 17:38:14 +08:00
reneteng faab8e9937 Merge branch 'master' of https://github.com/easysoft/zentaopms
*change doc translation
2018-07-03 17:14:29 +08:00
reneteng 0876825826 *chang doc translation 2018-07-03 17:13:56 +08:00
liugang 12bff7a96d Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-03 17:03:25 +08:00
liugang 00a69cdbf8 * Optimize codes. 2018-07-03 17:03:09 +08:00