yutao
|
085b86bbbe
|
修复bug#2585:IE11.0中--课程--学生列表:导出列表文件名乱码
|
2015-05-19 15:23:13 +08:00 |
huang
|
b645a1aa1e
|
私有项目成员列表非项目成员不能通过URL访问
|
2015-05-19 14:25:10 +08:00 |
huang
|
0123ea32bf
|
私有项目讨论区非项目成员、未登录情况不能访问
|
2015-05-19 14:13:28 +08:00 |
huang
|
b19f61edcb
|
私有项目非项目成员不能通过url访问关注列表
|
2015-05-19 14:02:14 +08:00 |
yutao
|
ff6173c5f5
|
修复bug#2623:留言—删除留言:当留言成功删除后,留言的数量需要手动刷新才会改变。
|
2015-05-19 09:04:42 +08:00 |
yutao
|
4b58699ee9
|
修复bug#2270 :forge/course主页--搜索用户无任何作用
|
2015-05-18 16:41:04 +08:00 |
guange
|
49d836d331
|
上传头像大小和图片类型在后台加入限制,且通过测试
|
2015-05-15 23:47:22 +08:00 |
guange
|
907d89e1cc
|
merge
|
2015-05-15 13:39:26 +08:00 |
guange
|
a1240e8743
|
将过期改为1个月
|
2015-05-15 10:27:26 +08:00 |
guange
|
39308dacfd
|
将setting中的domain合并到host配置中
|
2015-05-14 21:40:34 +08:00 |
alan
|
e3d277163f
|
修改个人主页的链接
Signed-off-by: alan <547533434@qq.com>
|
2015-05-14 16:59:43 +08:00 |
guange
|
af107d861b
|
将下载信息放到课程动态
|
2015-05-13 16:44:12 +08:00 |
guange
|
bb506b2ab4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
# Conflicts:
# db/schema.rb
|
2015-05-13 16:22:44 +08:00 |
guange
|
f31fe81c5d
|
将课程通知中的附件提到列表和动态中
|
2015-05-13 15:33:35 +08:00 |
alan
|
a8d19a119a
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2015-05-13 14:34:07 +08:00 |
alan
|
fe2f6a0d9d
|
修改样式以及添加回复取消功能
Signed-off-by: alan <547533434@qq.com>
|
2015-05-13 14:31:54 +08:00 |
huang
|
406d608edc
|
版本库私有权限设置
--项目成员可以查看
--左侧入口隐藏
--禁止通过url访问
|
2015-05-13 11:46:19 +08:00 |
guange
|
50575c1c20
|
issue的排序经一线人员使用,还是按创建时间排序好
|
2015-05-13 09:45:09 +08:00 |
guange
|
80d44e4f4c
|
新版项目的上传图标问题解决
|
2015-05-12 17:46:54 +08:00 |
alan
|
fe92b05026
|
讨论区编辑添加附件
Signed-off-by: alan <547533434@qq.com>
|
2015-05-12 17:14:07 +08:00 |
alan
|
8773842801
|
Signed-off-by: alan <547533434@qq.com>
|
2015-05-11 17:35:36 +08:00 |
alan
|
8e61136d7f
|
Signed-off-by: alan <547533434@qq.com>
|
2015-05-11 17:23:53 +08:00 |
alan
|
ee18ba7051
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
app/views/boards/_course_show.html.erb
app/views/boards/_project_show.html.erb
Signed-off-by: alan <547533434@qq.com>
|
2015-05-11 16:25:17 +08:00 |
alan
|
25bcc676b9
|
增加附件功能以及修改路由跳转
Signed-off-by: alan <547533434@qq.com>
|
2015-05-11 16:23:15 +08:00 |
sw
|
f12a20f85e
|
用户修改资料保存报错
|
2015-05-08 16:32:55 +08:00 |
sw
|
25e80cefb8
|
Merge branch 'szzh' into guange_dev
|
2015-05-08 15:44:47 +08:00 |
huang
|
f7ad600dde
|
发布帖子不能删除
|
2015-05-08 15:02:04 +08:00 |
guange
|
5c4ad1ce7d
|
merge
|
2015-05-08 14:31:23 +08:00 |
guange
|
eed39ef0ef
|
上传头像会进行压缩
|
2015-05-08 14:28:17 +08:00 |
alan
|
23ef975c23
|
讨论区修改bug
Signed-off-by: alan <547533434@qq.com>
|
2015-05-08 13:04:25 +08:00 |
sw
|
78f30344b9
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-05-08 09:55:00 +08:00 |
alanlong9278
|
336b59f606
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
.gitignore
Gemfile
app/views/issues/index.html.erb
app/views/layouts/_base_feedback.html.erb
app/views/tags/_tag_name.html.erb
Signed-off-by: alanlong9278 <547533434@qq.com>
|
2015-05-08 09:15:50 +08:00 |
sw
|
3cb8962f01
|
登录后域名改为user.truestie.net
|
2015-05-07 17:16:09 +08:00 |
alan
|
4bf08e49da
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2015-05-07 16:10:22 +08:00 |
alan
|
08f1c39033
|
修改课程讨论区界面
Signed-off-by: alan <547533434@qq.com>
|
2015-05-07 16:10:07 +08:00 |
sw
|
0ec08f9361
|
打零分作品仍在未批作品列表显示
|
2015-05-07 11:47:34 +08:00 |
alan
|
4546095ed4
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2015-05-07 09:53:50 +08:00 |
alan
|
eee0df8d22
|
修改课程,项目的讨论区界面
Signed-off-by: alan <547533434@qq.com>
|
2015-05-07 09:53:34 +08:00 |
sw
|
cba473269d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-05-07 09:31:22 +08:00 |
lizanle
|
c9d66c7f5f
|
项目issue翻页后查询条件丢失修改
|
2015-05-07 09:22:30 +08:00 |
lizanle
|
f214a26329
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-05-07 09:03:08 +08:00 |
lizanle
|
700d2985f6
|
项目issue翻页后查询条件丢失修改
|
2015-05-07 09:02:56 +08:00 |
huang
|
aabdd1a4d7
|
剔除新建问题状态时不必要的代码
|
2015-05-06 16:56:08 +08:00 |
sw
|
b456bc0e62
|
评分支持打0分
|
2015-05-06 16:55:59 +08:00 |
guange
|
9ba55296f5
|
修改密码完成后跳到个人资料
|
2015-05-06 15:17:42 +08:00 |
guange
|
bd54edd770
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
2015-05-06 11:05:09 +08:00 |
guange
|
05428213a2
|
让session保持,防止长时间编辑时session丢失
|
2015-05-06 11:04:57 +08:00 |
huang
|
0b524b8a40
|
登录后主页只显示我的项目
方法定义
功能实现
|
2015-05-05 16:29:53 +08:00 |
alan
|
d73ed9e467
|
项目讨论区改版
Signed-off-by: alan <547533434@qq.com>
|
2015-05-05 14:32:40 +08:00 |
guange
|
31c78d295e
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
2015-05-05 11:46:15 +08:00 |
guange
|
86af233042
|
修正autologin多终端登录问题
|
2015-05-05 11:45:58 +08:00 |
alan
|
54078e114c
|
redis缓存服务器的搭建以及对首页的缓存设置
Signed-off-by: alan <547533434@qq.com>
|
2015-05-04 15:20:40 +08:00 |
alan
|
5c67cfc6b6
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into memcached_alan
|
2015-05-04 14:58:22 +08:00 |
alan
|
c80263a66e
|
Merge branch 'guange_dev' into memcached_alan
Conflicts:
.gitignore
Gemfile
app/views/issues/index.html.erb
app/views/layouts/_base_feedback.html.erb
app/views/tags/_tag_name.html.erb
config/environments/production.rb
db/schema.rb
Signed-off-by: alan <547533434@qq.com>
|
2015-05-04 14:58:11 +08:00 |
huang
|
76b4ae24da
|
修改邮件邀请--邮件名
修改成用户点击同意按钮后才能加入项目
|
2015-04-30 16:30:02 +08:00 |
huang
|
119e540373
|
邮件邀请系统已注册的用户
|
2015-04-30 11:08:36 +08:00 |
huang
|
73798a0da4
|
修改邮件两次点击500错误
增加功能:在点击提交时代码后自动创建用户
用户自动登录功能
|
2015-04-30 07:22:47 +08:00 |
guange
|
6c6ef757e1
|
Merge branch 'guange_dev' of http://repository.trustie.net/xianbo/trustie2 into guange_dev
|
2015-04-29 10:43:48 +08:00 |
guange
|
2afdd57fb6
|
修复服务器打包乱码问题
|
2015-04-29 10:43:36 +08:00 |
sw
|
387ab567d2
|
Merge branch 'szzh' into guange_dev
|
2015-04-28 15:06:12 +08:00 |
sw
|
9b15cbd6ee
|
1、老师评分、学生匿评增加附件上传,可上传批改后的作业
2、修改作业列表作业数不显示
|
2015-04-28 12:21:35 +08:00 |
guange
|
38ec84cde9
|
将删除版本库的操作置入后台
|
2015-04-28 10:33:15 +08:00 |
sw
|
b3fb7914e2
|
课程通知评论编辑框不可用,解决方案:编辑跳转到新的页面
|
2015-04-28 10:31:55 +08:00 |
sw
|
827d99fce4
|
Merge branch 'szzh' into guange_dev
|
2015-04-27 18:02:35 +08:00 |
sw
|
0970182cd5
|
当教师只评分不评论时,学生可以进行回复
修改作业评论回复框样式不正确,修改项目用户反馈框显示不正确
|
2015-04-27 17:25:42 +08:00 |
sw
|
f9aaaf38f9
|
打爆下载增加字符集
|
2015-04-27 14:54:01 +08:00 |
guange
|
56f6fa0d86
|
设置zip支持unicode
|
2015-04-27 14:36:11 +08:00 |
guange
|
24ce5191c3
|
zip打包可能有乱码
|
2015-04-27 12:04:08 +08:00 |
sw
|
54ef7e3325
|
修改课程讨论区报错
|
2015-04-24 14:57:44 +08:00 |
guange
|
828d2caefa
|
邮件加入三个邮件设置
|
2015-04-23 17:43:10 +08:00 |
sw
|
75504139c9
|
删除课程留言时留言数自动刷新
|
2015-04-23 15:25:04 +08:00 |
sw
|
cfe0635804
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-04-23 14:31:01 +08:00 |
sw
|
6d058940ec
|
当课程没有讨论区时自动创建其讨论区
|
2015-04-23 11:44:07 +08:00 |
huang
|
681546b860
|
缺陷上传附件显示
项目邮件邀(未完成,需切换分支)
|
2015-04-22 16:49:07 +08:00 |
sw
|
de192761b8
|
Merge branch 'szzh' into guange_dev
Conflicts:
Gemfile
config/application.rb
|
2015-04-22 14:53:40 +08:00 |
guange
|
d2dd77612b
|
将登录默认值改为自动登录
|
2015-04-22 12:42:22 +08:00 |
sw
|
09c51d1a87
|
修改创建作业未启用匿评时,所有作业列表看不到
|
2015-04-22 11:44:52 +08:00 |
sw
|
d279881daf
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
Conflicts:
app/views/courses/settings.html.erb
|
2015-04-22 11:14:12 +08:00 |
sw
|
7b3edb59b0
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/views/courses/_course_members.html.erb
app/views/courses/settings.html.erb
app/views/members/create.js.erb
app/views/members/destroy.js.erb
app/views/members/update.js.erb
public/javascripts/course.js
|
2015-04-22 11:11:51 +08:00 |
huang
|
ca26b0d819
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/views/courses/_course_members.html.erb
app/views/courses/settings.html.erb
app/views/members/create.js.erb
app/views/members/destroy.js.erb
app/views/members/update.js.erb
app/views/users/show.html.erb
public/javascripts/course.js
|
2015-04-22 09:31:13 +08:00 |
sw
|
57193b077e
|
作品列表取消分页显示
|
2015-04-21 20:44:27 +08:00 |
lizanle
|
d6527f1f7e
|
去掉学生列表分页
|
2015-04-21 17:54:49 +08:00 |
lizanle
|
da7528c780
|
重定向到项目配置里的新建版本页面
|
2015-04-21 17:10:07 +08:00 |
whimlex
|
84d7e63d54
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-04-21 15:11:15 +08:00 |
whimlex
|
6195f0a150
|
课程动态添加问卷发布,为通过问卷动态访问课程问卷做权限判断
|
2015-04-21 15:10:45 +08:00 |
lizanle
|
2987253303
|
Merge remote-tracking branch 'origin/dev_hjq' into dev_hjq
|
2015-04-21 09:53:22 +08:00 |
lizanle
|
3b70ab964d
|
issue过滤
|
2015-04-21 09:53:09 +08:00 |
huang
|
4cddb214fd
|
修改资源库站内搜索不能搜索的bug
|
2015-04-21 09:49:10 +08:00 |
alanlong9278
|
0668af4f89
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
app/views/bids/_bid_homework_show.html.erb
Signed-off-by: alanlong9278 <547533434@qq.com>
|
2015-04-20 14:54:02 +08:00 |
huang
|
7d87915413
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/helpers/application_helper.rb
app/helpers/files_helper.rb
app/views/courses/_course_members.html.erb
app/views/courses/settings.html.erb
app/views/homework_attach/_homework.html.erb
public/javascripts/course.js
public/stylesheets/courses.css
public/stylesheets/public.css
|
2015-04-17 15:07:01 +08:00 |
lizanle
|
17838acddb
|
提示信息数组 flatten
|
2015-04-17 14:39:30 +08:00 |
lizanle
|
15e54dd765
|
版本 输入名字不能为空
|
2015-04-17 14:21:18 +08:00 |
lizanle
|
3620cd99b6
|
去掉错误的符号
|
2015-04-17 12:00:47 +08:00 |
sw
|
cdbe95f6ec
|
修改老师配置界面成员搜索
|
2015-04-17 11:48:47 +08:00 |
sw
|
9f862ad7a7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-04-17 11:11:03 +08:00 |
lizanle
|
8cee159cb7
|
Merge remote-tracking branch 'origin/dev_hjq' into dev_hjq
|
2015-04-17 10:38:54 +08:00 |
lizanle
|
e4abc86093
|
版本和版本库bug修改
|
2015-04-17 10:38:39 +08:00 |
sw
|
a8b1ca10b3
|
1、学生作业 --> 作品
2、学生交了作品之后显示修改作品
|
2015-04-17 10:36:32 +08:00 |
z9hang
|
8a26fd4343
|
课程配置:成员配置处添加搜素成员功能
|
2015-04-16 17:28:08 +08:00 |
huang
|
611952eb05
|
新建项目时候设定默认项目类型
新建项目样式异常调整
|
2015-04-16 16:36:34 +08:00 |
lizanle
|
9621c35e8b
|
项目 版本 和 版本库 标签改动
|
2015-04-16 15:08:46 +08:00 |
sw
|
05c74960a8
|
1、增加当前选择的TAG云的样式
2、当选择TAG云过滤之后,对TAG进行添加、删除操作时继续选中该TAG
|
2015-04-16 15:01:37 +08:00 |
lizanle
|
17f495e77b
|
项目 版本 和 版本库 标签改动
|
2015-04-16 14:59:05 +08:00 |
sw
|
5649f4c5a1
|
过滤之后现在所有的TAG云
|
2015-04-16 14:21:05 +08:00 |
sw
|
b7e9442800
|
添加、删除TAG云时TAG云列表刷新
|
2015-04-16 14:01:58 +08:00 |
sw
|
e334dd69f8
|
上传课件后TAG云消失
|
2015-04-16 11:14:06 +08:00 |
sw
|
94ca6cd2f9
|
新建课程时增加密码与课时的验证
|
2015-04-16 10:49:58 +08:00 |
huang
|
95c5e6ac83
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/helpers/application_helper.rb
app/helpers/files_helper.rb
app/helpers/members_helper.rb
app/models/journals_for_message.rb
app/models/mailer.rb
app/models/user.rb
app/views/attachments/_form.html.erb
app/views/bids/_new_homework_form.html.erb
app/views/boards/_project_show.html.erb
app/views/courses/_courses_jours.html.erb
app/views/courses/feedback.html.erb
app/views/courses/new_homework.html.erb
app/views/courses/settings.html.erb
app/views/issues/_list.html.erb
app/views/issues/new.html.erb
app/views/messages/_project_show.html.erb
app/views/messages/edit.html.erb
app/views/news/_project_news.html.erb
app/views/projects/invite_members.html.erb
app/views/projects/settings/_modules.html.erb
app/views/projects/show.html.erb
config/configuration.yml
config/locales/zh.yml
db/schema.rb
public/assets/kindeditor/kindeditor.js
public/javascripts/course.js
public/stylesheets/courses.css
public/stylesheets/public.css
|
2015-04-16 10:26:03 +08:00 |
huang
|
115d77dd01
|
圈子JS和modulesJS
版本库删除按钮
|
2015-04-16 09:49:03 +08:00 |
sw
|
94580ba040
|
11
|
2015-04-15 20:26:54 +08:00 |
sw
|
0cc809c3e0
|
实现课程资源TAG云功能
|
2015-04-15 19:57:16 +08:00 |
sw
|
73ed8b9558
|
全站搜索是不输入条件搜索结果为空
|
2015-04-15 17:43:08 +08:00 |
sw
|
0f6d2676e5
|
tag云显示搜索结果的TAG云
|
2015-04-15 17:31:15 +08:00 |
sw
|
2e3294a341
|
1、增加根据资源列表,获取其TAG与每个TAG数量的hash的方法
2、增加课程资源列表的TAG云的显示
|
2015-04-15 17:16:28 +08:00 |
sw
|
676cf8f180
|
课程上传资源是根据上传的类型,对资源添加默认的TAG
|
2015-04-15 16:00:45 +08:00 |
alanlong9278
|
b704555628
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
.gitignore
Gemfile
app/controllers/discuss_demos_controller.rb
app/models/user.rb
app/views/bids/_bid_homework_show.html.erb
app/views/issues/index.html.erb
app/views/layouts/_base_feedback.html.erb
app/views/poll/publish_poll.js.erb
app/views/poll/republish_poll.js.erb
public/javascripts/application.js
Signed-off-by: alanlong9278 <547533434@qq.com>
|
2015-04-15 12:36:19 +08:00 |
alanlong9278
|
a51ba0c104
|
Signed-off-by: alanlong9278 <547533434@qq.com>
|
2015-04-15 12:30:37 +08:00 |
sw
|
7dbd20e5eb
|
修复刷新页面时只评论未评分表的作品在已评列表中
|
2015-04-15 10:27:17 +08:00 |
sw
|
d1f42a3954
|
教师只评论不评分的作品在未批和已批列表中都有
|
2015-04-15 09:52:33 +08:00 |
sw
|
78dff36d7a
|
老师只评论不评分的学生作业却在已评列表
|
2015-04-15 09:06:54 +08:00 |
sw
|
ee68828132
|
创建课程后跳转URL报错
|
2015-04-15 08:50:29 +08:00 |
huang
|
b8058c3e12
|
用户邀请加入的时候增加拒绝功能
删除提示星系修改
申请加入模块样式调整
|
2015-04-14 19:34:01 +08:00 |
sw
|
c60515ac50
|
学生作业增加按学生真实姓名、昵称、学号搜索功能
|
2015-04-14 19:24:39 +08:00 |
sw
|
e4b2092c7f
|
实现项目成员列表增加成员,以及用户/角色留空时的提示信息
|
2015-04-14 16:56:32 +08:00 |
sw
|
fadca9128f
|
完成项目朋友圈、开发组、科研组直接的切换功能
|
2015-04-14 10:17:42 +08:00 |
sw
|
fb935f124c
|
完成修改项目界面
|
2015-04-11 17:04:48 +08:00 |
sw
|
858a54267f
|
Merge branch 'szzh' into guange_dev
|
2015-04-10 16:39:24 +08:00 |
guange
|
f94184bc81
|
个人动态权限部分性能优化
|
2015-04-10 16:27:26 +08:00 |
sw
|
6b758375f8
|
1、搜索课程报500
2、课程讨论区描述换行显示
|
2015-04-10 15:01:33 +08:00 |
sw
|
9ebed65fde
|
课程动态:作业动态url不对
|
2015-04-10 14:36:30 +08:00 |
guange
|
c489d2400b
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
2015-04-10 10:48:17 +08:00 |
guange
|
5a876d9df1
|
邮件发送时,单个收件人会报错
|
2015-04-10 10:41:44 +08:00 |
sw
|
7303253c07
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-04-09 16:04:15 +08:00 |
whimlex
|
3b84b0417a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-04-09 15:18:31 +08:00 |
whimlex
|
e030c12be8
|
课程动态计数和显示统一;问卷计数对学生和老师和显示统一;课程资源库排序
|
2015-04-09 15:18:13 +08:00 |
sw
|
988f8b7918
|
增加隐藏非项目信息按钮以及路由
实现点击按钮事数据的存储与修改
修改配置文件
|
2015-04-09 10:33:15 +08:00 |
sw
|
c399ab2e4f
|
项目新闻 评论内容获取不正确
|
2015-04-08 18:15:58 +08:00 |
sw
|
c5b55042d4
|
1、修复课程讨论区引用功能
2、回复时回复框自动获得焦点
3、引用样式
4、修改提交回复时下面出现的提示信息
|
2015-04-08 17:25:52 +08:00 |
sw
|
dae907d0b8
|
1、课程通知无法添加评论
2、课程通知界面显示
3、课程通知评论取消按钮
|
2015-04-08 15:49:53 +08:00 |
huang
|
d832514a55
|
新增项目成员列表
|
2015-04-08 11:24:40 +08:00 |
sw
|
3bedddd190
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-04-07 13:49:45 +08:00 |
huang
|
12eaac5683
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/boards/_project_show.html.erb
public/javascripts/course.js
处理冲突
修改项目动态分页
项目到航天中添加“新建项目”
|
2015-04-07 13:47:39 +08:00 |
lizanle
|
84c2e39e6c
|
新闻评论出现错误。误将safe_attributes换为直接属性comments
|
2015-04-03 17:06:19 +08:00 |
sw
|
8e38103bfb
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-04-03 16:40:29 +08:00 |
lizanle
|
1009f7ac07
|
资源id判空
|
2015-04-03 16:35:46 +08:00 |
sw
|
4044cc6674
|
Merge branch 'develop' into szzh
|
2015-04-03 16:01:14 +08:00 |
sw
|
42124e8ec5
|
开启、关闭匿评是有时候报500
|
2015-04-03 15:54:58 +08:00 |
sw
|
500b54a466
|
讨论区回复引用是html代码
|
2015-04-03 15:39:24 +08:00 |
lizanle
|
717463076c
|
删除democontroller
|
2015-04-03 15:09:46 +08:00 |
sw
|
ec8e609ddc
|
打爆下载增加权限、增加打包下载功能
|
2015-04-03 13:10:18 +08:00 |