Commit Graph

4959 Commits

Author SHA1 Message Date
wwccss
63004a95e4 * adjust code. 2014-07-02 13:57:56 +08:00
wangyidong
d1c99218c7 * add the class of red for set color red. 2014-06-30 01:04:31 +00:00
wangyidong
c3b6839e0b * fix a bug. 2014-06-27 06:01:30 +00:00
wangyidong
aaeffac03f Merge branch 'master' of github.com:easysoft/zentaopms 2014-06-27 03:40:00 +00:00
wangyidong
fb329c9502 * change for show file notice. 2014-06-27 03:37:49 +00:00
xia0ta0
4610b92469 * correct wrong word: build. 2014-06-27 10:49:41 +08:00
wangyidong
980408edfa * fix a bug. 2014-06-26 05:13:55 +00:00
wangyidong
edfafc1047 * fix bugs for side cookie. 2014-06-25 03:25:59 +00:00
wangyidong
e7eca025e5 Merge branch 'master' of github.com:easysoft/zentaopms 2014-06-25 02:57:25 +00:00
wangyidong
3c04fb1ef6 * fix a bug for managecontact. 2014-06-25 02:56:48 +00:00
Catouse
28e409542e * added space arround arrow. 2014-06-25 10:44:02 +08:00
wangyidong
c15d972be4 * adjust lang. 2014-06-25 02:18:40 +00:00
Catouse
802fe2b28f * call setTreeBox before document load completely. 2014-06-25 09:58:28 +08:00
Catouse
7c50411c64 * changed icon button color. 2014-06-25 09:07:32 +08:00
xia0ta0
2917c23ffc Merge branch 'master' of github.com:easysoft/zentaopms 2014-06-25 09:01:23 +08:00
xia0ta0
6572e1c2d3 - remove the danger color. 2014-06-25 09:00:43 +08:00
wangyidong
428c4be874 * adjust sql. 2014-06-24 09:24:41 +00:00
wangyidong
6f535764b6 Merge branch 'master' of github.com:easysoft/zentaopms 2014-06-24 09:13:24 +00:00
xia0ta0
6525e86598 * fix error of check.php. 2014-06-24 16:14:33 +08:00
xia0ta0
4f15887eb1 * adjust zh-tw. 2014-06-24 15:33:20 +08:00
xia0ta0
f62491ccff Merge branch 'master' of github.com:easysoft/zentaopms 2014-06-24 14:44:22 +08:00
xia0ta0
6c57a180fb * adjust style. 2014-06-24 10:50:07 +08:00
Catouse
df38ee6e38 * updated themes.
* added new theme 'blackberry'.
 * ajusted style of user/login.
 * added colorbox method in my.js to compatible with older extensions.
2014-06-24 10:21:26 +08:00
xia0ta0
e4ce0bfd72 * add fixed style. 2014-06-24 10:16:05 +08:00
xia0ta0
6d9c9061c0 * format. 2014-06-24 09:56:41 +08:00
xia0ta0
d6cb7e64ba * fix bug#600. 2014-06-24 09:53:45 +08:00
xia0ta0
d9b1e3183e + add updateVersion 6.0.beta1. 2014-06-23 15:27:52 +08:00
xia0ta0
c5f387b238 Merge branch 'master' of github.com:easysoft/zentaopms 2014-06-23 14:08:07 +08:00
xia0ta0
b62a302b84 * code for task#1903. 2014-06-23 14:07:32 +08:00
wangyidong
ce20e88eb8 * fix a bug. 2014-06-23 06:01:40 +00:00
Catouse
fb180107b8 * fixed an error in doc/browse.js. 2014-06-23 11:00:45 +08:00
xia0ta0
f30cfb9a70 * add fixed style to my module. 2014-06-23 10:17:57 +08:00
xia0ta0
bd2feb579a * code for task#1902. 2014-06-23 10:14:11 +08:00
xia0ta0
b55044252f * code for task#1906, fix QQMail. 2014-06-23 10:10:49 +08:00
wangyidong
3e5bb89102 Merge branch 'master' of github.com:easysoft/zentaopms 2014-06-23 01:21:22 +00:00
wangyidong
fd09d90ee2 * fix a bug. 2014-06-23 01:20:49 +00:00
xia0ta0
def3baca15 * code for task#1915. 2014-06-20 14:24:32 +08:00
wangyidong
eee2645fdb * finish task #1893. 2014-06-20 02:18:08 +00:00
xia0ta0
d358657499 Merge branch 'master' of github.com:easysoft/zentaopms 2014-06-20 10:04:47 +08:00
xia0ta0
78534a9e00 * code for task#1892. 2014-06-20 10:02:09 +08:00
xia0ta0
a410db00ca * code for task#1873. 2014-06-20 09:18:07 +08:00
wangyidong
b1c8b7953a * finish task #1904. 2014-06-19 06:26:31 +00:00
wangyidong
3237bbba18 * finish task #1905. 2014-06-19 06:26:06 +00:00
wangyidong
44ca8ae708 Merge branch 'master' of github.com:easysoft/zentaopms 2014-06-19 02:29:25 +00:00
wangyidong
d4fd617924 * finish task #1901. 2014-06-19 02:28:53 +00:00
Catouse
193ac6b956 * removed test data. 2014-06-18 20:08:30 +08:00
Catouse
02854685b1 * changed sparkline to chartjs.
* ajusted style of progressbar.
2014-06-18 19:01:19 +08:00
wangyidong
97bd6b4a0a Merge branch 'master' of github.com:easysoft/zentaopms 2014-06-18 09:21:15 +00:00
wangyidong
c7f978a69a * fix a bug. 2014-06-18 09:20:55 +00:00
xia0ta0
af1628ebc3 Merge branch 'master' of github.com:easysoft/zentaopms 2014-06-18 16:34:17 +08:00