Commit Graph

9882 Commits

Author SHA1 Message Date
daiao ed448f0087 Merge branch 'develop' into dev_shcool
Conflicts:
	db/schema.rb
2016-09-09 09:31:17 +08:00
cxt cf25dc8dfd 首页的项目列表 2016-09-08 15:00:20 +08:00
Tim 95824e3b6b 新建课程增加名称正确错误示例,课程说明 2016-09-07 11:24:38 +08:00
Tim 99e63b1477 班级推荐数字block颜色字体更改;测验学号超出省略号显示 2016-09-06 17:22:38 +08:00
cxt 17f6b9c286 管理员界面的被留言内容加上“RE: ” 2016-09-06 15:17:49 +08:00
cxt 1e7f3db946 分组作业:组内每个成员都复制一份组长的作业,得分相同 2016-09-06 15:07:43 +08:00
daiao cdd4dfcf09 项目列表中:私有项目对非成员显示,非成员不点击进入 2016-09-05 16:55:56 +08:00
cxt 252851b4ad 课程导航的修改 2016-09-05 16:36:43 +08:00
daiao 3dc0e8407a Merge branch 'develop' into dev_shcool
Conflicts:
	app/views/organizations/_org_member_list.html.erb
	app/views/organizations/setting.html.erb
	app/views/users/_project_news.html.erb
2016-09-05 13:47:39 +08:00
daiao bb0bafb0fd 1.修复项目名称太长,导致动态显示名称与issue编辑图标按钮重叠 2016-09-05 13:27:41 +08:00
Tim f94b048af2 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-05 13:18:55 +08:00
Tim 9ec6074260 将头部帮助中心改为贴吧交流 2016-09-05 13:18:35 +08:00
huang 3e17edecd1 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-02 19:05:46 +08:00
huang 2cd41cde7f 1706项目500问题 2016-09-02 19:05:21 +08:00
cxt c794c6197d Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-02 18:19:43 +08:00
huang 7b6657a3e6 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-02 16:51:23 +08:00
huang 2c03bfbf3a 资源提示权限控制 2016-09-02 16:51:05 +08:00
cxt b8d04c1352 课程列表的主讲老师改为创建老师 2016-09-02 16:40:07 +08:00
cxt 01ca94bc98 未读消息弹框 2016-09-02 16:21:58 +08:00
daiao 9a3603c778 1.基本资料页面,身份为从业者时,直接点确定报提示问题
2.强制修改基本资料,修改资料按键错误
2016-09-02 16:11:14 +08:00
cxt 0d2a3cbe36 测试版消息列表报500 2016-09-02 16:00:54 +08:00
cxt b588495847 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-02 15:26:23 +08:00
huang 6c0bcadf6d Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-02 15:27:08 +08:00
cxt e949566d3d 合并 2016-09-02 15:26:00 +08:00
cxt aaefd8b4aa Merge branch 'cxt_course' into develop
Conflicts:
	app/views/users/_news_replies.html.erb
2016-09-02 15:24:55 +08:00
huang 58176456e1 Merge branch 'develop' into rep_quality 2016-09-02 15:23:00 +08:00
cxt 4cdef4a22b Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-02 15:22:20 +08:00
cxt 613f974440 项目的管理员和课程的老师都有权限删除帖子和新闻/通知的回复 2016-09-02 15:22:09 +08:00
huang 3881e5c5c5 资源搜索的是时候tip局部刷新
组织资源更新公开私有问题
2016-09-02 14:50:06 +08:00
Tim 0d7e9d4f9b Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-02 14:45:11 +08:00
Tim 396664d4e7 课程右侧增加下间距 2016-09-02 14:45:01 +08:00
cxt e70334ea16 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-02 14:43:07 +08:00
cxt 51ef4a96e6 课程导航添加链接 2016-09-02 14:42:59 +08:00
Tim d0a2ea02f2 学生列表名字学号过长省略号显示;课程教师团队名称过长省略号显示 2016-09-02 14:27:49 +08:00
cxt ded6753ce1 访问他人的主页只显示他本人的动态 2016-09-02 14:23:02 +08:00
Tim 0974153364 课程加入路径显示 2016-09-02 13:49:08 +08:00
daiao 27ad94eac2 组织配置界面,成员列表分页 2016-09-02 13:25:01 +08:00
huang 2e36cf6d6a 课程资源库添加资源提示及 2016-09-02 12:12:26 +08:00
huang fa25a78f62 项目资源库 添加私有资源提示及局部过滤刷新 2016-09-02 11:27:35 +08:00
cxt 231c660744 老师对帖子的删除权限 2016-09-02 10:06:03 +08:00
cxt f78595bbbb 管理员界面中的学校列表支持按用户数排序 2016-09-01 17:11:39 +08:00
huang e798381feb 项目资源数改成实时获取 2016-09-01 16:39:09 +08:00
huang 17440ca5dc Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-09-01 16:04:00 +08:00
huang 79e30862e9 change sonar method into restart and cancel push events 2016-09-01 15:58:53 +08:00
Tim 4d93b860f9 作品信息确认时,描述文字折行 2016-09-01 15:35:45 +08:00
Tim d080f0bb16 Merge branch 'cs_optimize_txz' into develop 2016-09-01 14:34:56 +08:00
huang 742c84bb26 项目隐藏之 issue详情页面发送隐藏课程信息 2016-09-01 14:30:56 +08:00
Tim 27a2da8b7b 意见反馈增加二维码 2016-09-01 13:56:13 +08:00
huang 5527b4e3a9 项目隐藏之 公共资源库底端发送隐藏课程信息 2016-09-01 12:25:35 +08:00
huang 4903064a5b 项目隐藏之 公共资源右键发送隐藏课程功能 2016-09-01 12:18:39 +08:00