 daiao
|
304f18ac5e
|
修复课程中，对动态进行筛选的页面呈现方式
|
2016-07-12 15:05:42 +08:00 |
|
daiao
|
97599849ee
|
优化课程中作品下内容显示代码
|
2016-07-11 16:03:45 +08:00 |
|
daiao
|
00d59a5596
|
修复课程坐下下，提示内容的表达形式
|
2016-07-11 15:47:33 +08:00 |
|
daiao
|
670b443cc4
|
Merge branch 'develop' into daiao_dev
|
2016-07-11 10:38:46 +08:00 |
 guange
|
2a2fe9e81d
|
解决android缓存问题
|
2016-07-09 09:22:41 +08:00 |
|
guange
|
8800290db9
|
Merge remote-tracking branch 'origin/develop' into weixin_guange
|
2016-07-08 20:49:55 +08:00 |
 huang
|
8785264e07
|
Merge branch 'rep_quality' into develop
|
2016-07-08 20:39:43 +08:00 |
|
huang
|
62cb7d4568
|
add css
|
2016-07-08 20:35:21 +08:00 |
|
guange
|
135b6ca64b
|
assets
|
2016-07-08 20:04:24 +08:00 |
 cxt
|
320db4ddd9
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
.access_token
|
2016-07-08 20:01:55 +08:00 |
|
guange
|
7c98e0f392
|
merge
|
2016-07-08 20:00:49 +08:00 |
|
cxt
|
d25f401afa
|
管理员界面修改班级名称
|
2016-07-08 19:16:53 +08:00 |
|
cxt
|
6115b7fa4d
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-07-08 18:23:05 +08:00 |
|
cxt
|
3362ebe321
|
线下作业
|
2016-07-08 18:22:59 +08:00 |
|
guange
|
068c8967e1
|
新增班级时名称为1个字符时报错
|
2016-07-08 17:04:17 +08:00 |
|
huang
|
011b7ef4d4
|
Merge branch 'rep_quality' into develop
|
2016-07-08 16:59:05 +08:00 |
|
huang
|
5a40174910
|
change show data's method
|
2016-07-08 16:19:33 +08:00 |
|
cxt
|
c224f97905
|
样式调整、线下作业的作品评分、导出作业成绩报500
|
2016-07-08 15:02:50 +08:00 |
|
huang
|
040b6d4b9d
|
Merge branch 'rep_quality' into develop
|
2016-07-08 14:26:40 +08:00 |
|
huang
|
b22882aead
|
some data for css
|
2016-07-08 14:22:20 +08:00 |
|
huang
|
fcf32474b6
|
modified days and hours for nil data
|
2016-07-08 13:53:54 +08:00 |
|
cxt
|
cc4b24cdb9
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
2016-07-08 13:18:46 +08:00 |
|
cxt
|
13bae8f8a5
|
线下作业
|
2016-07-08 13:17:14 +08:00 |
|
huang
|
ef8b127225
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
public/javascripts/application.js
|
2016-07-08 11:33:51 +08:00 |
|
huang
|
e588321ada
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-07-08 11:31:02 +08:00 |
|
huang
|
61e2e427fd
|
Merge branch 'rep_quality' into develop
|
2016-07-08 11:30:53 +08:00 |
|
huang
|
406d636aac
|
add error system
|
2016-07-08 11:27:03 +08:00 |
 yuanke
|
06f7594680
|
Merge branch 'yuanke' into develop
|
2016-07-08 09:15:55 +08:00 |
|
daiao
|
41fc812ca4
|
修复班级配置--添加成员：用户名称太长的问题
|
2016-07-07 17:34:38 +08:00 |
|
daiao
|
5c4e4e7c8a
|
修复删除班级后再删除课程，提示错误的问题
|
2016-07-07 16:55:34 +08:00 |
|
cxt
|
3b418bc44c
|
如果未登陆，在资源列表最上面增加一个提示句（必须全局统一：您尚未登录，登录后可浏览更多信息），“登录”可做成链接。
|
2016-07-07 16:46:41 +08:00 |
|
huang
|
ec32204809
|
sql_index --to chinese
|
2016-07-07 15:53:07 +08:00 |
|
cxt
|
290abeeaa4
|
班级名称的显示
|
2016-07-07 15:36:08 +08:00 |
|
cxt
|
3b91adf689
|
课程大纲内的编辑图标的显示与隐藏
|
2016-07-07 15:28:33 +08:00 |
|
cxt
|
37dd447fcb
|
Merge branch 'daiao_dev' into cxt_course
Conflicts:
app/views/admin/courses.html.erb
public/stylesheets/new_user.css
|
2016-07-07 15:14:11 +08:00 |
|
cxt
|
da7509f64c
|
课程大纲的优化
|
2016-07-07 15:04:57 +08:00 |
|
guange
|
a2ba65956c
|
.
|
2016-07-07 15:03:45 +08:00 |
|
daiao
|
c621602050
|
修复当鼠标移至区域内才会显示icon
|
2016-07-07 15:02:02 +08:00 |
|
huang
|
b90c90bc60
|
add model error_list
|
2016-07-07 14:22:48 +08:00 |
|
huang
|
92b6171c36
|
sonar error puts
|
2016-07-07 11:08:29 +08:00 |
|
yuanke
|
a732efa6c6
|
1.组织动态中去掉设为首页的文章动态 2.个人主页动态中去掉设为首页的博客动态并将 最上面的博客显示回复内容及可回复
|
2016-07-07 10:42:51 +08:00 |
|
cxt
|
a99b03ff76
|
管理员界面增加配置课程
|
2016-07-07 09:02:41 +08:00 |
|
huang
|
88f8752490
|
添加权限
|
2016-07-06 16:37:19 +08:00 |
|
huang
|
2f8079e85c
|
版本 库存
|
2016-07-06 16:07:17 +08:00 |
|
daiao
|
db3056f1b1
|
隐藏班级列别的创建时间和创建名称！
|
2016-07-06 09:22:20 +08:00 |
|
daiao
|
ad36a1b29e
|
修复课程下编辑框英文换行缺陷
|
2016-07-06 09:07:50 +08:00 |
|
cxt
|
c5840d75da
|
Merge branch 'daiao_dev' into cxt_course
Conflicts:
db/schema.rb
|
2016-07-05 16:49:50 +08:00 |
|
daiao
|
cc72ca8473
|
Merge branch 'develop' into daiao_dev
Conflicts:
db/schema.rb
|
2016-07-05 15:44:47 +08:00 |
|
cxt
|
3ccdf7f9ae
|
课程问答区，项目讨论区的帖子消息通知应直接打开对应的帖子详情界面
|
2016-07-05 15:00:41 +08:00 |
|
yuanke
|
5ecb99196e
|
修改新建项目时公开后面的提示语
|
2016-07-05 14:48:54 +08:00 |