 huang
|
7e40ea7604
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-18 21:18:31 +08:00 |
|
huang
|
1cdf397bc0
|
修改关注、申请方法中样式
|
2015-03-18 20:04:59 +08:00 |
whimlex
|
3faec141ce
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-18 18:03:17 +08:00 |
|
whimlex
|
7e8ee49298
|
资源库国际化
|
2015-03-18 18:02:54 +08:00 |
 z9hang
|
9d686349da
|
用户搜索接口添加按昵称或姓名搜索
|
2015-03-18 17:31:35 +08:00 |
|
z9hang
|
52f2a31b84
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-18 17:21:44 +08:00 |
|
z9hang
|
fd2c3e8201
|
修改课程动态接口
|
2015-03-18 17:21:19 +08:00 |
|
huang
|
4ae5e2af7c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-18 15:50:34 +08:00 |
|
huang
|
6498002c71
|
修改项目文档中附件上传无法保存、附件编辑的时候无法显示的bug
原因：里面逻辑判断错误
|
2015-03-18 15:50:00 +08:00 |
 lizanle
|
b4f99c75da
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-03-18 10:17:33 +08:00 |
|
lizanle
|
e49bb18b62
|
cotroller修改：删除记录的同时删除对应的文件
|
2015-03-18 10:17:22 +08:00 |
|
z9hang
|
86c4a7f45d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-18 09:25:46 +08:00 |
|
z9hang
|
930486d21e
|
#2024 course主页：点击进入非当前用户的所在学校，如图，不显示“我的课程”了
|
2015-03-18 09:25:26 +08:00 |
|
lizanle
|
41f302c467
|
cotroller修改
|
2015-03-18 08:53:36 +08:00 |
|
lizanle
|
112b7fb27f
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-03-18 08:53:05 +08:00 |
|
lizanle
|
da69443913
|
需要插入资源上传的时候插入数据库记录
|
2015-03-18 08:52:49 +08:00 |
|
whimlex
|
85c51cac21
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-17 18:04:56 +08:00 |
|
whimlex
|
cfaf788e37
|
新版项目成员，关注者，资源库国际化；修改国际化缺失的bug
|
2015-03-17 18:04:35 +08:00 |
|
z9hang
|
a74acef82a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-17 17:30:02 +08:00 |
|
z9hang
|
943258aebe
|
#2025 项目--资源库：上传资源时，分类资源为“课件”或“研究报告”，成功上传后，都是源代码
|
2015-03-17 17:29:35 +08:00 |
|
huang
|
216bc57004
|
1、进入项目子讨论区之后的页面
2、修改火狐浏览器“展开信息”异常
|
2015-03-17 17:21:49 +08:00 |
|
huang
|
003b088091
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-17 17:03:57 +08:00 |
|
huang
|
4111e2a940
|
1、讨论区新子界面
2、项目右侧优化
|
2015-03-17 17:02:32 +08:00 |
|
lizanle
|
7b9c006d95
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-03-17 16:11:14 +08:00 |
|
lizanle
|
14d1fa0069
|
选择文件后就上传并插入
|
2015-03-17 16:11:05 +08:00 |
|
whimlex
|
e8da6ef871
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-17 15:07:51 +08:00 |
|
whimlex
|
50fe8f2bb7
|
项目配置模块
|
2015-03-17 15:06:15 +08:00 |
|
z9hang
|
274295c948
|
#2033 项目--更多--新闻：编辑新闻相关问题
|
2015-03-17 14:55:21 +08:00 |
|
z9hang
|
d33fd1dc14
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-17 10:12:01 +08:00 |
|
z9hang
|
36554aa90a
|
#2041 项目--问题跟踪：成功新建缺陷给出的提示信息错误
|
2015-03-17 10:11:38 +08:00 |
|
lizanle
|
c3ea741404
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-03-17 10:09:01 +08:00 |
|
lizanle
|
bfc9cdb3a4
|
资源表
|
2015-03-17 10:08:55 +08:00 |
|
z9hang
|
56b331219d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-17 09:54:44 +08:00 |
|
z9hang
|
ffb3e81b99
|
#2048 公共贴吧--贴吧创建人等信息以下拉框显示不合适
|
2015-03-17 09:53:35 +08:00 |
|
lizanle
|
86020804c9
|
ok
|
2015-03-17 09:42:04 +08:00 |
|
lizanle
|
926283398b
|
路由修改
|
2015-03-17 09:41:30 +08:00 |
|
lizanle
|
c77c1a81a4
|
html
|
2015-03-17 09:41:10 +08:00 |
|
lizanle
|
f94222cac7
|
html
|
2015-03-17 09:40:45 +08:00 |
|
lizanle
|
33669017bf
|
controller
|
2015-03-17 09:40:31 +08:00 |
|
lizanle
|
39cbeced87
|
model类
|
2015-03-17 09:39:12 +08:00 |
|
lizanle
|
0c86ba210d
|
Merge remote-tracking branch 'origin/szzh' into szzh
Conflicts:
db/schema.rb
|
2015-03-17 09:38:24 +08:00 |
|
lizanle
|
4817b3106e
|
kindeditor资源类
|
2015-03-17 09:36:20 +08:00 |
|
lizanle
|
a0e8abb5ea
|
kindeditor配置文件
|
2015-03-16 15:31:11 +08:00 |
|
lizanle
|
5c4a62dcc4
|
DiscussDemo代码
|
2015-03-16 15:29:13 +08:00 |
|
lizanle
|
8ad4dba8c2
|
kindeditor资源文件
|
2015-03-16 15:27:37 +08:00 |
|
lizanle
|
48b08a20ee
|
增加gem包
|
2015-03-16 15:26:24 +08:00 |
|
lizanle
|
6bafec03e9
|
添加路由
|
2015-03-16 15:25:41 +08:00 |
|
lizanle
|
a9cafb2241
|
新建DiscussDemo表
|
2015-03-16 15:25:22 +08:00 |
 sw
|
3b0a229c43
|
1.修改意见反馈框默认关闭
2、FIle--->资源库
|
2015-03-13 18:01:16 +08:00 |
|
sw
|
e4895731ae
|
Merge branch 'develop' into szzh
|
2015-03-13 17:48:12 +08:00 |