 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 |
|
|
Catouse
|
da9f795f05
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-07-03 17:00:19 +08:00 |
|
|
Catouse
|
89569635dd
|
* update zui.
|
2018-07-03 17:00:11 +08:00 |
|
|
reneteng
|
84f2f24059
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
* change doc
|
2018-07-03 16:54:51 +08:00 |
|
|
reneteng
|
491fa4db45
|
*change doc trans
|
2018-07-03 16:54:05 +08:00 |
|
|
wangyidong
|
266146bb34
|
* finish task #4583.
|
2018-07-03 16:33:35 +08:00 |
|
|
wangyidong
|
cfd582726e
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2018-07-03 16:30:29 +08:00 |
|
|
wangyidong
|
ef8ffca2e8
|
* finish task #4574.
|
2018-07-03 16:29:58 +08:00 |
|
|
daitingting
|
bf4ccf3bbf
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-07-03 16:27:07 +08:00 |
|
|
daitingting
|
537699060f
|
* Adjust codes.
|
2018-07-03 16:26:44 +08:00 |
|
|
wangyidong
|
441b8cf589
|
* finish task #4580.
|
2018-07-03 16:11:45 +08:00 |
|
|
wangyidong
|
1aa90107c8
|
* finish task #4579.
|
2018-07-03 15:10:53 +08:00 |
|
|
wangyidong
|
ad4a9c655f
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2018-07-03 15:03:14 +08:00 |
|
|
wangyidong
|
ca78637e29
|
* finish task #4568.
|
2018-07-03 15:02:48 +08:00 |
|
|
daitingting
|
7712dd4eab
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-07-03 14:16:41 +08:00 |
|
|
daitingting
|
ac36781aa5
|
* Set the name nowrap.
|
2018-07-03 14:13:40 +08:00 |
|
|
wangyidong
|
783c05a2a2
|
* finish task #4533.
|
2018-07-03 14:04:36 +08:00 |
|
|
wangyidong
|
ec4df0842e
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2018-07-03 13:54:45 +08:00 |
|
|
wangyidong
|
f418bb03a9
|
* finish task #4522.
|
2018-07-03 13:54:22 +08:00 |
|
|
daitingting
|
634d483f97
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-07-03 13:48:27 +08:00 |
|
|
daitingting
|
7c3c36c0d7
|
* Adjust computeHours4Multiple function to fix bug #1921.
|
2018-07-03 13:47:04 +08:00 |
|
|
wangyidong
|
a593949e12
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2018-07-03 10:56:49 +08:00 |
|
|
wangyidong
|
f3c4d8fa0f
|
* finish task #4520.
|
2018-07-03 10:56:28 +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
|
1e1f271eda
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2018-07-03 10:19:06 +08:00 |
|
|
wangyidong
|
c885f64d2e
|
* fix for bind ranzhi.
|
2018-07-03 10:18:34 +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 |
|