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

Conflicts:
	module/common/lang/en.php
	module/common/lang/menuOrder.php
	module/common/lang/zh-cn.php

2015-02-28 17:29:16 +08:00

..

action

* change for zh-tw.

2015-02-04 15:43:19 +08:00

admin

* change for zh-tw.

2015-02-04 15:43:19 +08:00

api

* change for zh-tw.

2015-02-04 15:43:19 +08:00

backup

* finish task #2206, 2207.

2015-02-28 14:56:35 +08:00

bug

* change for zh-tw.

2015-02-04 15:43:19 +08:00

build

* change for zh-tw.

2015-02-04 15:43:19 +08:00

common

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

2015-02-28 17:29:16 +08:00

company

* change for zh-tw.

2015-02-04 15:43:19 +08:00

convert

* change for zh-tw.

2015-02-04 15:43:19 +08:00

cron

* finish task #2206, 2207.

2015-02-28 14:56:35 +08:00

custom

* change for task #2190.

2015-01-28 15:14:02 +08:00

dept

* change for zh-tw.

2015-02-04 15:43:19 +08:00

dev

+ add dev module.

2015-02-26 16:19:57 +08:00

doc

* change for zh-tw.

2015-02-04 15:43:19 +08:00

editor

* move editor from extension to dev.

2015-02-26 16:16:46 +08:00

extension

- remove editor from extension.

2015-02-27 08:40:37 +08:00

file

* adjust for paste image.

2015-02-04 17:35:09 +08:00

git

* finish task #2206, 2207.

2015-02-28 14:56:35 +08:00

group

* change for zh-tw.

2015-02-04 15:43:19 +08:00

index

* change for task #2190.

2015-01-28 15:14:02 +08:00

install

* change for zh-tw.

2015-02-04 15:43:19 +08:00

mail

* finish task #2208.

2015-02-28 17:26:27 +08:00

misc

* change for zh-tw.

2015-02-04 15:43:19 +08:00

my

* finish task #2206, 2207.

2015-02-28 14:56:35 +08:00

product

* change for zh-tw.

2015-02-04 15:43:19 +08:00

productplan

* change for zh-tw.

2015-02-04 15:43:19 +08:00

project

* finish task #2206, 2207.

2015-02-28 14:56:35 +08:00

qa

* change for zh-tw.

2015-02-04 15:43:19 +08:00

release

* change for zh-tw.

2015-02-04 15:43:19 +08:00

report

* change for zh-tw.

2015-02-04 15:43:19 +08:00

search

* change for zh-tw.

2015-02-04 15:43:19 +08:00

setting

* change for task #2190.

2015-01-28 15:14:02 +08:00

story

* change for zh-tw.

2015-02-04 15:43:19 +08:00

svn

* finish task #2206, 2207.

2015-02-28 14:56:35 +08:00

task

* fix a bug.

2015-02-26 09:35:34 +08:00

testcase

* fix glob error.

2015-02-10 16:09:32 +08:00

testtask

* fix glob error.

2015-02-10 16:09:32 +08:00

todo

* change for zh-tw.

2015-02-04 15:43:19 +08:00

tree

* change for zh-tw.

2015-02-04 15:43:19 +08:00

upgrade

* change for zh-tw.

2015-02-04 15:43:19 +08:00

user

* change method "getDataInJSON" of user model for new API.

2015-02-26 14:05:53 +08:00