jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
7,105 Commits 98 Branches 0 Tags 0 B
Commit Graph

7105 Commits

Author SHA1 Message Date
huang b89ff45fc2 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-05-26 16:30:28 +08:00
huang a6da2b4a01 项目添加新的编辑器 
显示页面显示样式调整
 2015-05-26 16:30:06 +08:00
yutao 8d82ecc89c ... 2015-05-26 15:01:11 +08:00
yutao 4244c69b46 ... 2015-05-26 14:18:42 +08:00
lizanle aa86be1d8a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-05-26 11:31:21 +08:00
sw f3246b99c9 关闭匿评功能 2015-05-26 11:24:48 +08:00
sw 96354a1c00 教师开启匿评功能完成 2015-05-26 10:22:16 +08:00
sw f3597d9aa5 开启/关闭匿评弹框提示 2015-05-26 10:00:37 +08:00
lizanle 3318d11c6d 个人留言 2015-05-26 09:48:22 +08:00
huang f52058aaf3 课程首页新界面（未完成） 2015-05-26 09:37:29 +08:00
sw e3379cf205 每页显示20份作业 2015-05-26 09:07:32 +08:00
alanlong9278 b1a60d3118 Signed-off-by: alanlong9278 <547533434@qq.com> 2015-05-26 00:01:15 +08:00
alanlong9278 a27b3e9dc6 Signed-off-by: alanlong9278 <547533434@qq.com> 2015-05-25 23:22:11 +08:00
huang d7ed4a985b Merge branch 'szzh' into dev_hjq 2015-05-25 15:35:48 +08:00
huang fc8b5c60c6 切换分支处理 2015-05-25 15:33:52 +08:00
yutao 69affa8a2e ... 2015-05-25 15:19:42 +08:00
sw 010036ffa5 Merge branch 'szzh' into develop 
Conflicts:
	app/controllers/avatar_controller.rb
 2015-05-25 14:48:01 +08:00
sw 6d85535a4d Merge branch 'guange_dev' into szzh 2015-05-25 14:45:58 +08:00
lizanle 122de16180 Merge remote-tracking branch 'origin/szzh' into szzh 2015-05-25 11:05:43 +08:00
lizanle 42fab7c784 schema 2015-05-25 11:05:28 +08:00
guange 437d4e1009 zip下载必须得登录 2015-05-24 13:52:58 +08:00
guange c9b46e4e3a 头像上传bug修复 2015-05-24 13:52:27 +08:00
sw 9e4f303742 还原部分代码 2015-05-23 17:18:13 +08:00
sw 26cb6225c5 Merge branch 'szzh' into develop 2015-05-23 17:13:56 +08:00
lizanle 3fc02585c5 Merge remote-tracking branch 'origin/szzh' into szzh 2015-05-23 17:13:52 +08:00
lizanle 6353a2e2c8 留言分页 2015-05-23 17:13:38 +08:00
sw 0769da1426 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-05-23 17:13:09 +08:00
sw 26ae4b7d74 用户头像不能上传 2015-05-23 17:12:50 +08:00
sw 14aa3e83a8 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-05-23 16:51:46 +08:00
sw 822ac5ade8 公共贴吧引用上传图片异常 2015-05-23 16:50:28 +08:00
yutao fa26f649f2 ... 2015-05-23 16:49:54 +08:00
yutao fe404f8cb1 ... 2015-05-23 16:35:57 +08:00
yutao 8781eb3238 ... 2015-05-23 16:26:15 +08:00
yutao 6fcdae517a Merge branch 'memcached_alan' of http://repository.trustie.net/xianbo/trustie2 into memcached_alan 2015-05-23 16:02:55 +08:00
yutao 72b93fa8f0 ... 2015-05-23 16:02:41 +08:00
sw 85b7a43cb1 Merge branch 'szzh' into develop 2015-05-23 15:19:50 +08:00
sw 74fe58217f Merge branch 'guange_dev' into szzh 2015-05-23 15:19:01 +08:00
sw 3b433cb751 Merge branch 'szzh' into guange_dev 2015-05-23 15:17:46 +08:00
sw 161edea879 修复课程讨论区无法新建帖子 2015-05-23 14:46:30 +08:00
yutao c4c2da48db 修复bug#2485:项目--问题跟踪相关建议 2015-05-23 11:55:26 +08:00
huang ceafa459fd issues编辑时跳转问题 2015-05-23 11:26:36 +08:00
sw c289af2e7c 评分 2015-05-23 11:24:24 +08:00
huang 4ab6558a5c Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-05-23 10:40:48 +08:00
huang 379de18cd6 修改资源库全站搜索： 
1、搜索条件为空的时候，不允许显示全部资源
2、全站搜索，非自己上传的资源不允许查看
3、全站搜索，项目管理员能设置公开权限的资源在全局搜索中也可以
 2015-05-23 10:40:15 +08:00
yutao 491a7a13aa bug#2659 2015-05-23 10:17:16 +08:00
yutao a7de4b4646 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-05-23 10:11:17 +08:00
yutao 5460e98526 ... 2015-05-23 10:10:47 +08:00
huang 2ac2884bf1 修改issue注入异常报错（比如项目名带点号） 2015-05-23 10:10:38 +08:00
yutao 53503bffe4 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-05-22 16:38:41 +08:00
yutao 9c84837492 ... 2015-05-22 16:38:26 +08:00