 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 |
|
|
daitingting
|
c7164b95b0
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-07-03 09:41:46 +08:00 |
|
|
daitingting
|
fd2754f293
|
* Remove fixedTableHead for these reports.
|
2018-07-03 09:41:10 +08:00 |
|
|
wangyidong
|
7a37f6eaf4
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2018-07-03 09:22:11 +08:00 |
|
|
wangyidong
|
5017751ead
|
* finish task #4518.
|
2018-07-03 09:21:17 +08:00 |
|
|
liugang
|
2e71b11723
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-07-03 09:02:14 +08:00 |
|
|
liugang
|
0810c5eea0
|
* Display doc libs by list.
|
2018-07-03 09:01:46 +08:00 |
|
|
liugang
|
a895d97dae
|
* Change ojbect to object.
|
2018-07-03 09:00:26 +08:00 |
|
|
reneteng
|
4d14558376
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
* chanage cap
|
2018-07-02 16:36:35 +08:00 |
|
|
reneteng
|
6ada063b15
|
*change capitals
|
2018-07-02 16:35:35 +08:00 |
|
|
daitingting
|
c136414e39
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-07-02 16:23:18 +08:00 |
|
|
daitingting
|
2efaf689f5
|
* Hidden product or project by different flow.
|
2018-07-02 16:22:25 +08:00 |
|
|
wangyidong
|
ec4bfe7c6f
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2018-07-02 15:18:29 +08:00 |
|
|
wangyidong
|
ca62dbdaa6
|
* finish task #4514.
|
2018-07-02 15:17:49 +08:00 |
|
|
daitingting
|
f0adb5ad13
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-07-02 15:14:14 +08:00 |
|
|
wangyidong
|
0243e19a03
|
* adjust for bug-batchcreate page.
|
2018-07-02 15:06:11 +08:00 |
|
|
daitingting
|
bd4603ee73
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-07-02 15:05:12 +08:00 |
|
|
daitingting
|
2b4a58c118
|
* Adjust width for product name.
|
2018-07-02 15:04:53 +08:00 |
|
|
wangyidong
|
a582b842e1
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2018-07-02 14:54:10 +08:00 |
|
|
wangyidong
|
bf99726d14
|
* finish task #4500.
|
2018-07-02 14:53:40 +08:00 |
|
|
daitingting
|
c9f0751c8a
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-07-02 14:46:13 +08:00 |
|
|
daitingting
|
20943b8585
|
* Adjust params for showLink.
|
2018-07-02 14:37:22 +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 |
|
|
wangyidong
|
ef46086f77
|
* adjust for bind ranzhi style.
|
2018-07-02 14:16:23 +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 |
|
|
daitingting
|
ea34c73c9b
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-07-02 13:43:20 +08:00 |
|
|
daitingting
|
6892137d99
|
* Display menu that can link by bug.
|
2018-07-02 13:42:13 +08:00 |
|
|
reneteng
|
89002bdd5a
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
*change for 10.0
|
2018-07-02 13:37:27 +08:00 |
|
|
reneteng
|
a0044b641b
|
*chang for 10.0
|
2018-07-02 13:34:04 +08:00 |
|
|
chenfeiCF
|
58704d5c48
|
* Finish task #4616.
|
2018-07-02 13:23:57 +08:00 |
|
|
滔哥
|
c1e7de7815
|
* Fix bug.
|
2018-07-02 13:13:23 +08:00 |
|
|
liugang
|
894d50e0ea
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-07-02 10:51:09 +08:00 |
|
|
liugang
|
370cc91228
|
* Finish task #4545.
|
2018-07-02 10:50:46 +08:00 |
|
|
wangyidong
|
02b2a38ac2
|
* finish task #4492.
|
2018-07-02 10:39:28 +08:00 |
|
|
wangyidong
|
9e085e4b9b
|
* finish task #4491.
|
2018-07-02 10:08:14 +08:00 |
|
|
wangyidong
|
79c506aed5
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2018-07-02 09:40:06 +08:00 |
|
|
liugang
|
16a61575ce
|
* Finish task #4635.
|
2018-07-02 09:38:37 +08:00 |
|
|
chenfeiCF
|
9fd944be46
|
* Adjust log icon of webhook browse page.
|
2018-07-01 09:33:14 +08:00 |
|
|
daitingting
|
a4ab3d9a51
|
* Set forceSync as true.
|
2018-06-28 17:56:56 +08:00 |
|
|
wangyidong
|
1da62a0412
|
* fix for misc-ping in login page.
|
2018-06-28 17:25:35 +08:00 |
|
|
daitingting
|
df5f5ddfa3
|
* Remove useless file.
|
2018-06-28 16:54:38 +08:00 |
|
|
daitingting
|
c58e5c134a
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-06-28 16:27:28 +08:00 |
|
|
daitingting
|
eced83d13a
|
* Adjust $config => $this->config.
|
2018-06-28 16:25:48 +08:00 |
|
|
Catouse
|
da1fdabb85
|
* update classic theme.
|
2018-06-28 09:49:36 +08:00 |
|
|
Catouse
|
f868b5c68f
|
* fix c-actions size.
|
2018-06-27 15:21:00 +08:00 |
|
|
Catouse
|
c2eb36ec27
|
* update classic themes.
|
2018-06-27 15:20:39 +08:00 |
|