Commit Graph
1849 Commits
Author SHA1 Message Date
daitingting d048bfbedc * Add treeTask and treeStory in group. 2018-07-10 15:04:00 +08:00
Catouse 03f4199ba9 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-09 16:52:29 +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
Catouse 33c8755535 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-09 15:36:10 +08:00
Catouse 07dcbac2fe * add title attributes. 2018-07-09 15:35:56 +08:00
dajiao007 ca36d3f5ec * modift English 2018-07-09 14:37:25 +08:00
dajiao007 cb13c64e9c * modify english labels 2018-07-09 09:39:49 +08:00
Yagami 634ab84121 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-05 13:38:24 +08:00
Yagami 3768276196 * Finish task #4557、#4521、#4531. 2018-07-05 13:35:08 +08:00
liugang 83c91c5a69 * Finish task #4626 2018-07-05 10:59:29 +08:00
liugang 9b846f5eae * Finish task #4622,4625 2018-07-05 10:25:45 +08:00
liugang b3aaab4f0c * Finish task #4598 2018-07-04 17:05:53 +08:00
liugang 9510ebf17b Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-04 16:18:51 +08:00
liugang d32830d49e * Finish task #4560 2018-07-04 15:39:16 +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
chenfeiCF fbbc51db48 * Finish task #4543. 2018-07-04 09:59:54 +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
wangyidong ca78637e29 * finish task #4568. 2018-07-03 15:02:48 +08:00
daitingting 3c59b7eb6f Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-03 10:38:52 +08:00
daitingting 1dfefe355b * Only compute the hours of parent task.
* Do not compute the hours of canceled tasks.
2018-07-03 10:35:33 +08:00
wangyidong c885f64d2e * fix for bind ranzhi. 2018-07-03 10:18:34 +08:00
chenfeiCF c2c85790b3 * Finish task #4608. 2018-07-02 14:19:26 +08:00
wangyidong 831e54eb3e Merge branch 'master' of github.com:easysoft/zentaopms 2018-07-02 14:17:00 +08:00
wangyidong 4f343e8885 * finish task #4497. 2018-07-02 14:16:38 +08:00
daitingting 60551c3540 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-02 14:13:47 +08:00
daitingting 7c33439d00 * Adjust plan link. 2018-07-02 14:13:27 +08:00
chenfeiCF 0671483735 * Finish task #4615. 2018-07-02 14:00:07 +08:00
reneteng eeb9e29fe7 Merge branch 'master' of https://github.com/easysoft/zentaopms
*delete a
2018-06-26 15:19:25 +08:00
reneteng 73ff01c889 *delete a 2018-06-26 15:18:51 +08:00
daitingting 2046bb4fd9 * Locate to index page when there is no projects. 2018-06-26 15:08:53 +08:00
liugang ff0f06a68a Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-06-26 10:58:42 +08:00
liugang 5e5221ebbc * Optimize codes. 2018-06-26 10:58:18 +08:00
reneteng f61a53e9a3 Merge branch 'master' of https://github.com/easysoft/zentaopms
* change
2018-06-26 10:02:11 +08:00
reneteng 593b321557 * change (s) 2018-06-26 10:01:13 +08:00
liugang ec659f9499 * Add submenu. 2018-06-25 17:06:53 +08:00
liugang fc5e771628 * Fix bugs. 2018-06-25 14:18:48 +08:00
滔哥 de5854c184 * Fix bug#1928. 2018-06-25 10:31:19 +08:00
滔哥 33214ebde8 * Fix bug#1928. 2018-06-24 21:13:08 +08:00
Catouse 9995fdec6c * support show some data view with datatable. 2018-06-23 20:02:57 +08:00
Catouse c4316f104e * fix burn interval selectbox size. 2018-06-23 14:27:25 +08:00
Catouse c4e8472de9 * fix style of search list and chosen and finish task #4484. 2018-06-23 14:17:58 +08:00
wangyidong 58cc58f95c Merge branch 'master' of github.com:easysoft/zentaopms 2018-06-22 16:21:09 +08:00
wangyidong 02a5b86697 * adjust for ux. 2018-06-22 16:20:37 +08:00
liugang 3e1a2b565e * Finish task #4482 2018-06-22 13:15:56 +08:00
liugang bace586795 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-06-22 10:49:53 +08:00
liugang 7c5208c61a * Hide tutorial menu if the global flow is not full. 2018-06-22 10:48:22 +08:00
Catouse 1c72b78bf1 * remove css .table td {overflow:hidden;} and fix bug. 2018-06-22 09:42:12 +08:00