 huang
|
4999b47b44
|
项目去掉ID
|
2016-03-17 16:46:26 +08:00 |
|
huang
|
1f2cd38c3d
|
Merge branch 'develop' into hjq_new_course
|
2016-03-17 16:38:00 +08:00 |
|
huang
|
1b0bcd0c05
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-17 16:37:24 +08:00 |
|
huang
|
cefa6efc1b
|
项目动态中加入附件
|
2016-03-17 16:36:57 +08:00 |
 cxt
|
b8b34f7861
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-17 16:23:47 +08:00 |
|
cxt
|
368c70b14d
|
Merge branch 'cxt_course' into develop
|
2016-03-17 16:23:38 +08:00 |
|
cxt
|
1489c8d924
|
课程简介没有内容就不要显示
|
2016-03-17 16:22:29 +08:00 |
 ouyangxuhua
|
093c777b23
|
Merge branch 'develop' into ouyangxuhua
Conflicts:
app/views/users/_user_message_course.html.erb
|
2016-03-17 16:18:30 +08:00 |
|
cxt
|
602864bd71
|
个人主页课程列表: 1、增加学期信息 2、排序不对
|
2016-03-17 16:17:33 +08:00 |
|
huang
|
22ed0c1b6c
|
解决上线gem问题
|
2016-03-17 16:12:06 +08:00 |
|
cxt
|
10da3e1e53
|
题库样式调整
|
2016-03-17 16:11:04 +08:00 |
|
huang
|
7e0aa44b68
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/users/_user_message_userfeedaback.html.erb
|
2016-03-17 16:06:36 +08:00 |
|
huang
|
28cb1755d8
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/files/_org_subfield_list.html.erb
db/schema.rb
|
2016-03-17 16:06:05 +08:00 |
|
cxt
|
6b8ae56ce4
|
Merge branch 'alan_develop' into develop
|
2016-03-17 16:04:06 +08:00 |
|
huang
|
6f356d2595
|
Merge branch 'hjq_new_course' into develop
|
2016-03-17 16:02:50 +08:00 |
|
cxt
|
c5768ea2fc
|
Merge branch 'cxt_course' into develop
|
2016-03-17 16:02:38 +08:00 |
|
huang
|
03597b85ff
|
解决项目被淹没问题
|
2016-03-17 16:02:36 +08:00 |
|
cxt
|
0f80f0e377
|
作品列表：已禁用了匿评的作业就不要显示“匿评截止时间”了
|
2016-03-17 15:54:10 +08:00 |
|
cxt
|
d72aa3a93c
|
Merge branch 'develop' into cxt_course
Conflicts:
app/controllers/homework_common_controller.rb
app/views/student_work/show.js.erb
public/javascripts/application.js
public/stylesheets/base.css
public/stylesheets/public_new.css
|
2016-03-17 15:27:52 +08:00 |
|
cxt
|
a1f393c117
|
批改程序作业时，如果一个同学A的程序打开后没有收起，则后面打开的学生的程序就和A的程序一样
|
2016-03-17 15:21:09 +08:00 |
|
cxt
|
4de81605a4
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
2016-03-17 15:19:41 +08:00 |
|
cxt
|
2eefdcd0ee
|
批改程序作业时，如果一个同学A的程序打开后没有收起，则后面打开的学生的程序就和A的程序一样
|
2016-03-17 15:17:00 +08:00 |
|
huang
|
42d89c7ed0
|
课程导语发送这改成课堂使者
|
2016-03-17 15:12:28 +08:00 |
 alan
|
8e41b19563
|
消息列表取消tip
|
2016-03-17 15:09:08 +08:00 |
|
cxt
|
a8780be9b4
|
提交作品、提交作业、发布课程帖子、组织文章实现每隔10秒自动保存帖子
|
2016-03-17 15:03:34 +08:00 |
|
huang
|
84470af2ff
|
删除的课程和项目不在发送中显示
|
2016-03-17 14:47:14 +08:00 |
|
alan
|
9265186307
|
修改user动态中issue行高，使之与project中的一样
|
2016-03-17 14:36:05 +08:00 |
|
alan
|
a4e2fd741e
|
删除issue，返回页面不变
|
2016-03-17 14:13:29 +08:00 |
|
huang
|
ee40255d7e
|
资源库bytes改成b
|
2016-03-17 14:09:13 +08:00 |
|
huang
|
0d1fc409d1
|
版本库提示同一高度
|
2016-03-17 13:58:55 +08:00 |
|
huang
|
ab3fc0fb2c
|
成员提供真实姓名
|
2016-03-17 13:02:32 +08:00 |
|
huang
|
c8eb2d9c95
|
项目、组织添加资源历史版本下载
|
2016-03-17 12:49:00 +08:00 |
|
huang
|
b3faef601b
|
修复资源库样式问题
|
2016-03-17 12:43:35 +08:00 |
|
huang
|
7ff946e488
|
课程资源库提供历史版本下载
|
2016-03-17 12:37:05 +08:00 |
|
ouyangxuhua
|
805784a858
|
组织内的链接加上Setting.protocol
|
2016-03-17 10:52:19 +08:00 |
|
huang
|
0a881f14e8
|
导入添加自动搜索
|
2016-03-16 17:06:11 +08:00 |
|
alan
|
4d82f0c959
|
在个人动态、项目动态以及项目问题跟踪页面《issue动态要右上角显示功能菜单》
|
2016-03-16 16:03:53 +08:00 |
|
alan
|
3b63071dee
|
修复《issue的展开和收起在属性表格的上面》
|
2016-03-16 15:12:50 +08:00 |
|
ouyangxuhua
|
baf547417e
|
组织下的链接用Setting.protocol表示协议
|
2016-03-16 14:57:32 +08:00 |
|
huang
|
e8e9688644
|
项目资源数目迁移
|
2016-03-16 14:18:57 +08:00 |
|
huang
|
064dc81ed6
|
解决公共资源删除资源后统计数字不减少的问题
（增加删除回调）
|
2016-03-16 13:48:02 +08:00 |
|
ouyangxuhua
|
ea6de1407e
|
Merge branch 'develop' into ouyangxuhua
Conflicts:
app/helpers/application_helper.rb
|
2016-03-16 12:36:15 +08:00 |
|
ouyangxuhua
|
dcadadae03
|
退出和用户的链接使用https:// +Setting.host_name
|
2016-03-16 11:24:55 +08:00 |
|
alan
|
050a266985
|
Merge branch 'FX-alan-message-access-slow' into alan_develop
|
2016-03-16 11:17:35 +08:00 |
|
alan
|
0ac12f3400
|
Merge branch 'FX-alan-admin-deleteuser-500' into alan_develop
|
2016-03-16 11:16:52 +08:00 |
|
alan
|
5343759f2f
|
Merge branch 'FX-alan-search-404' into alan_develop
|
2016-03-16 11:16:41 +08:00 |
|
ouyangxuhua
|
da1b27cd38
|
Merge branch 'ouyang' of https://git.trustie.net/jacknudt/trustieforge into ouyang
|
2016-03-16 10:01:42 +08:00 |
|
ouyangxuhua
|
9bac560906
|
超级管理员有编辑和删除博客的权限
|
2016-03-16 10:00:21 +08:00 |
|
huang
|
9aab10c05a
|
代码更新
|
2016-03-15 17:29:37 +08:00 |
|
cxt
|
2ce2134f0b
|
浏览器tab的title，显示用户姓名，不是登录名
|
2016-03-15 17:25:46 +08:00 |