 huang
|
847cae6d41
|
Merge branch 'develop' into rep_quality
Conflicts:
app/models/applied_message.rb
db/schema.rb
|
9 years ago |
 cxt
|
72977886c7
|
Merge branch 'cs_optimize_txz' into cxt_course
Conflicts:
app/views/layouts/_course_base_info.html.erb
|
9 years ago |
|
cxt
|
335b82c046
|
加入班级的弹框
|
9 years ago |
|
huang
|
450217e7c2
|
同意加入消息发送，及添加成员
|
9 years ago |
|
huang
|
c07677ef99
|
项目邀请框架 拒绝消息
|
9 years ago |
|
cxt
|
a1a2b3dd33
|
Merge branch 'rep_quality' into cxt_course
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
848c56d54e
|
班级主页身份切换、成员管理页面的多重身份
|
9 years ago |
|
huang
|
a8fa4a55e3
|
项目申请消息发送
|
9 years ago |
|
huang
|
4a9eec0cce
|
完成项目邀请及公共弹框的封装
|
9 years ago |
|
huang
|
c6bc5c9cb8
|
Merge branch 'dev_shcool' into rep_quality
Conflicts:
db/schema.rb
|
9 years ago |
|
huang
|
7413298aad
|
项目邀请码申请及弹框
|
9 years ago |
|
huang
|
29edd60ce6
|
Merge branch 'daiao_dev' into dev_shcool
|
9 years ago |
|
cxt
|
1f8fa1c70a
|
班级动态去掉“>”
|
9 years ago |
|
cxt
|
04207609cb
|
未配置课程的班级打开报500
|
9 years ago |
|
cxt
|
feb45a07bf
|
课程列表分为我创建的课程和我加入的课程
|
9 years ago |
|
huang
|
2c8f94c899
|
去掉ID转换成用户login
|
9 years ago |
|
huang
|
463c09f02c
|
项目邀请弹框
|
9 years ago |
 daiao
|
4646d13234
|
1.修改资源课程名称，竟可能显示全。
2.班级动态下，去掉“班级动态>”
|
9 years ago |
|
huang
|
920a599417
|
Merge branch 'develop' into rep_quality
|
9 years ago |
|
huang
|
7984affe36
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
be88914e39
|
去掉id转换用户名
|
9 years ago |
|
daiao
|
9ff728f080
|
Merge branch 'develop' into daiao_dev
Conflicts:
app/views/layouts/_syllabus_base_info.html.erb
|
9 years ago |
|
huang
|
43c6301223
|
id转换成用户名
|
9 years ago |
|
cxt
|
6c7925a7b4
|
样式调整
|
9 years ago |
|
huang
|
0e1a52726f
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/layouts/base_syllabus.html.erb
|
9 years ago |
|
huang
|
8dbdebe02e
|
修改动态问题
|
9 years ago |
|
cxt
|
9422e2886c
|
新版班级主页
|
9 years ago |
|
huang
|
6fea64afe2
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
ff8cad5cf2
|
项目动态中添加提交动态
|
9 years ago |
 yuanke
