 ouyangxuhua
|
2076c9b449
|
Merge branch 'develop' into dev_hjq
Conflicts:
app/controllers/organizations_controller.rb
app/views/layouts/_footer.html.erb
app/views/layouts/base_org.html.erb
app/views/organizations/_org_activities.html.erb
db/schema.rb
public/stylesheets/new_user.css
public/stylesheets/org.css
public/stylesheets/public.css
|
2015-12-28 15:32:03 +08:00 |
 huang
|
533be61cf7
|
添加底部样式
|
2015-12-25 16:13:17 +08:00 |
 Tim
|
1a24505eac
|
footer新增图片，样式修改
|
2015-12-25 15:27:45 +08:00 |
 cxt
|
b8d8cece02
|
关联项目的样式修改
|
2015-12-25 14:56:08 +08:00 |
|
Tim
|
c405950469
|
课程关联项目列表显示调整
|
2015-12-23 17:26:13 +08:00 |
 lizanle
|
70f93741d6
|
issue图标问题
|
2015-12-18 14:38:04 +08:00 |
 guange
|
eb97f7dfb2
|
merge
|
2015-12-18 09:20:51 +08:00 |
|
cxt
|
0ed58d4898
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-17 19:07:17 +08:00 |
|
lizanle
|
8ce2dbc4b8
|
issue回复
|
2015-12-17 18:12:38 +08:00 |
|
guange
|
ed649e0724
|
@颜色修改
|
2015-12-17 15:54:29 +08:00 |
|
cxt
|
dc0f004021
|
关联项目的提示信息
|
2015-12-16 15:47:30 +08:00 |
|
cxt
|
53f9141cf1
|
分组作业动态
|
2015-12-09 10:29:54 +08:00 |
|
cxt
|
a9f6e817b4
|
分组作业关联项目
|
2015-12-08 17:37:15 +08:00 |
|
ouyangxuhua
|
5034ddb4b6
|
修复组织的bug
|
2015-12-07 12:53:51 +08:00 |
|
cxt
|
77e96af78f
|
还原分组作业
|
2015-12-03 10:41:27 +08:00 |
|
lizanle
|
582cd6f5d4
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/models/attachment.rb
db/schema.rb
|
2015-11-27 18:47:02 +08:00 |
|
ouyangxuhua
|
58365e8892
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
public/stylesheets/new_user.css
2.组织增加项目功能
|
2015-11-27 09:50:17 +08:00 |
|
ouyangxuhua
|
9c3aed8028
|
增加组织加入课程功能
|
2015-11-26 16:29:50 +08:00 |
|
lizanle
|
4efb660214
|
全站搜索
|
2015-11-26 09:57:53 +08:00 |
|
Tim
|
269d2f992e
|
组织列表搜索框调整后注释
|
2015-11-24 15:02:25 +08:00 |
|
Tim
|
e3d78bf4f0
|
组织样式更改
|
2015-11-20 14:30:54 +08:00 |
|
cxt
|
c50bcf9331
|
对于提交已截止的作业，作业状态由“作品提交中”改为“作品补交中”
|
2015-11-16 10:56:00 +08:00 |
|
cxt
|
7a93fddb83
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-11-12 17:20:11 +08:00 |
|
cxt
|
ab868d7b65
|
课程通知增加置顶
|
2015-11-12 16:52:42 +08:00 |
|
Tim
|
7dd299255b
|
博客页面微调
|
2015-11-11 17:16:19 +08:00 |
|
Tim
|
465c5958f1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-11-11 15:36:06 +08:00 |
|
Tim
|
b8999e1c6e
|
博客标题输入框宽度调整
|
2015-11-11 15:35:47 +08:00 |
|
lizanle
|
508ca7f823
|
文件提交进度条
文件提交提示
|
2015-11-11 11:19:10 +08:00 |
|
lizanle
|
82c377a60a
|
在导航处上传文件不可用
|
2015-11-10 15:18:13 +08:00 |
|
lizanle
|
8d94f57ec3
|
上传文件的进度条不见了。
|
2015-11-10 14:33:46 +08:00 |
|
lizanle
|
157ba12513
|
资源库虚线问题
|
2015-11-09 14:04:51 +08:00 |
|
cxt
|
7f63ceea76
|
作品信息确认框的附件可下载
|
2015-11-06 15:47:32 +08:00 |
|
Tim
|
7418330fdd
|
作品列表样式调整
|
2015-11-05 15:48:58 +08:00 |
|
cxt
|
35c60c3253
|
作品列表的作品信息样式调整
|
2015-11-05 09:37:56 +08:00 |
|
cxt
|
1133b35169
|
作业tag的调整 作业截止时间精确到分
|
2015-11-04 15:24:24 +08:00 |
|
cxt
|
958532bedc
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-11-04 11:16:25 +08:00 |
|
cxt
|
e06f08aa3b
|
作业状态的更改
|
2015-11-04 11:16:11 +08:00 |
|
lizanle
|
b84628af9d
|
regist_btn color
|
2015-11-03 11:23:56 +08:00 |
|
lizanle
|
3360a25a42
|
项目 主页 资源上传 不要翻页，直接弹出资源弹出框
|
2015-11-03 10:28:13 +08:00 |
|
Tim
|
1a2edd9103
|
课程大纲图标等修改
|
2015-10-28 17:34:41 +08:00 |
|
Tim
|
510a1f5fdb
|
搜索按钮鼠标覆盖效果
|
2015-10-28 15:02:21 +08:00 |
|
Tim
|
e58dcc851b
|
资源库搜索图标替换
|
2015-10-28 14:34:39 +08:00 |
|
lizanle
|
07a2263b16
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/controllers/courses_controller.rb
public/stylesheets/new_user.css
|
2015-10-27 14:08:08 +08:00 |
|
cxt
|
25d6ed520e
|
首页的问题动态增加附件上传时间
|
2015-10-27 09:45:22 +08:00 |
|
cxt
|
2f4b29085c
|
首页动态中的表格超出边框
|
2015-10-26 15:26:05 +08:00 |
|
cxt
|
efe4b8609f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-26 11:55:52 +08:00 |
|
cxt
|
2824b56481
|
增加首页教师加入课程的入口
|
2015-10-26 11:54:59 +08:00 |
|
lizanle
|
eaf4ad354f
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/controllers/courses_controller.rb
app/services/courses_service.rb
app/views/courses/join.js.erb
public/stylesheets/new_user.css
|
2015-10-26 10:21:13 +08:00 |
|
ouyangxuhua
|
a42a58fb42
|
修改火狐浏览器出现多余省略号的问题
|
2015-10-24 16:09:44 +08:00 |
|
lizanle
|
2a76461cd1
|
简单博客功能
|
2015-10-24 15:34:43 +08:00 |