wyd621
|
ff28f5e032
|
Merge branch 'master' of git@github.com:easysoft/zentaopms
Conflicts:
module/productplan/control.php
|
2013-08-01 00:29:30 +08:00 |
|
xia0ta0
|
5115b5c7b2
|
* code for task#1657.
|
2013-08-01 10:14:56 +08:00 |
|
wyd621
|
92d6af50e3
|
* finish task #1618.
|
2013-07-31 15:50:45 +08:00 |
|
wyd621
|
67fd654b2e
|
* code for task #1579.
|
2013-07-18 14:52:01 +08:00 |
|
wyd621
|
e521a8fef3
|
* finish task #1579.
|
2013-07-18 14:17:45 +08:00 |
|
wyd621
|
ec50ddf69d
|
* commit for different.
|
2013-07-17 10:05:00 +08:00 |
|
chencongzhi520@gmail.com
|
4f060ab0fd
|
* code for task#1528.
|
2013-07-11 07:02:43 +00:00 |
|
wangyidong
|
8c4809e15a
|
* finish task #1444.
|
2013-07-03 02:05:50 +00:00 |
|
chencongzhi520@gmail.com
|
e07b48aeb7
|
* adjust the colspan.
|
2013-05-05 08:25:49 +00:00 |
|
chencongzhi520@gmail.com
|
7ea6a14c3c
|
* add fixed.
|
2013-05-03 08:20:11 +00:00 |
|
chencongzhi520@gmail.com
|
5ee5387d82
|
* adjust the colorbox.
|
2013-05-02 08:04:38 +00:00 |
|
chencongzhi520@gmail.com
|
f4438fedc1
|
* code for task#1195.
|
2013-05-02 06:48:31 +00:00 |
|
chencongzhi520@gmail.com
|
c38a1cea71
|
* code for task#1323.
|
2013-05-02 01:40:54 +00:00 |
|
chencongzhi520@gmail.com
|
6bf0f5edbb
|
* finish task#1298.
|
2013-04-15 07:28:23 +00:00 |
|
chencongzhi520@gmail.com
|
63ef3df46b
|
* finish task#1323.
|
2013-04-15 01:32:52 +00:00 |
|
chencongzhi520@gmail.com
|
514d77f0b6
|
* finish task#1212.
|
2013-04-11 02:04:10 +00:00 |
|
chencongzhi520@gmail.com
|
c166bd3332
|
* finish task#1329.
|
2013-04-10 05:47:56 +00:00 |
|
wangyidong
|
abbe7d1e4b
|
* finish task #1166.
|
2013-03-13 04:18:27 +00:00 |
|
wangyidong
|
c24164b3a5
|
* fix some bugs.
|
2013-03-13 02:06:45 +00:00 |
|
chencongzhi520@gmail.com
|
f6b4c30fd3
|
* finish task#1127.
|
2013-02-27 02:54:49 +00:00 |
|
zhujinyong
|
4252f0ef8d
|
* check if ':' exists.
|
2013-02-27 02:21:35 +00:00 |
|
chencongzhi520@gmail.com
|
40065bfc2d
|
* finish task#1095.
|
2013-02-20 00:36:56 +00:00 |
|
wangchunsheng
|
498b5a95d0
|
* when edit company, add http to it's backyard and website fields.
|
2013-02-18 23:41:34 +00:00 |
|
chencongzhi520@gmail.com
|
f3bafc949b
|
* adjust icons.
|
2013-01-20 09:23:06 +00:00 |
|
wangchunsheng
|
8f0d651d9c
|
* convert to unix format.
|
2013-01-18 01:58:14 +00:00 |
|
wangchunsheng
|
48d43cb5e1
|
* change copyright time.
|
2013-01-18 01:18:58 +00:00 |
|
zhujinyong
|
9e468efa69
|
- remove some links.
|
2013-01-17 07:05:53 +00:00 |
|
zhujinyong
|
984f2987bf
|
fix locked time error.
|
2013-01-17 01:25:46 +00:00 |
|
chencongzhi520@gmail.com
|
3eff65eeb0
|
* code for icons.
* add icon for unlock a user.
|
2013-01-10 06:26:41 +00:00 |
|
zhujinyong
|
34cc956878
|
* remove first letter of account.
|
2013-01-07 07:00:20 +00:00 |
|
wangyidong
|
d9807f865c
|
* finish task #1042.
|
2013-01-07 02:18:35 +00:00 |
|
chencongzhi520@gmail.com
|
8feafd6fbb
|
* finish task#1038.
|
2013-01-05 02:42:06 +00:00 |
|
wangchunsheng
|
88bf2ed394
|
+ add the feature to manage user contacts.
|
2012-12-24 08:55:41 +00:00 |
|
wangyidong
|
27c8372f87
|
* change for order by data in server.
|
2012-12-19 08:16:17 +00:00 |
|
wangyidong
|
c0bddae881
|
* add for batch edit user.
|
2012-12-19 07:50:54 +00:00 |
|
wangyidong
|
ec216f73b7
|
* finish task #961.
|
2012-12-19 05:41:11 +00:00 |
|
wangyidong
|
7f1652b1b2
|
* adjust for ajax get search form.
|
2012-12-13 08:07:07 +00:00 |
|
wangchunsheng
|
1d1da6da8f
|
* task#980, add role field to user table.
|
2012-12-13 05:27:14 +00:00 |
|
wangyidong
|
f68b255509
|
* finish task #962.
|
2012-12-11 07:40:07 +00:00 |
|
wangyidong
|
58fe311258
|
* finish task #984.
|
2012-12-11 05:13:40 +00:00 |
|
wangyidong
|
575eadc073
|
* finish task #953.
|
2012-12-10 09:02:11 +00:00 |
|
chencongzhi520@gmail.com
|
b4db115532
|
* add icons for user list.
|
2012-10-25 07:24:18 +00:00 |
|
chencongzhi520@gmail.com
|
03cce99782
|
* adjust the align of list.
|
2012-10-25 05:14:51 +00:00 |
|
zhujinyong
|
a4f420d8ca
|
* adjust align of action.
|
2012-09-27 03:24:26 +00:00 |
|
zhujinyong
|
09f195d547
|
* finish task#588.
|
2012-09-21 03:09:38 +00:00 |
|
wangchunsheng
|
b6607176e9
|
* change edit page's form to dataform.
|
2012-07-02 06:25:41 +00:00 |
|
wangchunsheng
|
0572dba0d5
|
* change createform to dataform.
|
2012-07-02 05:59:24 +00:00 |
|
wangchunsheng
|
78873b15e7
|
* adjust the create form's style.
* adjust row height of table.
* adjust fieldset's style.
|
2012-06-30 07:10:32 +00:00 |
|
wangyidong
|
8f67052278
|
* change for chrome browser.
|
2012-06-05 08:03:39 +00:00 |
|
areyou123456
|
56a91caf16
|
* finish task#788
|
2012-05-19 01:32:39 +00:00 |
|