daitingting fad7ac2701 Merge branch 'master' of https://github.com/easysoft/zentaopms ...

Conflicts:
	module/build/view/linkbug.html.php
	module/build/view/linkstory.html.php
	module/project/view/create.html.php
	module/release/view/linkbug.html.php
	module/release/view/linkstory.html.php

2018-05-16 17:46:01 +08:00

..

css

Merge branch 'master' of https://github.com/easysoft/zentaopms

2018-05-14 15:25:55 +08:00

js

* remove fixedTheadOfList and fixedTfootAction.

2018-04-28 15:57:16 +08:00

lang

* Refact library of testsuite.

2018-05-14 11:08:10 +08:00

view

Merge branch 'master' of https://github.com/easysoft/zentaopms

2018-05-16 17:46:01 +08:00

config.php

* merge new framework.

2017-06-16 16:52:45 +08:00

control.php

* adjust for ajaxgetdropmenu.

2018-04-04 16:39:21 +08:00

model.php

Merge branch 'zentaopms_9.8'

2018-05-07 16:48:59 +08:00