|
f0840d0f31
|
Merge branch 'develop' into weixin_guange
|
9 years ago |
|
daiao
|
b7cf7a2468
|
Merge branch 'develop' into daiao_dev
|
9 years ago |
|
huang
|
6357f5be2a
|
解决成员列表获取单位不准确的问题
|
9 years ago |
|
daiao
|
03d6afd1c4
|
优化上周动态获取代码
|
9 years ago |
|
huang
|
412d74e295
|
优化最近动态获取方法
|
9 years ago |
|
huang
|
5c046f922e
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
3198f8a473
|
解决版本库提交记录中：上传图片或者非可以预览文件 显示详情500问题
|
9 years ago |
|
yuanke
|
f3d74fcd55
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
guange
|
51692eadd6
|
改进上线流程
|
9 years ago |
|
cxt
|
c9e0143fe8
|
作业动态的时间
|
9 years ago |
|
cxt
|
48e5a0be7e
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
huang
|
4c5052dce2
|
作业按更新时间排序
|
9 years ago |
|
cxt
|
5b070b6acc
|
消息列表的html标签
|
9 years ago |
|
huang
|
f9e03434c2
|
Merge branch 'develop' into rep_quality
|
9 years ago |
|
huang
|
2af3c50dbc
|
里程碑区分issue状态“已解决”“已关闭” 对应不同样式
|
9 years ago |
|
huang
|
b2a8a0fed6
|
修复里程碑进度条数据显示错误的问题
|
9 years ago |
|
cxt
|
b77779ca55
|
文章的二级回复和组织帖子的二级回复
|
9 years ago |
|
daiao
|
dcc37ef847
|
增加作品查看界面中，班级查询条件下，增加暂无分班的查询条件
|
9 years ago |
|
cxt
|
ded8f48d34
|
博客的二级回复
|
9 years ago |
|
cxt
|
c46fcc48b1
|
Merge branch 'develop' into cxt_course
Conflicts:
app/views/users/_join_course_course_message.html.erb
|
9 years ago |
|
cxt
|
f0e456729e
|
过滤掉消息中的html
|
9 years ago |
|
huang
|
1283690250
|
Merge branch 'rep_quality' into develop
|
9 years ago |
|
huang
|
cb148c3b9c
|
fixed 500
|
9 years ago |
|
cxt
|
320db4ddd9
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
.access_token
|
9 years ago |
|
guange
|
7c98e0f392
|
merge
|
9 years ago |
|
cxt
|
1a15c0f567
|
新建班级发布作业报500
|
9 years ago |
|
cxt
|
3362ebe321
|
线下作业
|
9 years ago |
|
cxt
|
5a22e9a147
|
作业启动匿评
|
9 years ago |
|
cxt
|
13bae8f8a5
|
线下作业
|
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 |
|
cxt
|
a99b03ff76
|
管理员界面增加配置课程
|
9 years ago |
|
cxt
|
c5840d75da
|
Merge branch 'daiao_dev' into cxt_course
Conflicts:
db/schema.rb
|
9 years ago |
|
guange
|
60367415fa
|
新建课程功能完成
|
9 years ago |
|
cxt
|
599cedaa18
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
public/stylesheets/courses.css
public/stylesheets/public.css
|
9 years ago |
|
cxt
|
cc649ae64b
|
课程讨论区、项目讨论区、帖子详情页面的二级回复
|
9 years ago |
|
yuanke
|
447e624f36
|
课程大纲bug修复
|
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 |
|
cxt
|
0e2e1b09b5
|
title修改
|
9 years ago |
|
yuanke
|
547d5409bb
|
组织中的课程字样改为班级
|
9 years ago |
 txz
