 wangyidong
|
4ebe545ce4
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2014-08-19 08:43:07 +00:00 |
|
|
wangyidong
|
4f85756c37
|
* finish task #2006.
|
2014-08-19 08:42:32 +00:00 |
|
|
chujilu
|
f0f23f663d
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2014-08-19 16:24:30 +08:00 |
|
|
chujilu
|
1958e7c078
|
* task 2062 2063
|
2014-08-19 16:23:47 +08:00 |
|
|
Catouse
|
d51dffc3bc
|
- removed unused css files.
* removed missing file references.
|
2014-08-19 16:08:18 +08:00 |
|
|
Catouse
|
d5f73e47cc
|
- removed unused javascript plugs: alert, autocomplete, colorbox, colorize, dropmenu, jquerytools, bgiframe, incsearch, sorttable, sparkline.
|
2014-08-19 15:47:18 +08:00 |
|
|
Catouse
|
1e609bbdd3
|
* ajusted ui of install.
|
2014-08-19 14:49:52 +08:00 |
|
|
Catouse
|
bb4c86268e
|
* ajusted style of 'admin/index'.
|
2014-08-19 14:32:31 +08:00 |
|
|
Catouse
|
360fb70575
|
* ajusted style of some alerts.
|
2014-08-19 14:29:17 +08:00 |
|
|
wangyidong
|
b4032b5a4c
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2014-08-19 06:17:26 +00:00 |
|
|
wangyidong
|
d75f0eb1eb
|
* adjust code.
|
2014-08-19 06:16:41 +00:00 |
|
|
Catouse
|
b26aaa6fad
|
* ajusted style of 'about' and 'admin/index'.
|
2014-08-19 14:10:56 +08:00 |
|
|
wangyidong
|
2ac1d4bf4b
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2014-08-19 03:30:33 +00:00 |
|
|
wangyidong
|
212b8fdd02
|
* finish task #2068.
|
2014-08-19 03:29:46 +00:00 |
|
|
Catouse
|
69f5de9169
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2014-08-19 11:14:32 +08:00 |
|
|
wangyidong
|
5c879bde70
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2014-08-19 03:03:46 +00:00 |
|
|
wangyidong
|
22d5d53905
|
* finish task #2034.
|
2014-08-19 02:50:41 +00:00 |
|
|
Catouse
|
d658a6fa23
|
* ajusted views.
|
2014-08-19 10:48:50 +08:00 |
|
|
wangyidong
|
ec3c94d3df
|
* finish task #2049.
|
2014-08-19 02:12:09 +00:00 |
|
|
wangyidong
|
42609bd273
|
* finish task #2056.
|
2014-08-19 01:33:57 +00:00 |
|
|
Catouse
|
365b46a8ea
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2014-08-18 18:04:10 +08:00 |
|
|
wangyidong
|
b6864d97f8
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2014-08-18 09:03:43 +00:00 |
|
|
wangyidong
|
de50683bc3
|
* finish task #2050.
|
2014-08-18 09:02:04 +00:00 |
|
|
chujilu
|
1981642105
|
* finish task 1993 add config of is story need review
|
2014-08-18 16:09:34 +08:00 |
|
|
wangyidong
|
7681375b68
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2014-08-18 07:16:58 +00:00 |
|
|
Catouse
|
ba84bb4abc
|
* ajusted style of status label.
|
2014-08-18 15:15:33 +08:00 |
|
|
wangyidong
|
ddc3fd28ea
|
* finish task #2003.
|
2014-08-18 07:14:09 +00:00 |
|
|
Catouse
|
4f5dc2ec79
|
* change tab behavior of kindeditor.
|
2014-08-18 15:14:08 +08:00 |
|
|
chujilu
|
59470dc564
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2014-08-15 17:41:31 +08:00 |
|
|
chujilu
|
ff8ec7a72c
|
* finish task 2019
|
2014-08-15 17:40:56 +08:00 |
|
|
wangyidong
|
f5c3728f53
|
* finish task #2016.
|
2014-08-15 09:12:39 +00:00 |
|
|
wangyidong
|
5d4410f713
|
* finish task #2047.
|
2014-08-15 08:59:52 +00:00 |
|
|
wangyidong
|
62aa572dbc
|
* finish task #2206.
|
2014-08-15 08:28:32 +00:00 |
|
|
wangyidong
|
79c33c873c
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2014-08-15 08:09:48 +00:00 |
|
|
wangyidong
|
f3ae6c1ecc
|
* finish task #1999.
|
2014-08-15 08:09:22 +00:00 |
|
|
chujilu
|
2e344f2e0d
|
* finish 2020
|
2014-08-15 15:59:35 +08:00 |
|
|
chujilu
|
56737be238
|
* add position
|
2014-08-15 14:14:44 +08:00 |
|
|
wangyidong
|
efc65c2a62
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2014-08-15 05:50:53 +00:00 |
|
|
wangyidong
|
2c7596b86b
|
* finish task #2061.
|
2014-08-15 03:05:03 +00:00 |
|
|
wangyidong
|
7af17a2e4a
|
* finish task #2048.
|
2014-08-15 02:41:42 +00:00 |
|
|
wangyidong
|
2268964697
|
* finish task 2058.
|
2014-08-15 01:21:40 +00:00 |
|
|
wangyidong
|
9b1d388493
|
* code for task #2049.
|
2014-08-15 01:20:37 +00:00 |
|
|
chujilu
|
f741787fb7
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2014-08-14 17:35:36 +08:00 |
|
|
chujilu
|
9c435c2cd4
|
* task 2053. add chinese of action dynamic
|
2014-08-14 17:33:07 +08:00 |
|
|
wangyidong
|
163ababa70
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2014-08-14 06:38:37 +00:00 |
|
|
wangyidong
|
4b48e14895
|
* finish task #2002.
|
2014-08-14 06:37:51 +00:00 |
|
|
chujilu
|
16d3078300
|
* task 2011
|
2014-08-14 14:22:39 +08:00 |
|
|
wangyidong
|
45be42a13b
|
* finish task #1934.
|
2014-08-14 06:08:48 +00:00 |
|
|
chujilu
|
0a4698989d
|
* task 2051
|
2014-08-14 10:47:09 +08:00 |
|
|
chujilu
|
6fe88f5ec2
|
* add testtask action in project
|
2014-08-14 10:35:13 +08:00 |
|