Commit Graph
1285 Commits
Author SHA1 Message Date
wangyidong 897ad0fdae Merge branch 'master' of github.com:easysoft/zentaopms 2018-07-23 15:07:46 +08:00
wangyidong 38b3d7e6fd * fix bug #2068,2065,2064,2053. 2018-07-23 15:06:49 +08:00
daitingting db8632234f * Use html for link in mail, fix bug #1235. 2018-07-18 17:12:43 +08:00
wangyidong c273b55996 * adjust changelog and zh-tw lang. 2018-07-16 13:26:40 +08:00
daitingting d7a106f0bd * Disabled autoComplate function. 2018-07-13 11:18:33 +08:00
estellbright cfa8c0ee0e *Fix bug #2015. 2018-07-13 10:20:46 +08:00
daitingting bafb11cc5c Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-12 14:15:28 +08:00
daitingting 2e39603dae * Adjust codes. 2018-07-12 14:15:04 +08:00
wangyidong 0cf45cb101 * adjust for create task in project for limited user. 2018-07-12 13:14:46 +08:00
daitingting 4e26d81591 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-12 10:43:48 +08:00
daitingting b9e042dc56 * Adjust computeHours4Multiple function. 2018-07-12 10:43:17 +08:00
liugang d7cd324f90 * Remove defaultChosenOptions. 2018-07-12 09:17:50 +08:00
estellbright 203fd21ff2 Fix Bug #1943,1997,1998,2001,2015. 2018-07-11 10:27:04 +08:00
liugang f505416eb7 * Adjust sub menu settings. 2018-07-10 18:20:04 +08:00
wangyidong f35a90fc97 * adjust for multi task. 2018-07-10 10:34:12 +08:00
daitingting de5866a8cd * Adjust codes. 2018-07-09 17:32:15 +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
daitingting c40bfab493 * If the member is not the last, can not finish task, fix bug #1939. 2018-07-09 16:48:29 +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 07dcbac2fe * add title attributes. 2018-07-09 15:35:56 +08:00
daitingting e9edde159c * Fix bug for finish multiple task, fix bug #1872. 2018-07-09 14:56:28 +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
dajiao007 45df604068 * modify english labels 2018-07-09 09:45:33 +08:00
daitingting e612d79e04 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-05 15:39:08 +08:00
daitingting 5d4b235a62 * Compute begin and end for parent task by his children, finish task #4627. 2018-07-05 15:37:42 +08:00
Catouse 1927697271 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-05 13:39:40 +08:00
Catouse fb093f7f95 * fix modal header style and add title attribute. 2018-07-05 13:39:33 +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 6f4cb41c38 * Finish task #4629 2018-07-05 11:01:42 +08:00
liugang d0cb047b58 * Finish task #4617 2018-07-05 09:20:34 +08:00
wangyidong a703d045e0 * finish task #4587. 2018-07-04 13:28:23 +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
daitingting 7c3c36c0d7 * Adjust computeHours4Multiple function to fix bug #1921. 2018-07-03 13:47:04 +08:00
daitingting fd2754f293 * Remove fixedTableHead for these reports. 2018-07-03 09:41:10 +08:00
chenfeiCF 58704d5c48 * Finish task #4616. 2018-07-02 13:23:57 +08:00
daitingting eced83d13a * Adjust $config => $this->config. 2018-06-28 16:25:48 +08:00
reneteng 73ff01c889 *delete a 2018-06-26 15:18:51 +08:00
liugang a054614d58 * Finish task #4488 2018-06-21 17:39:31 +08:00
Catouse 2544b973ca * fix paste text lines in batch create form not work. 2018-06-20 13:37:38 +08:00
wangyidong 6506886dc3 * adjust for ux. 2018-06-19 10:59:20 +08:00
Catouse 5af1da0382 * improve UI for tutorial mode. 2018-06-15 14:11:11 +08:00
liugang 35bcf01ff5 * Replace $this->config with $config in view files. 2018-06-14 14:34:41 +08:00
daitingting c284d78905 * Set nowrap for them. 2018-06-01 13:29:29 +08:00
Catouse 1825743e27 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-31 16:02:28 +08:00
Catouse 0157ea3523 * remove table responsive container element for create form view. 2018-05-31 15:56:23 +08:00