 huang
|
c07677ef99
|
项目邀请框架 拒绝消息
|
9 years ago |
|
huang
|
c6bc5c9cb8
|
Merge branch 'dev_shcool' into rep_quality
Conflicts:
db/schema.rb
|
9 years ago |
|
huang
|
7413298aad
|
项目邀请码申请及弹框
|
9 years ago |
 daiao
|
9e788c9b6f
|
单位批准及消息框架搭建
|
9 years ago |
|
huang
|
463c09f02c
|
项目邀请弹框
|
9 years ago |
|
daiao
|
5883b451ca
|
在管理员界面添加单位名称列表
|
9 years ago |
|
huang
|
35172dab59
|
管理员界面单位申请框架
|
9 years ago |
 cxt
|
9422e2886c
|
新版班级主页
|
9 years ago |
|
cxt
|
71b5fe1273
|
Merge branch 'develop' into cxt_course
Conflicts:
app/controllers/issues_controller.rb
app/views/issues/_issue_replies.html.erb
app/views/issues/_issue_reply_ke_form.html.erb
db/schema.rb
|
9 years ago |
|
cxt
|
7853b8aa54
|
班级通知、项目新闻、帖子栏目通知的动态和详情页的二级回复， 二级回复代码的整合
|
9 years ago |
|
cxt
|
1c967ce569
|
Merge branch 'rep_quality' into develop
Conflicts:
app/views/users/_user_message_system.html.erb
app/views/users/_user_message_userfeedaback.html.erb
|
9 years ago |
|
cxt
|
b7e6725e1f
|
管理员界面的课程名称双击可点击
|
9 years ago |
|
huang
|
e766adf087
|
add delete to qa
|
9 years ago |
|
huang
|
ef8b127225
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
public/javascripts/application.js
|
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 |
|
cxt
|
a99b03ff76
|
管理员界面增加配置课程
|
9 years ago |
|
cxt
|
c5840d75da
|
Merge branch 'daiao_dev' into cxt_course
Conflicts:
db/schema.rb
|
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 |
|
cxt
|
18d677c5eb
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
public/stylesheets/courses.css
|
10 years ago |
|
cxt
|
bdaa9983e3
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
10 years ago |
|
cxt
|
2c1e0f534c
|
课程大纲
|
10 years ago |
|
yuanke
|
dfd381fc99
|
Merge branch 'yuanke_org' into develop
Conflicts:
db/schema.rb
|
10 years ago |
|
txz
|
db1ad932c6
|
Function : update jenkins job
|
10 years ago |
|
yuanke
|
397c4cc2a5
|
1.重新发送注册邮件修改2.个人资料修改页面修改3.问题反馈处增加直接加入QQ群的按钮
|
10 years ago |
|
cxt
|
ebb697a49f
|
班级列表、课程大纲的编辑、回复、课程列表
|
10 years ago |
Your Name
|
5c83414828
|
update
|
10 years ago |
|
huang
|
2105d2bbdb
|
Merge branch 'develop' into rep_quality
Conflicts:
app/views/repositories/show.html.erb
db/migrate/20160624103411_add_name_to_quality_analyses.rb
db/schema.rb
|
10 years ago |
|
Your Name
|
3390a2d05f
|
500
|
10 years ago |
|
yuanke
|
376ec39035
|
Merge branch 'develop' into yuanke_org
|
10 years ago |
|
cxt
|
383483de26
|
课程大纲的左侧栏base，新建课程大纲、新建班级的调整
|
10 years ago |
|
yuanke
|
ab99645148
|
Merge branch 'yuanke' into develop
|
10 years ago |
|
yuanke
|
5c2ac3e02f
|
修改删除组织成员跨域的BUG
|
10 years ago |
|
huang
|
46cde061a6
|
Merge branch 'rep_quality' into develop
Conflicts:
db/schema.rb
public/stylesheets/project.css
public/stylesheets/public.css
|
10 years ago |
guange
|
da09983f9e
|
Merge branch 'weixin_guange' into cxt_course
|
10 years ago |
|
yuanke
|
86a5eccae6
|
组织设置中添加成员BUG解决
|
10 years ago |
|
yuanke
|
64d87b7398
|
修改组织添加成员的BUG
|
10 years ago |
|
yuanke
|
e818b5fb07
|
旧的注册页面去掉
|
10 years ago |
|
yuanke
|
b68e227531
|
没激活的帐号界面
|
10 years ago |
|
guange
|
13273d02de
|
修正了安全问题，不暴露openid
|
10 years ago |
|
huang
|
e3b6bd19e1
|
修改质量分支控制器名
|
10 years ago |
|
huang
|
36e47fa8b1
|
代码质量分析，弹框参数传递
|
10 years ago |
