 cxt
|
3b7679b254
|
课程大纲列表
|
2016-07-01 11:29:03 +08:00 |
|
cxt
|
a50e15b2ab
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
Conflicts:
app/views/users/_user_syllabus_list.html.erb
db/schema.rb
|
2016-07-01 11:15:03 +08:00 |
|
cxt
|
2c1e0f534c
|
课程大纲
|
2016-07-01 11:11:53 +08:00 |
 yuanke
|
dfd381fc99
|
Merge branch 'yuanke_org' into develop
Conflicts:
db/schema.rb
|
2016-07-01 09:31:19 +08:00 |
 txz
|
db1ad932c6
|
Function : update jenkins job
|
2016-07-01 09:31:05 +08:00 |
|
yuanke
|
a8bd91754d
|
修改博客详情里面内容前面多空格的BUG
|
2016-07-01 09:27:46 +08:00 |
|
txz
|
24f1375a4e
|
modified job
|
2016-06-30 17:36:33 +08:00 |
|
yuanke
|
5cc40408ee
|
修改KE单倍行距显示的时候不一致的BUG
|
2016-06-30 16:30:02 +08:00 |
|
Tim
|
10f52f110f
|
课程大纲列表点击展开收起，配置按钮链接跳转实现
|
2016-06-30 16:12:25 +08:00 |
|
yuanke
|
397c4cc2a5
|
1.重新发送注册邮件修改2.个人资料修改页面修改3.问题反馈处增加直接加入QQ群的按钮
|
2016-06-30 16:08:36 +08:00 |
|
cxt
|
4314f6e36a
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
Conflicts:
db/schema.rb
|
2016-06-30 15:37:16 +08:00 |
|
cxt
|
ac4218bfb0
|
课程大纲列表
|
2016-06-30 15:36:46 +08:00 |
 daiao
|
2eb7aa7c38
|
修改精品课程下-全部课程下 除序列、主讲老师和课程名外的所有列进行排序！
|
2016-06-30 11:32:14 +08:00 |
 huang
|
587ab510e5
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
2016-06-30 10:58:30 +08:00 |
|
cxt
|
ebb697a49f
|
班级列表、课程大纲的编辑、回复、课程列表
|
2016-06-30 10:44:11 +08:00 |
Your Name
|
5c83414828
|
update
|
2016-06-30 10:17:53 +08:00 |
 guange
|
c248249983
|
注册没有loading图问题
|
2016-06-29 21:11:21 +08:00 |
|
guange
|
0bb5c8b5fb
|
注册绑定问题
|
2016-06-29 21:09:49 +08:00 |
|
huang
|
f003959ca4
|
Merge branch 'develop' into rep_quality
|
2016-06-29 18:16:51 +08:00 |
|
Tim
|
590b879f02
|
追加附件弹框不固定bug修复
|
2016-06-29 16:54:12 +08:00 |
|
guange
|
2886bba2bc
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-06-29 15:58:45 +08:00 |
|
txz
|
2596231ce7
|
微信新动态样式更新
|
2016-06-29 15:44:32 +08:00 |
|
huang
|
f7e872cb6c
|
权限修改，项目成员都可以提交质量分析job
|
2016-06-29 15:20:14 +08:00 |
|
huang
|
984aeb2783
|
Merge branch 'rep_quality' into develop
|
2016-06-29 15:05:11 +08:00 |
|
huang
|
daf14178cd
|
修改权限，只有项目成员能够代码质量分析
|
2016-06-29 14:20:02 +08:00 |
|
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
|
2016-06-29 14:18:17 +08:00 |
|
huang
|
b731b05a5a
|
中文
|
2016-06-29 14:12:24 +08:00 |
|
Your Name
|
77387778d8
|
some css
|
2016-06-29 14:08:30 +08:00 |
|
huang
|
653520763a
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
2016-06-29 11:22:10 +08:00 |
|
huang
|
1225a33cec
|
提示
|
2016-06-29 11:21:46 +08:00 |
|
Your Name
|
3390a2d05f
|
500
|
2016-06-29 11:10:19 +08:00 |
|
cxt
|
e066445036
|
课程大纲的显示和编辑
|
2016-06-29 10:45:56 +08:00 |
|
huang
|
36944e8cce
|
提示信息
|
2016-06-29 10:06:23 +08:00 |
|
Your Name
|
c8178fc023
|
allert
|
2016-06-29 09:59:21 +08:00 |
|
Your Name
|
e887ac5c7c
|
git data from sonar
|
2016-06-29 09:38:30 +08:00 |
|
yuanke
|
c151a61980
|
把几个gem包位置放下
|
2016-06-29 09:14:53 +08:00 |
|
Your Name
|
3c3fb29bb2
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
2016-06-29 09:11:13 +08:00 |
|
Your Name
|
22b40c082c
|
resole some nil problems
|
2016-06-29 09:10:47 +08:00 |
|
yuanke
|
233e7d5c91
|
Merge branch 'lingbing' into yuanke_org
Conflicts:
Gemfile
|
2016-06-29 08:51:43 +08:00 |
 Linda
|
c24fdee134
|
个人资料页面新版修改
|
2016-06-29 08:48:13 +08:00 |
|
yuanke
|
376ec39035
|
Merge branch 'develop' into yuanke_org
|
2016-06-29 08:48:07 +08:00 |
|
huang
|
0a684227b8
|
如果sonar没扫描完成则暂时不读取数据
|
2016-06-28 22:01:44 +08:00 |
|
guange
|
222855ea79
|
越过course表的validate,以防save invitecode 失败
|
2016-06-28 19:19:59 +08:00 |
|
daiao
|
cb11cac506
|
Merge branch 'develop' into daiao_dev
Conflicts:
app/views/admin/excellent_all_courses.html.erb
|
2016-06-28 18:39:32 +08:00 |
|
guange
|
7fdfc02821
|
Merge remote-tracking branch 'origin/develop' into weixin_guange
|
2016-06-28 17:47:32 +08:00 |
|
guange
|
3c425edc3c
|
修复邀请码会变的问题
|
2016-06-28 17:46:27 +08:00 |
|
Your Name
|
300ad68405
|
default path for sonar
|
2016-06-28 17:39:58 +08:00 |
|
Your Name
|
a08edcca8a
|
quanxian
|
2016-06-28 17:18:50 +08:00 |
|
cxt
|
4983d5283b
|
关联成员能多次添加
|
2016-06-28 16:30:33 +08:00 |
|
cxt
|
cbe34ea0a7
|
分组作业提交作品时关联成员列表为空
|
2016-06-28 15:57:56 +08:00 |