wangyidong
|
c5d8317d0a
|
* change upgarde lang.
|
2014-08-22 05:13:49 +00:00 |
|
wangyidong
|
6a1cc1464e
|
* fix a bug for dao.
|
2014-08-22 01:30:29 +00:00 |
|
wangyidong
|
60d7b67121
|
* add restart action.
|
2014-08-22 01:22:00 +00:00 |
|
chujilu
|
f0fab78987
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2014-08-21 20:46:14 +08:00 |
|
chujilu
|
dffe80c44b
|
* rewrite count() method
* change the config of story review
|
2014-08-21 20:41:42 +08:00 |
|
Catouse
|
f86236e92f
|
* ajusted style of status label in data table.
|
2014-08-21 17:44:01 +08:00 |
|
wangyidong
|
4a29cd4d2a
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2014-08-21 09:19:51 +00:00 |
|
wangyidong
|
ffd8af5907
|
* add pause task when import task.
|
2014-08-21 09:19:02 +00:00 |
|
wangyidong
|
b31d4c7cdd
|
* fix for pause action lang.
|
2014-08-21 09:10:04 +00:00 |
|
chujilu
|
7b61d60845
|
* finish change task #2062 #2063
|
2014-08-21 13:53:19 +08:00 |
|
wangyidong
|
e01de20bb1
|
* change for new version.
|
2014-08-21 05:19:31 +00:00 |
|
chujilu
|
493ccc4915
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2014-08-21 10:59:42 +08:00 |
|
chujilu
|
596b131123
|
* finish change task #2011
|
2014-08-21 10:58:57 +08:00 |
|
wangyidong
|
a8dacab1e4
|
Merge branch 'master' of github.com:easysoft/zentaopms
Conflicts:
module/build/control.php
|
2014-08-21 02:58:54 +00:00 |
|
wangyidong
|
1f9ad0afd9
|
* fix a bug.
|
2014-08-21 02:54:52 +00: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 |
|
wangyidong
|
0a6087a146
|
* fix a bug.
|
2014-08-21 02:38:30 +00:00 |
|
wangyidong
|
b0737245d5
|
* config for common image size.
|
2014-08-21 02:02:32 +00:00 |
|
wangyidong
|
1e1e784855
|
* change for error notice.
|
2014-08-21 01:56:20 +00:00 |
|
wangyidong
|
5d2a658222
|
* fix a bug.
|
2014-08-21 01:54:42 +00:00 |
|
wangyidong
|
60595ffa00
|
* fix a bug.
|
2014-08-21 01:43:03 +00: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 |
|