 cxt
|
7853b8aa54
|
班级通知、项目新闻、帖子栏目通知的动态和详情页的二级回复， 二级回复代码的整合
|
9 years ago |
 huang
|
facf3ae8f8
|
提交次数写入动态中
|
9 years ago |
|
cxt
|
7725db9c69
|
题库报500
|
9 years ago |
guange
|
8279d9385c
|
区分是课程邀请，还是意见反馈
|
9 years ago |
|
guange
|
7c98e0f392
|
merge
|
9 years ago |
|
guange
|
5c0468f8fd
|
二维码过期改为一个月有效期
|
9 years ago |
|
cxt
|
cc4b24cdb9
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
13bae8f8a5
|
线下作业
|
9 years ago |
|
huang
|
b90c90bc60
|
add model error_list
|
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 |
|
yuanke
|
397c4cc2a5
|
1.重新发送注册邮件修改2.个人资料修改页面修改3.问题反馈处增加直接加入QQ群的按钮
|
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 |
|
cxt
|
383483de26
|
课程大纲的左侧栏base，新建课程大纲、新建班级的调整
|
9 years ago |
Your Name
|
e5b93ac7ed
|
modified main method
|
9 years ago |
|
huang
|
5aa79defbe
|
迁移问题
|
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
|
537f152562
|
0
|
9 years ago |
|
guange
|
da09983f9e
|
Merge branch 'weixin_guange' into cxt_course
|
9 years ago |
|
Your Name
|
06fe02890f
|
index for sonar result
|
9 years ago |
|
guange
|
d348981721
|
加入邀请码
|
9 years ago |
|
Your Name
|
ce6e6116b5
|
get data from sonar API
|
9 years ago |
|
Your Name
|
9e7cde6056
|
stable version for sonar
|
9 years ago |
|
huang
|
88b838a89a
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
guange
|
8fd4d518b2
|
添加邀请码
|
9 years ago |
|
cxt
|
6100abe0da
|
课程大纲
|
9 years ago |
|
huang
|
78b445a7ae
|
组织历史数据迁移 模式术语修改， 配置页面域名长度问题
|
9 years ago |
|
huang
|
4ea12a6dc5
|
删除匿名用户数据迁移
|
9 years ago |
|
huang
|
27a9170318
|
组织添加设为精品项目，热门课程
|
9 years ago |
|
huang
|
91ae3d8b39
|
Merge branch 'develop' into hjq_beidou
Conflicts:
db/schema.rb
|
9 years ago |
|
huang
|
c333a0c55d
|
组织管理员提供学霸功能
|
9 years ago |
|
cxt
|
b065184754
|
删除机器人组织的匿名评论
|
9 years ago |
|
huang
|
61eeee702c
|
migrate
|
9 years ago |
|
huang
|
5cefedd20a
|
Merge branch 'hjq_beidou' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
6517f23f03
|
首页不显示项目的创建动态
|
9 years ago |
|
huang
|
658ea0cf1e
|
资源引用 结构搭建 数据创建
|
9 years ago |
|
cxt
|
357e143c9a
|
Merge branch 'develop' into cxt_course
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
9b6c629d10
|
学生列表增加活跃度的统计
|
9 years ago |
|
cxt
|
baaff3f988
|
数据迁移
|
9 years ago |
|
cxt
|
90a9472e30
|
删除空数据
|
9 years ago |
|
huang
|
33a3b22430
|
Merge branch 'hjq_beidou' into develop
Conflicts:
db/schema.rb
public/stylesheets/org2.css
|
9 years ago |
|
huang
|
83ac35cc94
|
不同的组织定制是否允许设置名师榜
|
9 years ago |
|
huang
|
37ee03374e
|
完成设置名师功能
|
9 years ago |
|
huang
|
922958e732
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
9096ad5eac
|
数据迁移的还原
|
9 years ago |
|
cxt
|
2d95885345
|
迁移文件
|
9 years ago |
|
cxt
|
77d713a390
|
合并两个相同的作业
|
9 years ago |
|
cxt
|
6d32e812aa
|
统一课程动态和作业的更新时间
|
9 years ago |
|
huang
|
00d0bc0ce1
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
c6c3625029
|
题目申请说明内容较长时，会导致被申请者收不到消息
|
9 years ago |
|
huang
|
3de2b151a3
|
左三”更多“提供链接
|
9 years ago |
|
huang
|
6e7d20c410
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
9e0176bc55
|
Merge branch 'hjq_beidou' into develop
Conflicts:
app/controllers/organizations_controller.rb
app/helpers/organizations_helper.rb
db/schema.rb
public/images/homepage_icon.png
public/stylesheets/new_user.css
|
9 years ago |
|
guange
|
e8adcf8cc7
|
添加sso model
|
9 years ago |
|
cxt
|
341927506a
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
53bf0dcd7a
|
题库加入所有私有作业、并可通过提交申请来导入私有作业
|
9 years ago |
|
huang
|
1685449381
|
二级目录框架及结构
|
9 years ago |
|
huang
|
9fbf713709
|
完成组织二级域名
|
9 years ago |
|
cxt
|
3aa891acf6
|
Merge branch 'cxt_course' into develop
Conflicts:
app/controllers/student_work_controller.rb
app/views/praise_tread/_praise.html.erb
db/schema.rb
|
9 years ago |
|
cxt
|
766026e3cf
|
教师评分为最终评分
|
9 years ago |
|
cxt
|
78c7db1150
|
Merge branch 'weixin_guange' into develop
|
9 years ago |
|
cxt
|
0222038899
|
缺陷模板消息改为对项目所有人发送、可屏蔽微信模板消息
|
9 years ago |
|
huang
|
5d506458df
|
迁移空数据问题
|
9 years ago |
|
huang
|
cc48fb5a98
|
Merge branch 'hjq_beidou' into develop
|
9 years ago |
|
huang
|
f5a88ef6f9
|
数据库为空的迁移问题
|
9 years ago |
|
cxt
|
76b37d7670
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
26b1aee90d
|
修改周海芳老师四个作业的截止日期和学生得分
|
9 years ago |
|
yuanke
|
8f62cccfd6
|
Merge branch 'yuanke' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
yuanke
|
dc3837da76
|
Merge branch 'cxt_course' into yuanke
Conflicts:
db/schema.rb
|
9 years ago |
|
yuanke
|
bc59ce0b60
|
Merge branch 'yuanke' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
yuanke
|
0f5fe51f97
|
1.管理员界面代码测试列表的修改
2.代码查重按钮位置
3.查重结果样式
|
9 years ago |
|
cxt
|
0fa16251e7
|
删除学生提交的多分作品
|
9 years ago |
|
huang
|
16bba76f61
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
6027b6d0f5
|
Merge branch 'hjq_beidou' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
yuanke
|
f1090d45ad
|
Merge branch 'cxt_course' into yuanke
Conflicts:
db/schema.rb
|
9 years ago |
|
huang
|
40b45ce1b4
|
版本库动态中统计改成从数据库获取
|
9 years ago |
|
yuanke
|
de0ba0fbe5
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
yuanke
|
6444d859a7
|
迁移文件修改
|
9 years ago |
|
yuanke
|
ef4b256313
|
Merge branch 'yuanke' into develop
Conflicts:
app/models/homework_common.rb
config/locales/zh.yml
db/schema.rb
|
9 years ago |
|
yuanke
|
a8dce5e520
|
代码查重功能增加,管理员界面增加代码测试列表.
|
9 years ago |
|
cxt
|
fcddaf403c
|
删除博客为空的数据
|
9 years ago |
|
guange
|
aa9cb4e579
|
merge
|
9 years ago |
|
huang
|
c408185b40
|
Merge branch 'develop_new' of http://git.trustie.net/jacknudt/trustieforge into develop_new
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
6a8a82e85a
|
删除周海芳老师2882作业的学生匿评
|
9 years ago |
|
cxt
|
893fad2b48
|
组织配置里的栏目 “排列做成可编辑的”
|
10 years ago |
|
huang
|
20ea251cab
|
添加字段
|
10 years ago |
 ouyangxuhua
