cxt
|
3362ebe321
|
线下作业
|
9 years ago |
cxt
|
c224f97905
|
样式调整、线下作业的作品评分、导出作业成绩报500
|
9 years ago |
cxt
|
cc4b24cdb9
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
9 years ago |
cxt
|
13bae8f8a5
|
线下作业
|
9 years ago |
huang
|
ef8b127225
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
public/javascripts/application.js
|
9 years ago |
huang
|
e588321ada
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
huang
|
61e2e427fd
|
Merge branch 'rep_quality' into develop
|
9 years ago |
huang
|
406d636aac
|
add error system
|
9 years ago |
yuanke
|
06f7594680
|
Merge branch 'yuanke' into develop
|
9 years ago |
cxt
|
37dd447fcb
|
Merge branch 'daiao_dev' into cxt_course
Conflicts:
app/views/admin/courses.html.erb
public/stylesheets/new_user.css
|
9 years ago |
cxt
|
da7509f64c
|
课程大纲的优化
|
9 years ago |
huang
|
b90c90bc60
|
add model error_list
|
9 years ago |
huang
|
92b6171c36
|
sonar error puts
|
9 years ago |
yuanke
|
a732efa6c6
|
1.组织动态中去掉设为首页的文章动态 2.个人主页动态中去掉设为首页的博客动态并将 最上面的博客显示回复内容及可回复
|
9 years ago |
cxt
|
a99b03ff76
|
管理员界面增加配置课程
|
9 years ago |
huang
|
88f8752490
|
添加权限
|
9 years ago |
huang
|
2f8079e85c
|
版本 库存
|
9 years ago |
huang
|
f50c4a879b
|
modified total commits
|
9 years ago |
cxt
|
c5840d75da
|
Merge branch 'daiao_dev' into cxt_course
Conflicts:
db/schema.rb
|
9 years ago |
cxt
|
83617f8475
|
我的资源--》课程资源下不应出现已删除课程的资源
|
9 years ago |
daiao
|
cc72ca8473
|
Merge branch 'develop' into daiao_dev
Conflicts:
db/schema.rb
|
9 years ago |
cxt
|
5f41e191b1
|
在线测验的提示信息
|
9 years ago |
yuanke
|
da19bbd3a0
|
优化了下修改资料界面的代码
|
9 years ago |
cxt
|
0dd7ef4460
|
帖子列表的回复数与实际不符
|
9 years ago |
cxt
|
599cedaa18
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
public/stylesheets/courses.css
public/stylesheets/public.css
|
9 years ago |
cxt
|
cc649ae64b
|
课程讨论区、项目讨论区、帖子详情页面的二级回复
|
9 years ago |
huang
|
d346679eaf
|
Merge branch 'rep_quality' into develop
|
9 years ago |
txz
|
6ac7d322b9
|
some added
|
9 years ago |
huang
|
171130ed74
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
txz
|
61b5a100eb
|
delete log messages
|
9 years ago |
yuanke
|
bc30f1128e
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
yuanke
|
1bfb2918f0
|
KE间距改回原来的,修改课程大纲附件删除下载问题,修改博客标题与置顶样式问题
|
9 years ago |
txz
|
8cc4b7a878
|
public questions
|
9 years ago |
huang
|
67cad6fc25
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
huang
|
374a905d1e
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
huang
|
e74a2ba275
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
9 years ago |
cxt
|
e834d09469
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
9 years ago |
yuanke
|
a7ecfba23b
|
Merge branch 'yuanke_org' into develop
|
9 years ago |
txz
|
25e77497e7
|
consloe pring
|
9 years ago |
cxt
|
0ff8f0a774
|
课程大纲的删除和课程大纲描述的删除
|
9 years ago |
yuanke
|
8db5852a61
|
激活邮箱界面显示邮箱,激活邮箱界面留言太长不能留言解决
|
9 years ago |
txz
|
7178c50b1d
|
branch's total commits
|
9 years ago |
cxt
|
25b5d74a42
|
课程大纲的修改
|
9 years ago |
txz
|
1fbb65b906
|
获取结果ajax加载中
|
9 years ago |
cxt
|
b2aee9b1b8
|
新建课程大纲的描述
|
9 years ago |
cxt
|
18d677c5eb
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
public/stylesheets/courses.css
|
9 years ago |
cxt
|
bdaa9983e3
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
9 years ago |
cxt
|
2c1e0f534c
|
课程大纲
|
9 years ago |
yuanke
|
dfd381fc99
|
Merge branch 'yuanke_org' into develop
Conflicts:
db/schema.rb
|
9 years ago |
txz
|
db1ad932c6
|
Function : update jenkins job
|
9 years ago |