 yuanke
|
f3d74fcd55
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
guange
|
cd69149d3a
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
yuanke
|
51918e1340
|
Merge branch 'develop' into weixin_guange
|
9 years ago |
|
guange
|
51692eadd6
|
改进上线流程
|
9 years ago |
|
yuanke
|
7fe3f9fe71
|
配置改为测试版
|
9 years ago |
|
yuanke
|
cb060e518e
|
正式版配置
|
9 years ago |
|
yuanke
|
6ae57ef23a
|
Merge branch 'weixin_guange' into develop
|
9 years ago |
|
yuanke
|
552f1a2709
|
正式版配置
|
9 years ago |
|
yuanke
|
0a1ecd65e8
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
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 |
|
guange
|
0e415fffff
|
merge
|
9 years ago |
|
guange
|
8c2ae92d31
|
加入性能分析
|
9 years ago |
 huang
|
3485d48163
|
Merge branch 'develop' into rep_quality
Conflicts:
app/controllers/quality_analysis_controller.rb
|
9 years ago |
|
yuanke
|
3c426c8d15
|
微信中英文逗号修改
|
9 years ago |
 daiao
|
dcc37ef847
|
增加作品查看界面中，班级查询条件下，增加暂无分班的查询条件
|
9 years ago |
|
yuanke
|
3700f437cb
|
测试版微信配置
|
9 years ago |
|
yuanke
|
824f9d9174
|
新增创建班级的模版消息
|
9 years ago |
|
huang
|
e766adf087
|
add delete to qa
|
9 years ago |
|
guange
|
f5b4bc3e43
|
merge
|
9 years ago |
|
guange
|
0984c389ae
|
菜单配置
|
9 years ago |
|
yuanke
|
c33bb4709c
|
微信正式版配置
|
9 years ago |
|
yuanke
|
e5c3f1d261
|
微信配置修改
|
9 years ago |
|
yuanke
|
931ff62331
|
Merge branch 'weixin_guange' into develop
|
9 years ago |
|
yuanke
|
caecd45fba
|
测试版微信配置文件
|
9 years ago |
|
guange
|
7c98e0f392
|
merge
|
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 |
|
daiao
|
cc72ca8473
|
Merge branch 'develop' into daiao_dev
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
5f41e191b1
|
在线测验的提示信息
|
9 years ago |
|
guange
|
3c295ba5a1
|
merge
|
9 years ago |
|
guange
|
2c13184d9d
|
修改js引用
|
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
|
5a1090c0e1
|
bug修复
|
9 years ago |
|
cxt
|
0ff8f0a774
|
课程大纲的删除和课程大纲描述的删除
|
9 years ago |
|
yuanke
|
89e42ac776
|
将姓氏改为姓名
|
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
|
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 |
|
yuanke
|
5cc40408ee
|
修改KE单倍行距显示的时候不一致的BUG
|
9 years ago |
|
yuanke
|
397c4cc2a5
|
1.重新发送注册邮件修改2.个人资料修改页面修改3.问题反馈处增加直接加入QQ群的按钮
|
9 years ago |
|
cxt
|
ebb697a49f
|
班级列表、课程大纲的编辑、回复、课程列表
|
9 years ago |
Your Name
|
5c83414828
|
update
|
9 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
|
9 years ago |
|
Your Name
|
3390a2d05f
|
500
|
9 years ago |
|
cxt
|
e066445036
|
课程大纲的显示和编辑
|
9 years ago |
|
yuanke
|
376ec39035
|
Merge branch 'develop' into yuanke_org
|
9 years ago |
|
cxt
|
383483de26
|
课程大纲的左侧栏base，新建课程大纲、新建班级的调整
|
9 years ago |
|
guange
|
5477c794ba
|
Merge remote-tracking branch 'origin/develop' into weixin_guange
|
9 years ago |
|
yuanke
|
ab99645148
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
yuanke
|
5c2ac3e02f
|
修改删除组织成员跨域的BUG
|
9 years ago |
|
guange
|
05f09c4595
|
Merge remote-tracking branch 'origin/develop' into weixin_guange
|
9 years ago |
|
guange
|
c501af70ba
|
.
|
9 years ago |
|
huang
|
46cde061a6
|
Merge branch 'rep_quality' into develop
Conflicts:
db/schema.rb
public/stylesheets/project.css
public/stylesheets/public.css
|
9 years ago |
|
guange
|
b5bfe40693
|
.
|
9 years ago |
|
guange
|
084b545be9
|
修改为正式版
|
9 years ago |
|
guange
|
2c2e1892e5
|
Merge remote-tracking branch 'origin/develop' into weixin_guange
|
9 years ago |
|
guange
|
16a9f017b6
|
error
|
9 years ago |
|
yuanke
|
86a5eccae6
|
组织设置中添加成员BUG解决
|
9 years ago |
|
yuanke
|
64d87b7398
|
修改组织添加成员的BUG
|
9 years ago |
|
yuanke
|
e818b5fb07
|
旧的注册页面去掉
|
9 years ago |
|
cxt
|
bd3277681c
|
分组作业的作业成绩导出、学生列表的导出
|
9 years ago |
|
cxt
|
e457593416
|
作品列表--导出作业成绩：excel中增加缺评扣分、迟交扣分情况
|
9 years ago |
|
yuanke
|
b68e227531
|
没激活的帐号界面
|
9 years ago |
|
guange
|
13273d02de
|
修正了安全问题，不暴露openid
|
9 years ago |
|
huang
|
e3b6bd19e1
|
修改质量分支控制器名
|
9 years ago |
|
huang
|
36e47fa8b1
|
代码质量分析，弹框参数传递
|
9 years ago |
|
huang
|
88b838a89a
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
huang
|
35ee17c4ca
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
huang
|
d0791253d9
|
quality
|
9 years ago |
|
huang
|
fea21fe7cd
|
Merge branch 'develop' into rep_quality
|
9 years ago |
|
yuanke
|
70a762220a
|
组织、项目的资源文件增加描述修改及上传文件时候添加描述，并且所有操作对超级管理员开放
|
9 years ago |
|
huang
|
6707868915
|
登录页面新样式
|
9 years ago |
|
yuanke
|
2781605670
|
课程资源描述增加可编辑
|
9 years ago |
|
cxt
|
c50d307e89
|
分组作业添加成员后再次打开，数据未保存
|
9 years ago |
|
huang
|
c6bd5e6d31
|
饼状图
|
9 years ago |
|
huang
|
0c25e3b13d
|
版本库质量分析 ssh链接
|
9 years ago |
|
cxt
|
3a8a61e404
|
在精品课程列表增加“取消精品”列、在全部课程列表增加“开课学期”列，并支持排序
|
9 years ago |
|
guange
|
d3d31ca3a2
|
Merge remote-tracking branch 'origin/develop' into weixin_guange
|
9 years ago |
|
guange
|
1cb63055cb
|
api可以通过openid来认证
|
9 years ago |
|
guange
|
cbc4f2f6fd
|
菜单更新
|
9 years ago |
|
guange
|
d3c45fd133
|
使用jquery1.3比较小
|
9 years ago |
|
huang
|
3e3c300273
|
Merge branch 'cxt_course' into develop
|
9 years ago |
|
guange
|
b965698fdf
|
merge
|
9 years ago |
|
guange
|
33780759a9
|
修改为html5mode
|
9 years ago |
|
cxt
|
196c92f9c4
|
动态回复最多只加赞三条，点击展开更多时才加载余下的回复
|
9 years ago |
|
cxt
|
91f7e950ee
|
正式版微信
|
9 years ago |
|
cxt
|
5ea6913278
|
配置修改
|
9 years ago |
