huang
|
67cad6fc25
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-07-01 17:54:38 +08:00 |
huang
|
374a905d1e
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-07-01 17:53:47 +08:00 |
huang
|
e74a2ba275
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
2016-07-01 17:53:29 +08:00 |
cxt
|
b1a77a036b
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-07-01 17:52:35 +08:00 |
cxt
|
e834d09469
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
2016-07-01 17:52:29 +08:00 |
yuanke
|
a7ecfba23b
|
Merge branch 'yuanke_org' into develop
|
2016-07-01 17:52:23 +08:00 |
txz
|
25e77497e7
|
consloe pring
|
2016-07-01 17:50:08 +08:00 |
cxt
|
8b87c141cc
|
bug修复
|
2016-07-01 17:47:35 +08:00 |
yuanke
|
547d5409bb
|
组织中的课程字样改为班级
|
2016-07-01 17:43:38 +08:00 |
cxt
|
0f8cc584a9
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-07-01 17:27:40 +08:00 |
cxt
|
5a1090c0e1
|
bug修复
|
2016-07-01 17:27:34 +08:00 |
yuanke
|
1edc63721f
|
修改课程列表班级时间显示问题
|
2016-07-01 17:03:05 +08:00 |
Tim
|
afbf62fd64
|
当课程数为0时,课程列表点击无效
|
2016-07-01 17:02:52 +08:00 |
cxt
|
6867a88a94
|
课程大纲样式调整
|
2016-07-01 16:41:13 +08:00 |
cxt
|
0ff8f0a774
|
课程大纲的删除和课程大纲描述的删除
|
2016-07-01 16:25:52 +08:00 |
yuanke
|
8db5852a61
|
激活邮箱界面显示邮箱,激活邮箱界面留言太长不能留言解决
|
2016-07-01 15:49:25 +08:00 |
cxt
|
25b5d74a42
|
课程大纲的修改
|
2016-07-01 15:25:30 +08:00 |
txz
|
21be94cbe1
|
add some links
|
2016-07-01 15:05:01 +08:00 |
txz
|
1fbb65b906
|
获取结果ajax加载中
|
2016-07-01 14:39:40 +08:00 |
cxt
|
f70b51769c
|
Merge branch 'cxt_course' into develop
|
2016-07-01 14:14:13 +08:00 |
cxt
|
afe16cc99c
|
课程大纲列表的js调整
|
2016-07-01 14:13:40 +08:00 |
Tim
|
def0d79271
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
Conflicts:
app/views/users/_user_syllabus_list.html.erb
|
2016-07-01 13:56:07 +08:00 |
Tim
|
7633761bbe
|
课程大纲列表展开收起js
|
2016-07-01 13:54:00 +08:00 |
cxt
|
18d677c5eb
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
public/stylesheets/courses.css
|
2016-07-01 11:31:51 +08:00 |
cxt
|
bdaa9983e3
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
2016-07-01 11:30:24 +08:00 |
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 |
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
|
ac4218bfb0
|
课程大纲列表
|
2016-06-30 15:36:46 +08:00 |
daiao
|
2eb7aa7c38
|
修改精品课程下-全部课程下 除序列、主讲老师和课程名外的所有列进行排序!
|
2016-06-30 11:32:14 +08:00 |
cxt
|
ebb697a49f
|
班级列表、课程大纲的编辑、回复、课程列表
|
2016-06-30 10:44:11 +08:00 |
Your Name
|
5c83414828
|
update
|
2016-06-30 10:17:53 +08:00 |
huang
|
f7e872cb6c
|
权限修改,项目成员都可以提交质量分析job
|
2016-06-29 15:20:14 +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
|
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 |
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 |
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
|
383483de26
|
课程大纲的左侧栏base,新建课程大纲、新建班级的调整
|
2016-06-28 15:13:04 +08:00 |
daiao
|
d8284e45ed
|
在课程列表下增加动态时间一栏
|
2016-06-28 15:06:08 +08:00 |
Your Name
|
dd6b19a8b5
|
some status of sonar
|
2016-06-28 14:48:09 +08:00 |
daiao
|
863cdee37c
|
在精品课程的全部课程界面下增加公开属性
|
2016-06-28 14:39:43 +08:00 |
guange
|
57cdc1d5ec
|
协议修改
|
2016-06-28 11:30:06 +08:00 |
guange
|
047903ddff
|
重构课程地址
|
2016-06-28 10:57:58 +08:00 |
Your Name
|
e5b93ac7ed
|
modified main method
|
2016-06-27 18:13:46 +08:00 |
guange
|
1e6454efc0
|
加入我的资源
|
2016-06-27 17:24:06 +08:00 |
guange
|
f6f329b00f
|
erge remote-tracking branch 'origin/develop' into weixin_guange
|
2016-06-27 16:06:20 +08:00 |
guange
|
5477c794ba
|
Merge remote-tracking branch 'origin/develop' into weixin_guange
|
2016-06-27 16:03:55 +08:00 |
huang
|
845141a189
|
注释掉代码质量分析入口
|
2016-06-27 16:03:43 +08:00 |
yuanke
|
ab99645148
|
Merge branch 'yuanke' into develop
|
2016-06-27 15:52:01 +08:00 |
yuanke
|
5c2ac3e02f
|
修改删除组织成员跨域的BUG
|
2016-06-27 15:47:06 +08:00 |
daiao
|
ad3626d53a
|
将搜索页面:“登陆”改为“登录”
|
2016-06-27 15:36:31 +08:00 |
guange
|
05f09c4595
|
Merge remote-tracking branch 'origin/develop' into weixin_guange
|
2016-06-27 11:09:31 +08:00 |
guange
|
c501af70ba
|
.
|
2016-06-27 11:09:25 +08:00 |
huang
|
46cde061a6
|
Merge branch 'rep_quality' into develop
Conflicts:
db/schema.rb
public/stylesheets/project.css
public/stylesheets/public.css
|
2016-06-24 19:17:26 +08:00 |
Your Name
|
c658296e2b
|
config
|
2016-06-24 19:12:07 +08:00 |
cxt
|
f984a01cdc
|
跳转协议问题
|
2016-06-24 18:50:47 +08:00 |
Your Name
|
537f152562
|
0
|
2016-06-24 18:47:54 +08:00 |
cxt
|
8d5501615c
|
加入课程的样式调整
|
2016-06-24 18:09:18 +08:00 |
cxt
|
492b2f895c
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-06-24 17:58:56 +08:00 |
cxt
|
4f342142e6
|
组织文章的展开更多
|
2016-06-24 17:58:50 +08:00 |
Your Name
|
e5ad64831a
|
0
|
2016-06-24 17:50:26 +08:00 |
huang
|
6bc4dec636
|
列表界面
|
2016-06-24 17:46:21 +08:00 |
Your Name
|
244c178758
|
666
|
2016-06-24 17:39:10 +08:00 |
yuanke
|
e3c094cb07
|
Merge branch 'yuanke' into develop
|
2016-06-24 17:19:25 +08:00 |
yuanke
|
f1682edf64
|
修改创建贴吧BUG
|
2016-06-24 17:18:04 +08:00 |
cxt
|
b2f939fa92
|
代码调整
|
2016-06-24 17:01:35 +08:00 |
cxt
|
0611ddcc43
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/users/_reply_to.html.erb
|
2016-06-24 16:54:19 +08:00 |
guange
|
2c2e1892e5
|
Merge remote-tracking branch 'origin/develop' into weixin_guange
|
2016-06-24 16:53:58 +08:00 |
cxt
|
76e7c50bf4
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/users/_reply_to.html.erb
|
2016-06-24 16:52:00 +08:00 |
guange
|
c39a982093
|
二维码
|
2016-06-24 16:51:40 +08:00 |
cxt
|
eab000306c
|
动态回复的展开更多、收起,组织文章回复不可用
|
2016-06-24 16:38:36 +08:00 |
Your Name
|
eae70f9c71
|
some config
|
2016-06-24 16:18:17 +08:00 |
cxt
|
d558a4d357
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-06-24 16:12:31 +08:00 |
cxt
|
afc8fad7fd
|
通过邀请码加入课程
|
2016-06-24 16:12:24 +08:00 |
Tim
|
a542ba46a4
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-06-24 15:55:07 +08:00 |
Tim
|
ec33569033
|
取消拖拽
|
2016-06-24 15:54:56 +08:00 |
huang
|
4ea210a05b
|
重复改成代码重复
|
2016-06-24 15:46:04 +08:00 |
cxt
|
260759e4db
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-06-24 15:36:03 +08:00 |
guange
|
da09983f9e
|
Merge branch 'weixin_guange' into cxt_course
|
2016-06-24 15:34:32 +08:00 |