 azhi
|
6593516075
|
* code for task#1648.
|
2013-08-02 15:12:41 +08:00 |
|
|
azhi
|
f9a6f9a276
|
Merge branch 'master' of git@github.com:easysoft/zentaopms
|
2013-08-02 10:42:58 +08:00 |
|
|
azhi
|
472ad802ad
|
* code for task#1648.
|
2013-08-02 10:42:16 +08:00 |
|
|
wyd621
|
dafd297f6a
|
Merge branch 'master' of git@github.com:easysoft/zentaopms
|
2013-08-02 10:17:34 +08:00 |
|
|
wyd621
|
767c135303
|
* fix bug for waring.
|
2013-08-02 10:15:02 +08:00 |
|
|
azhi
|
79dfd7851b
|
* code for task#1648.
* add dropmenu to common/view jquery/dropmenu.
|
2013-08-02 10:13:49 +08:00 |
|
|
wyd621
|
ff28f5e032
|
Merge branch 'master' of git@github.com:easysoft/zentaopms
Conflicts:
module/productplan/control.php
|
2013-08-01 00:29:30 +08:00 |
|
|
azhi
|
68682101b5
|
* finish task#1645.
|
2013-08-01 16:52:24 +08:00 |
|
|
azhi
|
4b09288597
|
Merge branch 'master' of git@github.com:easysoft/zentaopms
|
2013-08-01 13:32:17 +08:00 |
|
|
azhi
|
633d26dc8a
|
* finish task#1068.
|
2013-08-01 13:31:51 +08:00 |
|
|
xia0ta0
|
984e5efadb
|
* code for task#1630.
|
2013-08-01 11:28:25 +08:00 |
|
|
xia0ta0
|
40ea8cf4c1
|
* code for task#1657.
|
2013-08-01 11:09:58 +08:00 |
|
|
xia0ta0
|
5f6f9cae7d
|
* code for task#1657.
|
2013-08-01 10:16:08 +08:00 |
|
|
wyd621
|
e259c31486
|
* finish task #1623.
|
2013-08-01 00:27:04 +08:00 |
|
|
xia0ta0
|
1326035c57
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2013-07-31 17:42:32 +08:00 |
|
|
xia0ta0
|
8fb44b81e3
|
* code for task#1657.
|
2013-07-31 17:33:04 +08:00 |
|
|
xia0ta0
|
f37afec4bb
|
* code for task#1657.
|
2013-07-31 17:28:03 +08:00 |
|
|
xia0ta0
|
3053c2d248
|
* code for task#1657.
|
2013-07-31 17:07:51 +08:00 |
|
|
azhi
|
b9d2a319cc
|
Merge branch 'master' of git@github.com:easysoft/zentaopms
Conflicts:
module/project/view/task.html.php
module/testcase/view/browse.html.php
|
2013-07-31 16:50:09 +08:00 |
|
|
azhi
|
4b28ede49a
|
* finish task#1659.
* finish task#1661.
|
2013-07-31 16:38:11 +08:00 |
|
|
wyd621
|
9fa49f4918
|
* adjust for link product use chosen.
|
2013-07-31 15:36:48 +08:00 |
|
|
wyd621
|
52df5c7003
|
* adjust setModal4List.
|
2013-07-31 10:49:27 +08:00 |
|
|
xia0ta0
|
12b6de8187
|
* code for task#1657.
|
2013-07-30 16:59:38 +08:00 |
|
|
xia0ta0
|
bb0dac2191
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2013-07-30 16:37:40 +08:00 |
|
|
xia0ta0
|
aad33ebc2a
|
* code for task#1657.
|
2013-07-30 16:35:27 +08:00 |
|
|
xia0ta0
|
c8e274ce03
|
* code for task#1657.
|
2013-07-30 16:33:27 +08:00 |
|
|
xia0ta0
|
5e00f938e6
|
* code for task#1657.
|
2013-07-30 16:10:28 +08:00 |
|
|
wyd621
|
3a4e56ced5
|
* finish task #1641.
|
2013-07-30 15:13:41 +08:00 |
|
|
xia0ta0
|
fb2200d6b0
|
* code for task#1657.
|
2013-07-30 14:54:02 +08:00 |
|
|
xia0ta0
|
5709bd9b74
|
* code for task#1657.
|
2013-07-30 10:45:06 +08:00 |
|
|
azhi
|
be00ccf5d5
|
* code for task#1602.
|
2013-07-29 13:41:50 +08:00 |
|
|
xia0ta0
|
91fd958016
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2013-07-25 10:04:13 +08:00 |
|
|
xia0ta0
|
625831b766
|
* code for task#1613.
|
2013-07-25 10:03:27 +08:00 |
|
|
azhi
|
bcd14731a3
|
Merge branch 'master' of git@github.com:easysoft/zentaopms
|
2013-07-24 16:04:25 +08:00 |
|
|
xia0ta0
|
2d4a058478
|
* inLink has been changed to static function.
|
2013-07-24 15:37:07 +08:00 |
|
|
azhi
|
44be4dc462
|
* code for task#1604.
|
2013-07-24 15:21:04 +08:00 |
|
|
azhi
|
a87d5832e2
|
* finish task#1604.
|
2013-07-24 15:15:44 +08:00 |
|
|
azhi
|
a3a214318c
|
* finish task#1602.
|
2013-07-24 14:41:02 +08:00 |
|
|
wyd621
|
fd4a36dc8c
|
* finish task #1601.
|
2013-07-23 15:49:47 +08:00 |
|
|
wyd621
|
aae95743f9
|
* finish task #1571.
|
2013-07-18 16:48:06 +08:00 |
|
|
wwccss
|
bba40c0072
|
Merge branch 'master' of git@github.com:easysoft/zentaopms
|
2013-07-18 09:18:06 +08:00 |
|
|
wwccss
|
c20261cb20
|
* init ext directory again.
|
2013-07-18 09:17:31 +08:00 |
|
|
wyd621
|
4038b40e74
|
* finish task #1576.
|
2013-07-18 08:30:14 +08:00 |
|
|
wwccss
|
e4405b929e
|
* remove E_STRICT errors.
|
2013-07-17 20:13:46 +08:00 |
|
|
wyd621
|
c920eeb60f
|
* finish task #1575.
|
2013-07-17 11:05:28 +08:00 |
|
|
wyd621
|
ec50ddf69d
|
* commit for different.
|
2013-07-17 10:05:00 +08:00 |
|
|
wyd621
|
1aa58c8895
|
Merge branch 'master' of git@github.com:easysoft/zentaopms
|
2013-07-17 10:04:22 +08:00 |
|
|
wyd621
|
09a9872a14
|
* finish task #1573.
|
2013-07-17 09:41:40 +08:00 |
|
|
azhi
|
6c92b0ec48
|
* finish task#1439.
|
2013-07-17 09:12:04 +08:00 |
|
|
chencongzhi520@gmail.com
|
5c29ce162a
|
* code for task#1534.
|
2013-07-15 08:43:26 +00:00 |
|