 chujilu
|
596b131123
|
* finish change task #2011
|
2014-08-21 10:58:57 +08:00 |
|
|
chujilu
|
068a33b206
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2014-08-21 10:46:09 +08:00 |
|
|
chujilu
|
e49f102189
|
* finish change TASK #2051
|
2014-08-21 10:44:56 +08:00 |
|
|
Catouse
|
b5ed119ab6
|
* ajusted style of status in table.
|
2014-08-20 13:38:31 +08:00 |
|
|
Catouse
|
d30984d42b
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2014-08-20 11:13:07 +08:00 |
|
|
Catouse
|
ebbde07c34
|
* remove transtion effection when show modal.
|
2014-08-20 11:12:56 +08:00 |
|
|
xia0ta0
|
aa2f1f4874
|
* format jsRoot.
|
2014-08-20 10:56:21 +08:00 |
|
|
xia0ta0
|
41c3ffae4f
|
Merge branch 'master' of github.com:easysoft/zentaopms
Conflicts:
module/search/view/buildform.html.php
|
2014-08-20 10:54:50 +08:00 |
|
|
xia0ta0
|
86adf69f6e
|
* fix warning: jsRoot is not defined.
|
2014-08-20 10:48:02 +08:00 |
|
|
Catouse
|
337a05fa65
|
* fixed an error of function 'setModal'.
|
2014-08-20 10:47:33 +08:00 |
|
|
Catouse
|
730fdfe415
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2014-08-20 09:24:54 +08:00 |
|
|
Catouse
|
989b653d11
|
* ajusted style of forms.
|
2014-08-20 09:24:08 +08:00 |
|
|
chujilu
|
f9e44c0075
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2014-08-20 09:22:34 +08:00 |
|
|
chujilu
|
026e6cc927
|
* add $jsRoot in search/view/buildform.html.php
|
2014-08-20 09:21:19 +08:00 |
|
|
Catouse
|
57263b444d
|
* ajusted style of history.
|
2014-08-19 17:35:19 +08:00 |
|
|
Catouse
|
7032ad8681
|
* ajusted style of '#titlebar'.
|
2014-08-19 17:25:04 +08:00 |
|
|
Catouse
|
1de8e06ead
|
* ajusted style of pastetext.
|
2014-08-19 17:05:13 +08:00 |
|
|
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
|
f49abe5e3a
|
- removed unused images.
|
2014-08-19 16:10:29 +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 |
|
|
Catouse
|
9fbf1fda82
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2014-08-19 14:27:51 +08:00 |
|
|
Catouse
|
39a798cedf
|
* removed unused resources.
|
2014-08-19 14:27:44 +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 |
|
|
wangyidong
|
1cb49786a9
|
* finish task #1964.
|
2014-08-19 06:12:52 +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
|
4b25f0c8b1
|
* finish task #2010.
|
2014-08-19 01:53:19 +00:00 |
|
|
wangyidong
|
42609bd273
|
* finish task #2056.
|
2014-08-19 01:33:57 +00:00 |
|
|
Catouse
|
c91334c83c
|
* ajsuted style of 'searchbox'.
|
2014-08-18 18:05:27 +08:00 |
|
|
Catouse
|
603975a8ce
|
* updated zui: added some js compoents.
|
2014-08-18 18:05:06 +08:00 |
|
|
Catouse
|
365b46a8ea
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2014-08-18 18:04:10 +08:00 |
|
|
chujilu
|
32584a0f0d
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2014-08-18 17:59:15 +08:00 |
|
|
chujilu
|
b754f968bb
|
* add count() method in dao
|
2014-08-18 17:58:24 +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 |
|