|
a69997f6c7
|
Merge branch 'develop' into ouyangxuhua
|
10 years ago |
|
cxt
|
0b0f484a5b
|
更新吴文植的分数
|
10 years ago |
|
ouyangxuhua
|
f4b4bf40de
|
增加显示组织显示模式字段，并且在新建组织和配置组织中能够选择
|
10 years ago |
|
huang
|
dea1c13a64
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/migrate/20160324074942_add_index_to_forge_activities.rb
|
10 years ago |
 alan
|
46951f7af9
|
Merge branch 'develop' into alan_develop
Conflicts:
app/views/student_work/_student_work_list.html.erb
app/views/users/_user_activities.html.erb
app/views/users/_user_message_course.html.erb
|
10 years ago |
|
ouyangxuhua
|
b581a13736
|
Merge branch 'develop' into ouyangxuhua
|
10 years ago |
|
huang
|
5fd3e7d3a2
|
动态表添加索引
|
10 years ago |
|
alan
|
bd5dd24164
|
add alias name to farge_activitiy index
|
10 years ago |
|
huang
|
9cbe719c5e
|
项目动态表添加索引
|
10 years ago |
|
huang
|
a9ef2c28e2
|
项目创建类型迁移
|
10 years ago |
|
ouyangxuhua
|
675b1ad403
|
1.组织配置中，输入组织名字、子栏目域名目录后，自动变成小写字母；2.将所有子域名及域名目录改成小写；3.组织配置中，修改子栏目时，如果没有点确定，输入框的内容保持不变。
|
10 years ago |
