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
|
9 years ago |
Tim
|
7633761bbe
|
课程大纲列表展开收起js
|
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
|
3b7679b254
|
课程大纲列表
|
9 years ago |
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
|
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
|
a8bd91754d
|
修改博客详情里面内容前面多空格的BUG
|
9 years ago |
txz
|
24f1375a4e
|
modified job
|
9 years ago |
Tim
|
10f52f110f
|
课程大纲列表点击展开收起,配置按钮链接跳转实现
|
9 years ago |
yuanke
|
397c4cc2a5
|
1.重新发送注册邮件修改2.个人资料修改页面修改3.问题反馈处增加直接加入QQ群的按钮
|
9 years ago |
cxt
|
ac4218bfb0
|
课程大纲列表
|
9 years ago |
daiao
|
2eb7aa7c38
|
修改精品课程下-全部课程下 除序列、主讲老师和课程名外的所有列进行排序!
|
9 years ago |
cxt
|
ebb697a49f
|
班级列表、课程大纲的编辑、回复、课程列表
|
9 years ago |
Your Name
|
5c83414828
|
update
|
9 years ago |
guange
|
0bb5c8b5fb
|
注册绑定问题
|
9 years ago |
huang
|
f7e872cb6c
|
权限修改,项目成员都可以提交质量分析job
|
9 years ago |
huang
|
daf14178cd
|
修改权限,只有项目成员能够代码质量分析
|
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 |
huang
|
b731b05a5a
|
中文
|
9 years ago |
Your Name
|
77387778d8
|
some css
|
9 years ago |
huang
|
653520763a
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
9 years ago |
huang
|
1225a33cec
|
提示
|
9 years ago |
Your Name
|
3390a2d05f
|
500
|
9 years ago |
cxt
|
e066445036
|
课程大纲的显示和编辑
|
9 years ago |
huang
|
36944e8cce
|
提示信息
|
9 years ago |
Your Name
|
c8178fc023
|
allert
|
9 years ago |
Your Name
|
22b40c082c
|
resole some nil problems
|
9 years ago |
yuanke
|
233e7d5c91
|
Merge branch 'lingbing' into yuanke_org
Conflicts:
Gemfile
|
9 years ago |
Linda
|
c24fdee134
|
个人资料页面新版修改
|
9 years ago |
yuanke
|
376ec39035
|
Merge branch 'develop' into yuanke_org
|
9 years ago |
daiao
|
cb11cac506
|
Merge branch 'develop' into daiao_dev
Conflicts:
app/views/admin/excellent_all_courses.html.erb
|
9 years ago |
guange
|
7fdfc02821
|
Merge remote-tracking branch 'origin/develop' into weixin_guange
|
9 years ago |
Your Name
|
300ad68405
|
default path for sonar
|
9 years ago |
Your Name
|
a08edcca8a
|
quanxian
|
9 years ago |
cxt
|
4983d5283b
|
关联成员能多次添加
|
9 years ago |
cxt
|
383483de26
|
课程大纲的左侧栏base,新建课程大纲、新建班级的调整
|
9 years ago |
daiao
|
d8284e45ed
|
在课程列表下增加动态时间一栏
|
9 years ago |
Your Name
|
dd6b19a8b5
|
some status of sonar
|
9 years ago |
daiao
|
863cdee37c
|
在精品课程的全部课程界面下增加公开属性
|
9 years ago |
guange
|
57cdc1d5ec
|
协议修改
|
9 years ago |
guange
|
047903ddff
|
重构课程地址
|
9 years ago |
Your Name
|
e5b93ac7ed
|
modified main method
|
9 years ago |
guange
|
1e6454efc0
|
加入我的资源
|
9 years ago |
guange
|
f6f329b00f
|
erge remote-tracking branch 'origin/develop' into weixin_guange
|
9 years ago |
guange
|
5477c794ba
|
Merge remote-tracking branch 'origin/develop' into weixin_guange
|
9 years ago |
huang
|
845141a189
|
注释掉代码质量分析入口
|
9 years ago |
yuanke
|
ab99645148
|
Merge branch 'yuanke' into develop
|
9 years ago |
yuanke
|
5c2ac3e02f
|
修改删除组织成员跨域的BUG
|
9 years ago |
daiao
|
ad3626d53a
|
将搜索页面:“登陆”改为“登录”
|
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 |
Your Name
|
c658296e2b
|
config
|
9 years ago |
cxt
|
f984a01cdc
|
跳转协议问题
|
9 years ago |
Your Name
|
537f152562
|
0
|
9 years ago |
cxt
|
8d5501615c
|
加入课程的样式调整
|
9 years ago |
cxt
|
492b2f895c
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
cxt
|
4f342142e6
|
组织文章的展开更多
|
9 years ago |
Your Name
|
e5ad64831a
|
0
|
9 years ago |
huang
|
6bc4dec636
|
列表界面
|
9 years ago |
Your Name
|
244c178758
|
666
|
9 years ago |
yuanke
|
e3c094cb07
|
Merge branch 'yuanke' into develop
|
9 years ago |
yuanke
|
f1682edf64
|
修改创建贴吧BUG
|
9 years ago |
cxt
|
b2f939fa92
|
代码调整
|
9 years ago |
cxt
|
0611ddcc43
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/users/_reply_to.html.erb
|
9 years ago |
guange
|
2c2e1892e5
|
Merge remote-tracking branch 'origin/develop' into weixin_guange
|
9 years ago |
cxt
|
76e7c50bf4
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/users/_reply_to.html.erb
|
9 years ago |
guange
|
c39a982093
|
二维码
|
9 years ago |
cxt
|
eab000306c
|
动态回复的展开更多、收起,组织文章回复不可用
|
9 years ago |
Your Name
|
eae70f9c71
|
some config
|
9 years ago |
cxt
|
d558a4d357
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
9 years ago |
cxt
|
afc8fad7fd
|
通过邀请码加入课程
|
9 years ago |
Tim
|
a542ba46a4
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
9 years ago |
Tim
|
ec33569033
|
取消拖拽
|
9 years ago |
huang
|
4ea210a05b
|
重复改成代码重复
|
9 years ago |
cxt
|
260759e4db
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
9 years ago |
guange
|
da09983f9e
|
Merge branch 'weixin_guange' into cxt_course
|
9 years ago |
cxt
|
ac629440b1
|
课程邀请码
|
9 years ago |
huang
|
09b78fc546
|
中文
|
9 years ago |
yuanke
|
c6be37020f
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/users/_reply_to.html.erb
|
9 years ago |
Your Name
|
06fe02890f
|
index for sonar result
|
9 years ago |
yuanke
|
c61c14fa97
|
Merge branch 'yuanke' into develop
|
9 years ago |
yuanke
|
86a5eccae6
|
组织设置中添加成员BUG解决
|
9 years ago |
yuanke
|
64d87b7398
|
修改组织添加成员的BUG
|
9 years ago |
Your Name
|
128f6721be
|
stoped the zhizhen
|
9 years ago |
Your Name
|
de80403e8d
|
add address to config
|
9 years ago |
Your Name
|
e4e0e7b166
|
helper
|
9 years ago |
yuanke
|
2a971c3bc6
|
修改有的组织添加成员的BUG
|
9 years ago |
yuanke
|
e818b5fb07
|
旧的注册页面去掉
|
9 years ago |
cxt
|
2959391438
|
作业列表:没有作业时下拉框被点击后,显示一条记录:目前尚未发布作业
|
9 years ago |
Your Name
|
e17aa4c5d8
|
color
|
9 years ago |
cxt
|
a41d18dd0e
|
编程作业的作品详情在顶部增加“收起”
|
9 years ago |
Your Name
|
580b232d62
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
9 years ago |
Your Name
|
05eb71036d
|
some css to added
|
9 years ago |
huang
|
a0635bbb2d
|
所占百分比
|
9 years ago |
Your Name
|
e6b263feb5
|
issues from sonar
|
9 years ago |
guange
|
52d4d36097
|
邀请码页面
|
9 years ago |
Your Name
|
0dc1a1c047
|
get status
|
9 years ago |
huang
|
eca189335b
|
统计图
|
9 years ago |
Your Name
|
53b9cbee72
|
added hightcharts and added some api for sonar
|
9 years ago |
cxt
|
8940c5f4ca
|
禁用匿评的作品列表不应显示“导出匿评情况、导出缺评情况”链接
|
9 years ago |
Your Name
|
3964631ed1
|
hight charts
|
9 years ago |
huang
|
5cf108030f
|
hight char钟表图
|
9 years ago |
cxt
|
126bf9c195
|
个人留言、课程留言的二级回复
|
9 years ago |
Your Name
|
8438bc7bcd
|
somethint to added
|
9 years ago |
huang
|
723540044d
|
检测列表页面
|
9 years ago |
huang
|
ad6e3c3364
|
质量分析权限
|
9 years ago |
Your Name
|
3fe5d9a1a3
|
get date froma sonar
|
9 years ago |
huang
|
9f15a8aa4e
|
代码质量分析样式
|
9 years ago |
Your Name
|
ce6e6116b5
|
get data from sonar API
|
9 years ago |
guange
|
7700445c17
|
加入课程
|
9 years ago |
yuanke
|
9461c41fa7
|
激活留言修改
|
9 years ago |
yuanke
|
b68e227531
|
没激活的帐号界面
|
9 years ago |
guange
|
13273d02de
|
修正了安全问题,不暴露openid
|
9 years ago |
Your Name
|
2275fe6d23
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
9 years ago |
Your Name
|
9e7cde6056
|
stable version for sonar
|
9 years ago |
guange
|
b6892cfc2d
|
把angularjs换成7牛cdn
|
9 years ago |
huang
|
494b69c89b
|
sonar数据获取
|
9 years ago |
cxt
|
1b12c56960
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
9 years ago |
cxt
|
3f8beaf97c
|
动态回复banner的代码重构
|
9 years ago |
huang
|
e3b6bd19e1
|
修改质量分支控制器名
|
9 years ago |
daiao
|
97d07134a5
|
修改上传资源名过长造成溢出框架
|
9 years ago |
daiao
|
8037bccb17
|
将延迟发布统一修改为延期发布
|
9 years ago |
Tim
|
fd765b1d73
|
设置课程大纲弹框js控制
|
9 years ago |
daiao
|
15f3a42a8a
|
修改缺陷:新建在线测试发布时间与截止时间相同时,提示信息不正确
|
9 years ago |
Tim
|
1a4865be09
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
9 years ago |
cxt
|
44334913ee
|
未读消息弹窗漏了一条消息
|
9 years ago |
cxt
|
4a12b56223
|
Merge branch 'cxt_course' into develop
|
9 years ago |
cxt
|
c4cea93a44
|
消息列表的“展开更多”指针手势修改
|
9 years ago |
cxt
|
2176ad1ede
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
cxt
|
53614197aa
|
Merge branch 'cxt_course' into develop
|
9 years ago |
cxt
|
4f80e259e8
|
消息弹窗的延时显示
|
9 years ago |
daiao
|
8e7095c82d
|
修改了课件名称显示不全的缺陷
|
9 years ago |
yuanke
|
64a4af21eb
|
Merge branch 'yuanke' into develop
|
9 years ago |
yuanke
|
40792ff222
|
更新资源版本描述默认显示
|
9 years ago |
yuanke
|
0ebbf29b54
|
Merge branch 'yuanke' into develop
|
9 years ago |
yuanke
|
a5ffd013b9
|
修改更新资源版本的样式问题
|
9 years ago |
yuanke
|
301556b9c3
|
Merge branch 'yuanke' into develop
|
9 years ago |
yuanke
|
fde06a2327
|
更新资源描述样式修改
|
9 years ago |
guange
|
29a815aeaf
|
添加weui
|
9 years ago |
cxt
|
f4d67bc027
|
未读消息弹窗“点击展开”显示10条未读消息
|
9 years ago |
Tim
|
3548c23aad
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
9 years ago |
cxt
|
048bb7fed5
|
头像下拉菜单、未读消息的延时
|
9 years ago |
guange
|
05ddbe5874
|
修改code
|
9 years ago |
guange
|
b7230333dc
|
code获取修改
|
9 years ago |
guange
|
3f98562c0f
|
打包
|
9 years ago |
huang
|
36e47fa8b1
|
代码质量分析,弹框参数传递
|
9 years ago |
cxt
|
b26a6b5195
|
消息弹窗的链接无效
|
9 years ago |
daiao
|
dbc8f420ed
|
按照要求:将延期发布在资源上传界面叫延迟发布,在资源配置按钮中叫延期发布,见附件,同一功能的按钮名称应该统一。统一修改为延迟发布。
|
9 years ago |
yuanke
|
0719313f01
|
Merge branch 'yuanke' into develop
|
9 years ago |
yuanke
|
4b7fa3a040
|
修改有的组织不能修改资源描述的问题
|
9 years ago |
huang
|
fce93de296
|
500问题
|
9 years ago |
huang
|
e4105b538a
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
huang
|
6af0bf7b83
|
组织样式
|
9 years ago |
yuanke
|
f3014c3993
|
Merge branch 'yuanke' into develop
|
9 years ago |
yuanke
|
948ec58248
|
作业二级回复未登录显示样式问题
|
9 years ago |
cxt
|
3492f65a9b
|
编程作业匿评时的列表宽度调整
|
9 years ago |
Tim
|
4b62a39b15
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
9 years ago |
cxt
|
7b1efe193d
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
cxt
|
eb3694dbe6
|
消息报500
|
9 years ago |
yuanke
|
811afbdf33
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
huang
|
7d68df79a0
|
组织合并凌彬代码500问题
|
9 years ago |
yuanke
|
fde3fd0d94
|
新建贴吧跳入该贴吧帖子列表,组织栏目配置默认选择第一个栏目类型
|
9 years ago |
yuanke
|
d6d9a366f2
|
Merge branch 'develop' into yuanke
Conflicts:
public/stylesheets/new_user.css
|
9 years ago |
huang
|
0f17ac0e9e
|
Merge branch 'lingbing' into develop
Conflicts:
app/views/organizations/_org_custom_header.html.erb
|
9 years ago |
huang
|
8741917823
|
访问统计 (自2016年5月)
|
9 years ago |
yuanke
|
c51c73f225
|
所有回复添加未登录提示
|
9 years ago |
cxt
|
a105f4eaf0
|
课程动态中:课程讨论区、课程通知
项目动态中:项目issue、项目新闻、项目讨论区
个人动态:如上动态
未登录时不显示齿轮
|
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 |
cxt
|
1dac05c6d1
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
yuanke
|
3ae26a6530
|
组织配置页面 名师列表 热门项目 学霸 精品课程的右上角字样只对超级管理员显示,图片显示时如果已经带了链接则不增加点击弹框效果。
|
9 years ago |
huang
|
fea21fe7cd
|
Merge branch 'develop' into rep_quality
|
9 years ago |
huang
|
d127c6e12c
|
访问添加自某年某月
|
9 years ago |
cxt
|
795917688c
|
留言内容无法展开、收起
|
9 years ago |
cxt
|
28ee609eed
|
学生查看测验的统计结果
|
9 years ago |
yuanke
|
70a762220a
|
组织、项目的资源文件增加描述修改及上传文件时候添加描述,并且所有操作对超级管理员开放
|
9 years ago |
cxt
|
439841fbd7
|
从课程动态页面打开的匿评设置日期选择界面显示为英文,从作业页面打开的匿评设置日期选择界面为中文,应该统一为中文
|
9 years ago |
cxt
|
30db43eb13
|
作业开启匿评之后,如果是普通作业,会提示学生提交的作业不会进入匿评,也不能对其他人进行匿评,如果是编程作业,在打开作业时则无此提示,应该统一,均进行提示
|
9 years ago |
huang
|
312fa61489
|
输入框线条
|
9 years ago |
huang
|
6707868915
|
登录页面新样式
|
9 years ago |
cxt
|
e3ee99b486
|
消息通知中过滤掉已删除的课程消息、
at消息不显示
|
9 years ago |
huang
|
d2d15710b5
|
解决chrome浏览器背景黄色问题
|
9 years ago |
yuanke
|
f9f66bac7b
|
修改课程资源描述为空时提示
|
9 years ago |
yuanke
|
7df91ebf70
|
修改课程资源描述空白的提示语
|
9 years ago |
yuanke
|
4cd321f363
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
yuanke
|
049a21c7d0
|
不上线的先还原
|
9 years ago |
huang
|
072807fe37
|
1、登录下划线去掉2、登录改成注册3、默认的改成勾选协议
|
9 years ago |
yuanke
|
82ebd1e4c9
|
Merge branch 'yuanke' into develop
|
9 years ago |
yuanke
|
2781605670
|
课程资源描述增加可编辑
|
9 years ago |
Tim
|
24458ecb48
|
table可拖拽,在线测验表格布局优化
|
9 years ago |
huang
|
8f73cba44b
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
huang
|
41bb68d0e1
|
Merge branch 'hjq_login' into develop
|
9 years ago |
huang
|
5e3df51ad9
|
完成新版登录注册
|
9 years ago |
huang
|
aa42044199
|
注册登录
|
9 years ago |
huang
|
06f97d5cb7
|
注册页面(未完)
|
9 years ago |