|
7178c50b1d
|
branch's total commits
|
9 years ago |
|
cxt
|
bdaa9983e3
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
2c1e0f534c
|
课程大纲
|
9 years ago |
|
cxt
|
ac4218bfb0
|
课程大纲列表
|
9 years ago |
|
cxt
|
ebb697a49f
|
班级列表、课程大纲的编辑、回复、课程列表
|
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
|
77387778d8
|
some css
|
9 years ago |
|
cxt
|
e066445036
|
课程大纲的显示和编辑
|
9 years ago |
|
Your Name
|
a08edcca8a
|
quanxian
|
9 years ago |
|
cxt
|
383483de26
|
课程大纲的左侧栏base，新建课程大纲、新建班级的调整
|
9 years ago |
|
Your Name
|
e5b93ac7ed
|
modified main method
|
9 years ago |
|
guange
|
05f09c4595
|
Merge remote-tracking branch 'origin/develop' into weixin_guange
|
9 years ago |
|
guange
|
c501af70ba
|
.
|
9 years ago |
|
huang
|
01bedc4bc2
|
编码问题
|
9 years ago |
|
huang
|
4a4c613c55
|
utf-8编码
|
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 |
|
cxt
|
f984a01cdc
|
跳转协议问题
|
9 years ago |
|
cxt
|
b5c9156c10
|
加入课程报403
|
9 years ago |
|
guange
|
2c2e1892e5
|
Merge remote-tracking branch 'origin/develop' into weixin_guange
|
9 years ago |
|
guange
|
da09983f9e
|
Merge branch 'weixin_guange' into cxt_course
|
9 years ago |
|
guange
|
d348981721
|
加入邀请码
|
9 years ago |
|
Your Name
|
e4e0e7b166
|
helper
|
9 years ago |
|
Your Name
|
e17aa4c5d8
|
color
|
9 years ago |
|
cxt
|
bd3277681c
|
分组作业的作业成绩导出、学生列表的导出
|
9 years ago |
|
huang
|
a0635bbb2d
|
所占百分比
|
9 years ago |
|
huang
|
dcd2aa7848
|
参考临界值
|
9 years ago |
|
Your Name
|
e6b263feb5
|
issues from sonar
|
9 years ago |
|
Your Name
|
0dc1a1c047
|
get status
|
9 years ago |
|
cxt
|
126bf9c195
|
个人留言、课程留言的二级回复
|
9 years ago |
|
huang
|
e3b6bd19e1
|
修改质量分支控制器名
|
9 years ago |
|
huang
|
88b838a89a
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
huang
|
d0791253d9
|
quality
|
9 years ago |
|
cxt
|
e3ee99b486
|
消息通知中过滤掉已删除的课程消息、
at消息不显示
|
9 years ago |
|
guange
|
8fd4d518b2
|
添加邀请码
|
9 years ago |
|
cxt
|
6100abe0da
|
课程大纲
|
9 years ago |
|
huang
|
90aaaa544a
|
最新动态按创建时间排序
|
9 years ago |
|
huang
|
67f0cad331
|
组织网站动态新页面
|
9 years ago |
|
huang
|
9c01bb63e7
|
配置页面管理员栏目权限控制
|
9 years ago |
|
huang
|
c5bccf1adb
|
组织动态按更新时间排序
|
9 years ago |
|
huang
|
59988f17da
|
帖子目录界面
|
9 years ago |
|
huang
|
bfa447c195
|
未登录状态下anonymos改为未登录
|
9 years ago |
|
huang
|
edbe882cc9
|
管理员栏目其它成员不可见
|
9 years ago |
|
huang
|
b128ba5257
|
Merge branch 'hjq_beidou' into develop
Conflicts:
app/views/layouts/base_org2.html.erb
|
9 years ago |
|
huang
|
e726a362d8
|
组织配置页面状态的更新
|
9 years ago |
|
huang
|
1e34a4f174
|
显示样式一级添加二级目录权限
|
9 years ago |
|
huang
|
fa2437cdf6
|
添加课程学期
|
9 years ago |
|
huang
|
3af115ee54
|
组织新版样式，及方法优化
|
9 years ago |
|
huang
|
ca3b072f85
|
热门项目按照项目得分排序及设置界面中默认设置
|
9 years ago |
|
huang
|
257165dbaf
|
模式二中添加课程定配
|
9 years ago |
|
huang
|
0b3ec0322f
|
右一模式
|
9 years ago |
|
huang
|
76732a3034
|
新模式有一
|
9 years ago |
|
huang
|
27a9170318
|
组织添加设为精品项目，热门课程
|
9 years ago |
|
cxt
|
0cc8cb9928
|
刚提交的回复时间显示为“刚刚”
|
9 years ago |
|
huang
|
91ae3d8b39
|
Merge branch 'develop' into hjq_beidou
Conflicts:
db/schema.rb
|
9 years ago |
|
huang
|
a96fafd704
|
模式三（未完）
|
9 years ago |
|
huang
|
8d56d8556f
|
完成模式6
|
9 years ago |
|
huang
|
bb7204846f
|
新版资源类型定制模式6
|
9 years ago |
|
cxt
|
796125bd1c
|
修改微信端的时间提示
|
9 years ago |
|
huang
|
c369b271a0
|
组织管理员配置后的权限控制及局部刷新
|
9 years ago |
|
huang
|
c333a0c55d
|
组织管理员提供学霸功能
|
9 years ago |
|
huang
|
c57c575c84
|
新版组织静态页面模板
|
9 years ago |
|
huang
|
afedaf3fe5
|
组织资源历史版本下载权限问题
|
10 years ago |
|
huang
|
7b6a62e972
|
历史版本下载403问题
|
10 years ago |
|
huang
|
d1e11d4260
|
代码审查后代码简化
|
10 years ago |
|
huang
|
eead7962cf
|
资源申请权限控制
|
10 years ago |
|
huang
|
b0e4ed5ab3
|
请求分享如果自己在项目的话则不需要申请
|
10 years ago |
|
huang
|
13ac7ef273
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
10 years ago |
|
cxt
|
6aa20c9edf
|
消息通知的内容没有过滤用Tab键空格引起的特殊符号
|
10 years ago |
|
huang
|
3985c190bf
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
10 years ago |
|
cxt
|
0f2f4717b6
|
作业列表增加序号和翻页、按创建时间倒排
|
10 years ago |
|
huang
|
11bc6b1e6c
|
配置500问题
|
10 years ago |
|
huang
|
5ee6c9e5d3
|
子域名添加成员问题
|
10 years ago |
|
guange
|
f217b3f510
|
去除用户名域名
|
10 years ago |
|
huang
|
79e57e2b7f
|
代码和并冲突处理及连接参数
|
10 years ago |
|
huang
|
e8afcf9157
|
Merge branch 'hjq_beidou' into develop
Conflicts:
app/helpers/organizations_helper.rb
app/views/organizations/_org_subfield_rightM2.html.erb
|
10 years ago |
|
huang
|
39c753fd25
|
名师列表排序
|
10 years ago |
|
huang
|
467ee60657
|
名师默认显示5个，没有则不显示
|
10 years ago |
